diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 43aaa2f58c1..a380a69dc03 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -99,7 +99,6 @@ for a particular financial year and for preparation of vouchers there is a modul
         'project/wizard/project_account_analytic_line_view.xml',
         'account_end_fy.xml',
         'account_invoice_view.xml',
-        'partner_view.xml',
         'data/account_data.xml',
         'data/data_account_type.xml',
         'data/configurable_account_chart.xml',
@@ -112,6 +111,7 @@ for a particular financial year and for preparation of vouchers there is a modul
         'project/wizard/account_analytic_journal_report_view.xml',
         'project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml',
         'project/wizard/account_analytic_chart_view.xml',
+        'partner_view.xml',
         'product_view.xml',
         'account_assert_test.xml',
         'process/statement_process.xml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 1a44e480e03..a68c1de0939 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -132,7 +132,6 @@ class account_payment_term_line(osv.osv):
         (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
     ]
 
-account_payment_term_line()
 
 class account_account_type(osv.osv):
     _name = "account.account.type"
@@ -198,7 +197,6 @@ class account_account_type(osv.osv):
     }
     _order = "code"
 
-account_account_type()
 
 def _code_get(self, cr, uid, context=None):
     acc_type_obj = self.pool.get('account.account.type')
@@ -212,7 +210,6 @@ def _code_get(self, cr, uid, context=None):
 
 class account_tax(osv.osv):
     _name = 'account.tax'
-account_tax()
 
 class account_account(osv.osv):
     _order = "parent_left"
@@ -651,10 +648,10 @@ class account_account(osv.osv):
             if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
                 #Check for 'Closed' type
                 if old_type == 'closed' and new_type !='closed':
-                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type as it contains journal items!"))
+                    raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from 'Closed' to any other type as it contains journal items!"))
                 # Forbid to change an account type for restricted_groups as it contains journal items (or if one of its children does)
                 if (new_type in restricted_groups):
-                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account to '%s' type as it contains journal items!") % (new_type,))
+                    raise osv.except_osv(_('Warning!'), _("You cannot change the type of account to '%s' type as it contains journal items!") % (new_type,))
 
         return True
 
@@ -697,7 +694,6 @@ class account_account(osv.osv):
         self._check_moves(cr, uid, ids, "unlink", context=context)
         return super(account_account, self).unlink(cr, uid, ids, context=context)
 
-account_account()
 
 class account_journal(osv.osv):
     _name = "account.journal"
@@ -849,7 +845,6 @@ class account_journal(osv.osv):
 
         return self.name_get(cr, user, ids, context=context)
 
-account_journal()
 
 class account_fiscalyear(osv.osv):
     _name = "account.fiscalyear"
@@ -945,7 +940,6 @@ class account_fiscalyear(osv.osv):
             ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-account_fiscalyear()
 
 class account_period(osv.osv):
     _name = "account.period"
@@ -1007,8 +1001,7 @@ class account_period(osv.osv):
     def find(self, cr, uid, dt=None, context=None):
         if context is None: context = {}
         if not dt:
-            dt = fields.date.context_today(self,cr,uid,context=context)
-#CHECKME: shouldn't we check the state of the period?
+            dt = fields.date.context_today(self, cr, uid, context=context)
         args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
         if context.get('company_id', False):
             args.append(('company_id', '=', context['company_id']))
@@ -1016,20 +1009,20 @@ class account_period(osv.osv):
             company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
             args.append(('company_id', '=', company_id))
         result = []
-        if context.get('account_period_prefer_normal'):
+        if context.get('account_period_prefer_normal', True):
             # look for non-special periods first, and fallback to all if no result is found
             result = self.search(cr, uid, args + [('special', '=', False)], context=context)
         if not result:
             result = self.search(cr, uid, args, context=context)
         if not result:
-            raise osv.except_osv(_('Error !'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
+            raise osv.except_osv(_('Error!'), _('There is no period defined for this date: %s.\nPlease create one.')%dt)
         return result
 
     def action_draft(self, cr, uid, ids, *args):
         mode = 'draft'
         for period in self.browse(cr, uid, ids):
             if period.fiscalyear_id.state == 'done':
-                raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
+                raise osv.except_osv(_('Warning!'), _('You can not re-open a period which belongs to closed fiscal year'))
         cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
         cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
         return True
@@ -1041,9 +1034,15 @@ class account_period(osv.osv):
             context = {}
         ids = []
         if name:
-            ids = self.search(cr, user, [('code','ilike',name)]+ args, limit=limit)
+            ids = self.search(cr, user,
+                              [('code', 'ilike', name)] + args,
+                              limit=limit,
+                              context=context)
         if not ids:
-            ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
+            ids = self.search(cr, user,
+                              [('name', operator, name)] + args,
+                              limit=limit,
+                              context=context)
         return self.name_get(cr, user, ids, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -1066,12 +1065,15 @@ class account_period(osv.osv):
             raise osv.except_osv(_('Error!'), _('You should choose the periods that belong to the same company.'))
         if period_date_start > period_date_stop:
             raise osv.except_osv(_('Error!'), _('Start period should precede then end period.'))
+
+        # /!\ We do not include a criterion on the company_id field below, to allow producing consolidated reports
+        # on multiple companies. It will only work when start/end periods are selected and no fiscal year is chosen.
+
         #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search).
         if period_from.special:
-            return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
-        return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)])
+            return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop)])
+        return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('special', '=', False)])
 
-account_period()
 
 class account_journal_period(osv.osv):
     _name = "account.journal.period"
@@ -1128,7 +1130,6 @@ class account_journal_period(osv.osv):
     }
     _order = "period_id"
 
-account_journal_period()
 
 class account_fiscalyear(osv.osv):
     _inherit = "account.fiscalyear"
@@ -1145,7 +1146,6 @@ class account_fiscalyear(osv.osv):
         })
         return super(account_fiscalyear, self).copy(cr, uid, id, default=default, context=context)
 
-account_fiscalyear()
 #----------------------------------------------------------
 # Entries
 #----------------------------------------------------------
@@ -1223,7 +1223,7 @@ class account_move(osv.osv):
         return res
 
     def _get_period(self, cr, uid, context=None):
-        ctx = dict(context or {}, account_period_prefer_normal=True)
+        ctx = dict(context or {})
         period_ids = self.pool.get('account.period').find(cr, uid, context=ctx)
         return period_ids[0]
 
@@ -1384,6 +1384,7 @@ class account_move(osv.osv):
                         'ref':False,
                         'balance':False,
                         'account_tax_id':False,
+                        'statement_id': False,
                     })
 
             if 'journal_id' in vals and vals.get('journal_id', False):
@@ -1420,6 +1421,7 @@ class account_move(osv.osv):
         context = {} if context is None else context.copy()
         default.update({
             'state':'draft',
+            'ref': False,
             'name':'/',
         })
         context.update({
@@ -1641,7 +1643,6 @@ class account_move(osv.osv):
         valid_moves = [move.id for move in valid_moves]
         return len(valid_moves) > 0 and valid_moves or False
 
-account_move()
 
 class account_move_reconcile(osv.osv):
     _name = "account.move.reconcile"
@@ -1679,7 +1680,7 @@ class account_move_reconcile(osv.osv):
                 elif reconcile.line_partial_ids:
                     first_partner = reconcile.line_partial_ids[0].partner_id.id
                     move_lines = reconcile.line_partial_ids
-                if any([line.partner_id.id != first_partner for line in move_lines]):
+                if any([(line.account_id.type in ('receivable', 'payable') and line.partner_id.id != first_partner) for line in move_lines]):
                     return False
         return True
 
@@ -1715,7 +1716,6 @@ class account_move_reconcile(osv.osv):
                 result.append((r.id,r.name))
         return result
 
-account_move_reconcile()
 
 #----------------------------------------------------------
 # Tax
@@ -1795,7 +1795,7 @@ class account_tax_code(osv.osv):
         if context.get('period_id', False):
             period_id = context['period_id']
         else:
-            period_id = self.pool.get('account.period').find(cr, uid)
+            period_id = self.pool.get('account.period').find(cr, uid, context=context)
             if not period_id:
                 return dict.fromkeys(ids, 0.0)
             period_id = period_id[0]
@@ -1863,7 +1863,12 @@ class account_tax_code(osv.osv):
     ]
     _order = 'code'
 
-account_tax_code()
+
+def get_precision_tax():
+    def change_digit_tax(cr):
+        res = openerp.registry(cr.dbname)['decimal.precision'].precision_get(cr, SUPERUSER_ID, 'Account')
+        return (16, res+3)
+    return change_digit_tax
 
 class account_tax(osv.osv):
     """
@@ -1885,12 +1890,6 @@ class account_tax(osv.osv):
         default.update({'name': name + _(' (Copy)')})
         return super(account_tax, self).copy_data(cr, uid, id, default=default, context=context)
 
-    def get_precision_tax():
-        def change_digit_tax(cr):
-            res = openerp.registry(cr.dbname)['decimal.precision'].precision_get(cr, SUPERUSER_ID, 'Account')
-            return (16, res+2)
-        return change_digit_tax
-
     _name = 'account.tax'
     _description = 'Tax'
     _columns = {
@@ -2271,7 +2270,6 @@ class account_tax(osv.osv):
                 total += r['amount']
         return res
 
-account_tax()
 
 # ---------------------------------------------------------
 # Account Entries Models
@@ -2319,7 +2317,7 @@ class account_model(osv.osv):
             try:
                 entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
             except:
-                raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
+                raise osv.except_osv(_('Wrong Model!'), _('You have a wrong expression "%(...)s" in your model!'))
             move_id = account_move_obj.create(cr, uid, {
                 'ref': entry['name'],
                 'period_id': period_id,
@@ -2331,7 +2329,7 @@ class account_model(osv.osv):
                 analytic_account_id = False
                 if line.analytic_account_id:
                     if not model.journal_id.analytic_journal_id:
-                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
+                        raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
                     analytic_account_id = line.analytic_account_id.id
                 val = {
                     'move_id': move_id,
@@ -2383,7 +2381,6 @@ class account_model(osv.osv):
 
         return {'value': {'company_id': company_id}}
 
-account_model()
 
 class account_model_line(osv.osv):
     _name = "account.model.line"
@@ -2407,7 +2404,6 @@ class account_model_line(osv.osv):
         ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model, they must be positive!'),
         ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model, they must be positive!'),
     ]
-account_model_line()
 
 # ---------------------------------------------------------
 # Account Subscription
@@ -2481,7 +2477,6 @@ class account_subscription(osv.osv):
         self.write(cr, uid, ids, {'state':'running'})
         return True
 
-account_subscription()
 
 class account_subscription_line(osv.osv):
     _name = "account.subscription.line"
@@ -2510,7 +2505,6 @@ class account_subscription_line(osv.osv):
 
     _rec_name = 'date'
 
-account_subscription_line()
 
 #  ---------------------------------------------------------------
 #   Account Templates: Account, Tax, Tax Code and chart. + Wizard
@@ -2518,7 +2512,6 @@ account_subscription_line()
 
 class account_tax_template(osv.osv):
     _name = 'account.tax.template'
-account_tax_template()
 
 class account_account_template(osv.osv):
     _order = "code"
@@ -2646,7 +2639,6 @@ class account_account_template(osv.osv):
         obj_acc._parent_store_compute(cr)
         return acc_template_ref
 
-account_account_template()
 
 class account_add_tmpl_wizard(osv.osv_memory):
     """Add one more account from the template.
@@ -2700,7 +2692,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
     def action_cancel(self, cr, uid, ids, context=None):
         return { 'type': 'state', 'state': 'end' }
 
-account_add_tmpl_wizard()
 
 class account_tax_code_template(osv.osv):
 
@@ -2772,7 +2763,6 @@ class account_tax_code_template(osv.osv):
         (_check_recursion, 'Error!\nYou cannot create recursive Tax Codes.', ['parent_id'])
     ]
     _order = 'code,name'
-account_tax_code_template()
 
 
 class account_chart_template(osv.osv):
@@ -2805,7 +2795,6 @@ class account_chart_template(osv.osv):
         'complete_tax_set': True,
     }
 
-account_chart_template()
 
 class account_tax_template(osv.osv):
 
@@ -2816,7 +2805,7 @@ class account_tax_template(osv.osv):
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'name': fields.char('Tax Name', size=64, required=True),
         'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."),
-        'amount': fields.float('Amount', required=True, digits=(14,4), help="For Tax Type percent enter % ratio between 0-1."),
+        'amount': fields.float('Amount', required=True, digits_compute=get_precision_tax(), help="For Tax Type percent enter % ratio between 0-1."),
         'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True),
         'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."),
         'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."),
@@ -2935,7 +2924,6 @@ class account_tax_template(osv.osv):
         res.update({'tax_template_to_tax': tax_template_to_tax, 'account_dict': todo_dict})
         return res
 
-account_tax_template()
 
 # Fiscal Position Templates
 
@@ -2983,7 +2971,6 @@ class account_fiscal_position_template(osv.osv):
                 })
         return True
 
-account_fiscal_position_template()
 
 class account_fiscal_position_tax_template(osv.osv):
     _name = 'account.fiscal.position.tax.template'
@@ -2996,7 +2983,6 @@ class account_fiscal_position_tax_template(osv.osv):
         'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
     }
 
-account_fiscal_position_tax_template()
 
 class account_fiscal_position_account_template(osv.osv):
     _name = 'account.fiscal.position.account.template'
@@ -3008,7 +2994,6 @@ class account_fiscal_position_account_template(osv.osv):
         'account_dest_id': fields.many2one('account.account.template', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
 
-account_fiscal_position_account_template()
 
 # ---------------------------------------------------------
 # Account generation from template wizards
@@ -3401,7 +3386,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 try:
                     tmp2 = obj_data.get_object_reference(cr, uid, *ref)
                     if tmp2: 
-                        self.pool.get(tmp2[0]).write(cr, uid, tmp2[1], {
+                        self.pool[tmp2[0]].write(cr, uid, tmp2[1], {
                             'currency_id': obj_wizard.currency_id.id
                         })
                 except ValueError, e:
@@ -3548,7 +3533,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             current_num += 1
         return True
 
-wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):
     _name='account.bank.accounts.wizard'
@@ -3560,6 +3544,5 @@ class account_bank_accounts_wizard(osv.osv_memory):
         'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
     }
 
-account_bank_accounts_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index f3617106f28..e141f33b9d1 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -143,7 +143,6 @@ class account_analytic_line(osv.osv):
             return res
         return False
 
-account_analytic_line()
 
 class res_partner(osv.osv):
     """ Inherits partner and adds contract information in the partner form """
@@ -154,6 +153,5 @@ class res_partner(osv.osv):
                                                     'partner_id', 'Contracts', readonly=True),
     }
 
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8e1a5dd26c6..8a15321b9c6 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -61,7 +61,7 @@ class account_bank_statement(osv.osv):
         return res
 
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid,context=context)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         if periods:
             return periods[0]
         return False
@@ -420,7 +420,7 @@ class account_bank_statement(osv.osv):
             for st_line in st.line_ids:
                 if st_line.analytic_account_id:
                     if not st.journal_id.analytic_journal_id:
-                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to assign an analytic journal on the '%s' journal!") % (st.journal_id.name,))
+                        raise osv.except_osv(_('No Analytic Journal!'),_("You have to assign an analytic journal on the '%s' journal!") % (st.journal_id.name,))
                 if not st_line.amount:
                     continue
                 st_line_number = self.get_next_st_line_number(cr, uid, st_number, st_line, context)
@@ -500,7 +500,6 @@ class account_bank_statement(osv.osv):
         'context':ctx,
       }
 
-account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
 
@@ -576,6 +575,5 @@ class account_bank_statement_line(osv.osv):
         'type': 'general',
     }
 
-account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 86d3b0d24de..8e3e250d41c 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -66,7 +66,6 @@ class account_cashbox_line(osv.osv):
         'bank_statement_id' : fields.many2one('account.bank.statement', ondelete='cascade'),
      }
 
-account_cashbox_line()
 
 class account_cash_statement(osv.osv):
 
@@ -253,7 +252,7 @@ class account_cash_statement(osv.osv):
         for statement in statement_pool.browse(cr, uid, ids, context=context):
             vals = {}
             if not self._user_allow(cr, uid, statement.id, context=context):
-                raise osv.except_osv(_('Error!'), (_('You do not have rights to open this %s journal !') % (statement.journal_id.name, )))
+                raise osv.except_osv(_('Error!'), (_('You do not have rights to open this %s journal!') % (statement.journal_id.name, )))
 
             if statement.name and statement.name == '/':
                 c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
@@ -316,7 +315,6 @@ class account_cash_statement(osv.osv):
 
         return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
 
-account_cash_statement()
 
 class account_journal(osv.osv):
     _inherit = 'account.journal'
@@ -336,7 +334,6 @@ class account_journal(osv.osv):
         'cashbox_line_ids' : _default_cashbox_line_ids,
     }
 
-account_journal()
 
 class account_journal_cashbox_line(osv.osv):
     _name = 'account.journal.cashbox.line'
@@ -348,6 +345,5 @@ class account_journal_cashbox_line(osv.osv):
 
     _order = 'pieces asc'
 
-account_journal_cashbox_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_financial_report.py b/addons/account/account_financial_report.py
index e8b58f61882..0c2e5845b89 100644
--- a/addons/account/account_financial_report.py
+++ b/addons/account/account_financial_report.py
@@ -138,6 +138,5 @@ class account_financial_report(osv.osv):
         'style_overwrite': 0,
     }
 
-account_financial_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_financial_report_data.xml b/addons/account/account_financial_report_data.xml
index 6410a5e887c..e8ff33151c3 100644
--- a/addons/account/account_financial_report_data.xml
+++ b/addons/account/account_financial_report_data.xml
@@ -6,16 +6,19 @@
         -->
         <record id="account_financial_report_profitandloss0" model="account.financial.report">
             <field name="name">Profit and Loss</field>
+            <field name="sign" eval="-1" />
             <field name="type">sum</field>
         </record>
         <record id="account_financial_report_income0" model="account.financial.report">
             <field name="name">Income</field>
+            <field name="sign" eval="-1" />
             <field name="parent_id" ref="account_financial_report_profitandloss0"/>
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>
         </record>
         <record id="account_financial_report_expense0" model="account.financial.report">
             <field name="name">Expense</field>
+            <field name="sign" eval="-1" />
             <field name="parent_id" ref="account_financial_report_profitandloss0"/>
             <field name="display_detail">detail_with_hierarchy</field>
             <field name="type">account_type</field>
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 58e824a6250..b03babc63ac 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -20,10 +20,11 @@
                     </p>
                     <group>
                         <field name="charts" class="oe_inline"/>
+                        <field name="company_id" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     </group>
                     <group string="Configure your Fiscal Year" groups="account.group_account_user">
                         <field name="has_default_company" invisible="1" />
-                        <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+                        
                         <label for="date_start" string="Date Range"/>
                         <div>
                             <field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 222a0bebbb4..01476374cf4 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -69,7 +69,7 @@ class account_invoice(osv.osv):
         tt = type2journal.get(type_inv, 'sale')
         result = self.pool.get('account.analytic.journal').search(cr, uid, [('type','=',tt)], context=context)
         if not result:
-            raise osv.except_osv(_('No Analytic Journal !'),_("You must define an analytic journal of type '%s'!") % (tt,))
+            raise osv.except_osv(_('No Analytic Journal!'),_("You must define an analytic journal of type '%s'!") % (tt,))
         return result[0]
 
     def _get_type(self, cr, uid, context=None):
@@ -89,13 +89,43 @@ class account_invoice(osv.osv):
         return [('none', _('Free Reference'))]
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
+        """Function of the field residua. It computes the residual amount (balance) for each invoice"""
+        if context is None:
+            context = {}
+        ctx = context.copy()
         result = {}
+        currency_obj = self.pool.get('res.currency')
         for invoice in self.browse(cr, uid, ids, context=context):
+            nb_inv_in_partial_rec = max_invoice_id = 0
             result[invoice.id] = 0.0
             if invoice.move_id:
-                for m in invoice.move_id.line_id:
-                    if m.account_id.type in ('receivable','payable'):
-                        result[invoice.id] += m.amount_residual_currency
+                for aml in invoice.move_id.line_id:
+                    if aml.account_id.type in ('receivable','payable'):
+                        if aml.currency_id and aml.currency_id.id == invoice.currency_id.id:
+                            result[invoice.id] += aml.amount_residual_currency
+                        else:
+                            ctx['date'] = aml.date
+                            result[invoice.id] += currency_obj.compute(cr, uid, aml.company_id.currency_id.id, invoice.currency_id.id, aml.amount_residual, context=ctx)
+
+                        if aml.reconcile_partial_id.line_partial_ids:
+                            #we check if the invoice is partially reconciled and if there are other invoices
+                            #involved in this partial reconciliation (and we sum these invoices)
+                            for line in aml.reconcile_partial_id.line_partial_ids:
+                                if line.invoice:
+                                    nb_inv_in_partial_rec += 1
+                                    #store the max invoice id as for this invoice we will make a balance instead of a simple division
+                                    max_invoice_id = max(max_invoice_id, line.invoice.id)
+            if nb_inv_in_partial_rec:
+                #if there are several invoices in a partial reconciliation, we split the residual by the number
+                #of invoice to have a sum of residual amounts that matches the partner balance
+                new_value = currency_obj.round(cr, uid, invoice.currency_id, result[invoice.id] / nb_inv_in_partial_rec)
+                if invoice.id == max_invoice_id:
+                    #if it's the last the invoice of the bunch of invoices partially reconciled together, we make a
+                    #balance to avoid rounding errors
+                    result[invoice.id] = result[invoice.id] - ((nb_inv_in_partial_rec - 1) * new_value)
+                else:
+                    result[invoice.id] = new_value
+
             #prevent the residual amount on the invoice to be less than 0
             result[invoice.id] = max(result[invoice.id], 0.0)            
         return result
@@ -286,7 +316,10 @@ class account_invoice(osv.osv):
         'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, track_visibility='onchange', states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]}),
+        'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Commercial Entity', type='many2one',
+                                                relation='res.partner', store=True, readonly=True,
+                                                help="The commercial entity that will be used on Journal Entries for this invoice")
     }
     _defaults = {
         'type': _get_type,
@@ -313,7 +346,7 @@ class account_invoice(osv.osv):
             context = {}
 
         if context.get('active_model', '') in ['res.partner'] and context.get('active_ids', False) and context['active_ids']:
-            partner = self.pool.get(context['active_model']).read(cr, uid, context['active_ids'], ['supplier','customer'])[0]
+            partner = self.pool[context['active_model']].read(cr, uid, context['active_ids'], ['supplier','customer'])[0]
             if not view_type:
                 view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'account.invoice.tree')])
                 view_type = 'tree'
@@ -367,18 +400,6 @@ class account_invoice(osv.osv):
         context['view_id'] = view_id
         return context
 
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        try:
-            return super(account_invoice, self).create(cr, uid, vals, context)
-        except Exception, e:
-            if '"journal_id" viol' in e.args[0]:
-                raise orm.except_orm(_('Configuration Error!'),
-                     _('There is no Sale/Purchase Journal(s) defined.'))
-            else:
-                raise orm.except_orm(_('Unknown Error!'), str(e))
-
     def invoice_print(self, cr, uid, ids, context=None):
         '''
         This function prints the invoice and mark it as sent, so that we can see more easily the next step of the workflow
@@ -609,7 +630,7 @@ class account_invoice(osv.osv):
                         obj_l = account_obj.browse(cr, uid, inv_line[2]['account_id'])
                         if obj_l.company_id.id != company_id:
                             raise osv.except_osv(_('Configuration Error!'),
-                                _('Invoice line account\'s company and invoice\'s compnay does not match.'))
+                                _('Invoice line account\'s company and invoice\'s company does not match.'))
                         else:
                             continue
         if company_id and type:
@@ -644,6 +665,26 @@ class account_invoice(osv.osv):
         self.create_workflow(cr, uid, ids)
         return True
 
+    # ----------------------------------------
+    # Mail related methods
+    # ----------------------------------------
+
+    def _get_formview_action(self, cr, uid, id, context=None):
+        """ Update form view id of action to open the invoice """
+        action = super(account_invoice, self)._get_formview_action(cr, uid, id, context=context)
+        obj = self.browse(cr, uid, id, context=context)
+        if obj.type == 'in_invoice':
+            model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
+            action.update({
+                'views': [(view_id, 'form')],
+                })
+        else:
+            model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
+            action.update({
+                'views': [(view_id, 'form')],
+                })
+        return action
+
     # Workflow stuff
     #################
 
@@ -731,7 +772,7 @@ class account_invoice(osv.osv):
         inv = self.browse(cr, uid, id)
         cur_obj = self.pool.get('res.currency')
 
-        company_currency = inv.company_id.currency_id.id
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         if inv.type in ('out_invoice', 'in_refund'):
             sign = 1
         else:
@@ -745,7 +786,7 @@ class account_invoice(osv.osv):
                 else:
                     ref = self._convert_ref(cr, uid, inv.number)
                 if not inv.journal_id.analytic_journal_id:
-                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,))
+                    raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal!") % (inv.journal_id.name,))
                 il['analytic_lines'] = [(0,0, {
                     'name': il['name'],
                     'date': inv['date_invoice'],
@@ -778,6 +819,7 @@ class account_invoice(osv.osv):
         return move_lines
 
     def check_tax_lines(self, cr, uid, inv, compute_taxes, ait_obj):
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id
         if not inv.tax_line:
             for tax in compute_taxes.values():
                 ait_obj.create(cr, uid, tax)
@@ -791,7 +833,7 @@ class account_invoice(osv.osv):
                 if not key in compute_taxes:
                     raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
                 base = compute_taxes[key]['base']
-                if abs(base - tax.base) > inv.company_id.currency_id.rounding:
+                if abs(base - tax.base) > company_currency.rounding:
                     raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.'))
             for key in compute_taxes:
                 if not key in tax_key:
@@ -870,7 +912,7 @@ class account_invoice(osv.osv):
             if not inv.journal_id.sequence_id:
                 raise osv.except_osv(_('Error!'), _('Please define sequence on the journal related to this invoice.'))
             if not inv.invoice_line:
-                raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
+                raise osv.except_osv(_('No Invoice Lines!'), _('Please create some invoice lines.'))
             if inv.move_id:
                 continue
 
@@ -878,7 +920,7 @@ class account_invoice(osv.osv):
             ctx.update({'lang': inv.partner_id.lang})
             if not inv.date_invoice:
                 self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx)
-            company_currency = inv.company_id.currency_id.id
+            company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
             # create the analytical lines
             # one move line per invoice line
             iml = self._get_analytic_lines(cr, uid, inv.id, context=ctx)
@@ -891,7 +933,7 @@ class account_invoice(osv.osv):
             group_check_total = self.pool.get('res.groups').browse(cr, uid, group_check_total_id, context=context)
             if group_check_total and uid in [x.id for x in group_check_total.users]:
                 if (inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0)):
-                    raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe encoded total does not match the computed total.'))
+                    raise osv.except_osv(_('Bad Total!'), _('Please verify the price of the invoice!\nThe encoded total does not match the computed total.'))
 
             if inv.payment_term:
                 total_fixed = total_percent = 0
@@ -994,11 +1036,11 @@ class account_invoice(osv.osv):
                 'line_id': line,
                 'journal_id': journal_id,
                 'date': date,
-                'narration':inv.comment
+                'narration': inv.comment,
+                'company_id': inv.company_id.id,
             }
             period_id = inv.period_id and inv.period_id.id or False
-            ctx.update(company_id=inv.company_id.id,
-                       account_period_prefer_normal=True)
+            ctx.update(company_id=inv.company_id.id)
             if not period_id:
                 period_ids = period_obj.find(cr, uid, inv.date_invoice, context=ctx)
                 period_id = period_ids and period_ids[0] or False
@@ -1274,9 +1316,7 @@ class account_invoice(osv.osv):
             ref = invoice.reference
         else:
             ref = self._convert_ref(cr, uid, invoice.number)
-        partner = invoice.partner_id
-        if partner.parent_id and not partner.is_company:
-            partner = partner.parent_id
+        partner = self.pool['res.partner']._find_accounting_partner(invoice.partner_id)
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
@@ -1435,7 +1475,7 @@ class account_invoice_line(osv.osv):
         context = dict(context)
         context.update({'company_id': company_id, 'force_company': company_id})
         if not partner_id:
-            raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
+            raise osv.except_osv(_('No Partner Defined!'),_("You must first select a partner!") )
         if not product:
             if type in ('in_invoice', 'in_refund'):
                 return {'value': {}, 'domain':{'product_uom':[]}}
@@ -1450,6 +1490,7 @@ class account_invoice_line(osv.osv):
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
 
+        result['name'] = res.partner_ref
         if type in ('out_invoice','out_refund'):
             a = res.property_account_income.id
             if not a:
@@ -1464,19 +1505,21 @@ class account_invoice_line(osv.osv):
 
         if type in ('out_invoice', 'out_refund'):
             taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+            if res.description_sale:
+                result['name'] += '\n'+res.description_sale
         else:
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
+            if res.description_purchase:
+                result['name'] += '\n'+res.description_purchase
+
         tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
         if type in ('in_invoice', 'in_refund'):
             result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
         else:
             result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
-        result['name'] = res.partner_ref
 
         result['uos_id'] = uom_id or res.uom_id.id
-        if res.description:
-            result['name'] += '\n'+res.description
 
         domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]}
 
@@ -1529,8 +1572,7 @@ class account_invoice_line(osv.osv):
         if context is None:
             context = {}
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
-        company_currency = inv.company_id.currency_id.id
-
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         for line in inv.invoice_line:
             mres = self.move_line_get_item(cr, uid, line, context)
             if not mres:
@@ -1596,7 +1638,6 @@ class account_invoice_line(osv.osv):
                 unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
         return {'value':{'invoice_line_tax_id': unique_tax_ids}}
 
-account_invoice_line()
 
 class account_invoice_tax(osv.osv):
     _name = "account.invoice.tax"
@@ -1675,8 +1716,7 @@ class account_invoice_tax(osv.osv):
         cur_obj = self.pool.get('res.currency')
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         cur = inv.currency_id
-        company_currency = inv.company_id.currency_id.id
-
+        company_currency = self.pool['res.company'].browse(cr, uid, inv.company_id.id).currency_id.id
         for line in inv.invoice_line:
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
                 val={}
@@ -1747,15 +1787,11 @@ class res_partner(osv.osv):
         'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
     }
 
-    def _find_accounting_partner(self, part):
+    def _find_accounting_partner(self, partner):
         '''
         Find the partner for which the accounting entries will be created
         '''
-        #if the chosen partner is not a company and has a parent company, use the parent for the journal entries
-        #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
-        if part.parent_id and not part.is_company:
-            part = part.parent_id
-        return part
+        return partner.commercial_partner_id
 
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8c0854bd6c6..c71b97d5796 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -117,6 +117,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'" string="Invoice">
                     <field name="partner_id" groups="base.group_user"/>
+                    <field name="commercial_partner_id" invisible="1"/>
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="reference" invisible="1"/>
@@ -196,7 +197,7 @@
                                     <field name="name"/>
                                     <field name="company_id" invisible="1"/>
                                     <field name="account_id" groups="account.group_account_user"
-                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '=', 'other')]"
                                         on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
                                         domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
@@ -319,8 +320,9 @@
                         <group>
                             <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, 'show_address': 1}"
-                                options='{"always_reload": True}'/>
+                                context="{'search_default_customer':1, 'show_address': 1}"
+                                options='{"always_reload": True}'
+                                domain="[('customer', '=', True)]"/>
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>
@@ -351,7 +353,7 @@
                                     <field name="name"/>
                                     <field name="company_id" invisible="1"/>
                                     <field name="account_id" groups="account.group_account_user"
-                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '=', 'other')]"
                                         on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
                                         domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
@@ -447,18 +449,20 @@
             <field name="model">account.invoice</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                    <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self), ('partner_id', 'ilike', self)]"/>
+                    <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self), ('partner_id', 'child_of', self)]"/>
                     <filter name="draft" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                     <filter name="proforma" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                     <filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
                     <filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                     <separator/>
-                    <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id" string="Salesperson"/>
                     <field name="period_id" string="Period"/>
+                    <separator/>
+                    <filter domain="[('user_id','=',uid)]" help="My Invoices"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                    	<filter name="partner_id" string="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                    	<filter name="commercial_partner_id" string="Commercial Partner" domain="[]" context="{'group_by':'commercial_partner_id'}"/>
                         <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
@@ -621,8 +625,6 @@
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 
-        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_res_partner_2_account_invoice_opened" name="Invoices" res_model="account.invoice" src_model="res.partner"/>
-
         <act_window
            id="act_account_journal_2_account_invoice_opened"
            name="Unpaid Invoices"
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 082d654c5a2..e604cc6d1a4 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -192,7 +192,7 @@ class account_move_line(osv.osv):
         for obj_line in self.browse(cr, uid, ids, context=context):
             if obj_line.analytic_account_id:
                 if not obj_line.journal_id.analytic_journal_id:
-                    raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
+                    raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
                 vals_line = self._prepare_analytic_line(cr, uid, obj_line, context=context)
                 acc_ana_line_obj.create(cr, uid, vals_line)
         return True
@@ -559,10 +559,11 @@ class account_move_line(osv.osv):
     ]
 
     def _auto_init(self, cr, context=None):
-        super(account_move_line, self)._auto_init(cr, context=context)
+        res = super(account_move_line, self)._auto_init(cr, context=context)
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
+        return res
 
     def _check_no_view(self, cr, uid, ids, context=None):
         lines = self.browse(cr, uid, ids, context=context)
@@ -625,7 +626,7 @@ class account_move_line(osv.osv):
         (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
         (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
         (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
-        (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']),
+        (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
         (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
     ]
 
@@ -654,13 +655,7 @@ class account_move_line(osv.osv):
         }
         return result
 
-    def onchange_account_id(self, cr, uid, ids, account_id, context=None):
-        res = {'value': {}}
-        if account_id:
-            res['value']['account_tax_id'] = [x.id for x in self.pool.get('account.account').browse(cr, uid, account_id, context=context).tax_ids]
-        return res
-
-    def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False):
+    def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False, context=None):
         partner_obj = self.pool.get('res.partner')
         payment_term_obj = self.pool.get('account.payment.term')
         journal_obj = self.pool.get('account.journal')
@@ -674,8 +669,8 @@ class account_move_line(osv.osv):
             date = datetime.now().strftime('%Y-%m-%d')
         jt = False
         if journal:
-            jt = journal_obj.browse(cr, uid, journal).type
-        part = partner_obj.browse(cr, uid, partner_id)
+            jt = journal_obj.browse(cr, uid, journal, context=context).type
+        part = partner_obj.browse(cr, uid, partner_id, context=context)
 
         payment_term_id = False
         if jt and jt in ('purchase', 'purchase_refund') and part.property_supplier_payment_term:
@@ -700,20 +695,20 @@ class account_move_line(osv.osv):
                     elif part.supplier:
                         val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id1)
                 if val.get('account_id', False):
-                    d = self.onchange_account_id(cr, uid, ids, val['account_id'])
+                    d = self.onchange_account_id(cr, uid, ids, account_id=val['account_id'], partner_id=part.id, context=context)
                     val.update(d['value'])
         return {'value':val}
 
-    def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False):
+    def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False, context=None):
         account_obj = self.pool.get('account.account')
         partner_obj = self.pool.get('res.partner')
         fiscal_pos_obj = self.pool.get('account.fiscal.position')
         val = {}
         if account_id:
-            res = account_obj.browse(cr, uid, account_id)
+            res = account_obj.browse(cr, uid, account_id, context=context)
             tax_ids = res.tax_ids
             if tax_ids and partner_id:
-                part = partner_obj.browse(cr, uid, partner_id)
+                part = partner_obj.browse(cr, uid, partner_id, context=context)
                 tax_id = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, tax_ids)[0]
             else:
                 tax_id = tax_ids and tax_ids[0].id or False
@@ -985,8 +980,7 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
         period_pool = self.pool.get('account.period')
-        ctx = dict(context, account_period_prefer_normal=True)
-        pids = period_pool.find(cr, user, date, context=ctx)
+        pids = period_pool.find(cr, user, date, context=context)
         if pids:
             res.update({
                 'period_id':pids[0]
@@ -1107,7 +1101,7 @@ class account_move_line(osv.osv):
         period = period_obj.browse(cr, uid, period_id, context=context)
         for (state,) in result:
             if state == 'done':
-                raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name)))                
+                raise osv.except_osv(_('Error!'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name)))                
         if not result:
             jour_period_obj.create(cr, uid, {
                 'name': (journal.code or journal.name)+':'+(period.name or ''),
@@ -1187,7 +1181,7 @@ class account_move_line(osv.osv):
                     move_id = move_obj.create(cr, uid, v, context)
                     vals['move_id'] = move_id
                 else:
-                    raise osv.except_osv(_('No piece number !'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
+                    raise osv.except_osv(_('No Piece Number!'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
         ok = not (journal.type_control_ids or journal.account_control_ids)
         if ('account_id' in vals):
             account = account_obj.browse(cr, uid, vals['account_id'], context=context)
@@ -1308,6 +1302,5 @@ class account_move_line(osv.osv):
                 bool(journal.currency),bool(journal.analytic_journal_id)))
         return result
 
-account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b8dcefdd3a4..e921e639642 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -907,9 +907,7 @@
                                 <label for="type"/>
                                 <div>
                                     <field name="type"/>
-                                    <field name="amount" class="oe_inline"
-                                        attrs="{'invisible':[('type','in',('none', 'code', 'balance'))]}"/>
-                                    <label string="%%" attrs="{'invisible':[('type','&lt;&gt;','percent')]}"/>
+                                    <field name="amount" attrs="{'invisible':[('type','in',('none', 'code', 'balance'))]}"/>
                                 </div>
                                 <field name="python_compute" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>
                                 <field name="python_compute_inv" attrs="{'invisible':[('type','!=','code')],'required':[('type','=','code')]}"/>
@@ -1112,7 +1110,7 @@
                     <field name="ref"/>
                     <field name="statement_id" invisible="1"/>
                     <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
-                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id)"/>
+                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id, partner_id, context)"/>
                     <field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
                     <field name="move_id" required="0"/>
@@ -1194,7 +1192,12 @@
             sequence="1"
             groups="group_account_user"
         />
-
+        <record id="action_account_moves_all_tree" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+        </record>
         <record id="view_move_line_tree_reconcile" model="ir.ui.view">
             <field name="model">account.move.line</field>
             <field eval="24" name="priority"/>
@@ -1288,7 +1291,7 @@
                                     <group col="6" colspan="4">
                                         <field name="name"/>
                                         <field name="ref"/>
-                                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                        <field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, date, journal_id, context)"/>
 
                                         <field name="journal_id"/>
                                         <field name="period_id"/>
@@ -1352,7 +1355,7 @@
                                 <tree colors="blue:state == 'draft';black:state == 'posted'" editable="top" string="Journal Items">
                                     <field name="invoice"/>
                                     <field name="name"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(False, partner_id, account_id, debit, credit, parent.date, parent.journal_id, context)"/>
                                     <field name="account_id" domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
                                     <field name="date_maturity"/>
                                     <field name="debit" sum="Total Debit"/>
@@ -1771,23 +1774,6 @@
             </field>
         </record>
 
-        <!-- res.partner links -->
-        <act_window
-            context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
-            domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
-            id="act_account_partner_account_move_all"
-            name="Receivables &amp; Payables"
-            res_model="account.move.line"
-            src_model="res.partner"/>
-
-        <act_window 
-            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
-            id="act_account_partner_account_move"
-            name="Journal Items"
-            res_model="account.move.line"
-            src_model="res.partner"
-            groups="account.group_account_user"/>
-
         <!-- Account Templates -->
         <menuitem
             id="account_template_folder"
@@ -2123,10 +2109,8 @@
                         <group attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
                         </group>
-                        <group groups="base.group_multi_company">
-                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                        </group>
                         <group>
+                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                             <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
diff --git a/addons/account/company.py b/addons/account/company.py
index a4624ae5ad5..3f2db1b98b8 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -47,6 +47,5 @@ Thank you in advance for your cooperation.
 Best Regards,'''
     }
 
-res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index ce9a09def08..3940c1e5357 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -313,8 +313,8 @@
             <field name="code">TSAJ</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
+            <field name="default_credit_account_id" ref="a_sale"/>
+            <field name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -323,8 +323,8 @@
             <field name="code">TSCNJ</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
+            <field name="default_credit_account_id" ref="a_sale"/>
+            <field name="default_debit_account_id" ref="a_sale"/>
             <field name="analytic_journal_id" ref="cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -334,8 +334,8 @@
             <field name="code">TEXJ</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
+            <field name="default_debit_account_id" ref="a_expense"/>
+            <field name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -344,8 +344,8 @@
             <field name="code">TECNJ</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
+            <field name="default_debit_account_id" ref="a_expense"/>
+            <field name="default_credit_account_id" ref="a_expense"/>
             <field name="analytic_journal_id" ref="exp"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -355,8 +355,8 @@
             <field name="code">TBNK</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="bnk"/>
-            <field model="account.account" name="default_credit_account_id" ref="bnk"/>
+            <field name="default_debit_account_id" ref="bnk"/>
+            <field name="default_credit_account_id" ref="bnk"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -365,8 +365,8 @@
             <field name="code">TCHK</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="default_debit_account_id" ref="cash"/>
+            <field name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -374,9 +374,9 @@
             <field name="name">Cash Journal - (test)</field>
             <field name="code">TCSH</field>
             <field name="type">cash</field>
-            <field name="profit_account_id" model="account.account" ref="rsa" />
-            <field name="loss_account_id" model="account.account" ref="rsa" />
-            <field name="internal_account_id" model="account.account" ref="rsa" />
+            <field name="profit_account_id" ref="rsa" />
+            <field name="loss_account_id" ref="rsa" />
+            <field name="internal_account_id" ref="rsa" />
             <field name="with_last_closing_balance" eval="True" />
             <!--
                  Usually, cash payment methods requires a control at opening and closing.
@@ -385,8 +385,8 @@
             -->
             <field name="cash_control" eval="False"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field name="default_debit_account_id" ref="cash"/>
+            <field name="default_credit_account_id" ref="cash"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -403,8 +403,8 @@
             <field name="code">TOEJ</field>
             <field name="type">situation</field>
             <field name="sequence_id" ref="sequence_opening_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="o_income"/>
-            <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
+            <field name="default_debit_account_id" ref="o_income"/>
+            <field name="default_credit_account_id" ref="o_expense"/>
             <field eval="True" name="centralisation"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -413,8 +413,8 @@
             <field name="name">USD Bank Journal - (test)</field>
             <field name="code">TUBK</field>
             <field name="type">bank</field>
-            <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
-            <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
+            <field name="default_debit_account_id" ref="usd_bnk"/>
+            <field name="default_credit_account_id" ref="usd_bnk"/>
             <field name="currency" ref="base.USD"/>
         </record>
         <!--
diff --git a/addons/account/html/account_illu_01.png b/addons/account/html/account_illu_01.png
new file mode 100644
index 00000000000..2e0dbf4aac2
Binary files /dev/null and b/addons/account/html/account_illu_01.png differ
diff --git a/addons/account/html/account_illu_02.png b/addons/account/html/account_illu_02.png
new file mode 100644
index 00000000000..66e680bc42e
Binary files /dev/null and b/addons/account/html/account_illu_02.png differ
diff --git a/addons/account/html/account_illu_03.png b/addons/account/html/account_illu_03.png
new file mode 100644
index 00000000000..4fff4837faa
Binary files /dev/null and b/addons/account/html/account_illu_03.png differ
diff --git a/addons/account/html/account_sc_00.png b/addons/account/html/account_sc_00.png
new file mode 100644
index 00000000000..9605506c6a5
Binary files /dev/null and b/addons/account/html/account_sc_00.png differ
diff --git a/addons/account/html/account_sc_01.png b/addons/account/html/account_sc_01.png
new file mode 100644
index 00000000000..f5a216ec9e3
Binary files /dev/null and b/addons/account/html/account_sc_01.png differ
diff --git a/addons/account/html/account_sc_02.png b/addons/account/html/account_sc_02.png
new file mode 100644
index 00000000000..709e444ba0d
Binary files /dev/null and b/addons/account/html/account_sc_02.png differ
diff --git a/addons/account/html/account_sc_03.png b/addons/account/html/account_sc_03.png
new file mode 100644
index 00000000000..a3e3afc34c0
Binary files /dev/null and b/addons/account/html/account_sc_03.png differ
diff --git a/addons/account/html/account_sc_04.png b/addons/account/html/account_sc_04.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/account/html/account_sc_04.png differ
diff --git a/addons/account/html/account_sc_05.png b/addons/account/html/account_sc_05.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/account/html/account_sc_05.png differ
diff --git a/addons/account/html/account_sc_06.png b/addons/account/html/account_sc_06.png
new file mode 100644
index 00000000000..afe0423504e
Binary files /dev/null and b/addons/account/html/account_sc_06.png differ
diff --git a/addons/account/html/index.html b/addons/account/html/index.html
new file mode 100644
index 00000000000..09a58fb3246
--- /dev/null
+++ b/addons/account/html/index.html
@@ -0,0 +1,205 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Accounting Made Easy</h2>
+        <h3 class="oe_slogan">Beautiful, easy, full featured</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=account">
+                    <img src="account_sc_00.png" alt="Online Demo">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+By far the most beautiful and full featured accounting software. OpenERP Accounting allows a better way to collaborate with your accountants, your customers and control your suppliers.</p>
+            <p>
+Activate features on demand, from integrated analytic accounting to budget, assets and multiple companies consolidation.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">A Smart User Interface</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Record transactions in a few clicks and easily manage all financial activities
+in one place. OpenERP's user interface is designed with productivity in mind.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_01.png">
+        </div>
+ 
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">A Better Way To Work – Together</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_02.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Share access to your latest business numbers with your team and your accountant – so everyone is up to speed. From work, home or on the go.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Connect Your Bank Accounts</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Import your bank statements and reconcile them in just a few clicks. Prepare payment orders based on your supplier invoices and payment terms.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture" src="account_illu_01.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <h2 class="oe_slogan">Get Paid Faster</h2>
+    <h3 class="oe_slogan">Electronic invoicing and automated follow-ups</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_03.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Create and send professional invoices &amp; get paid online. Get rid of the stress of having to constantly remind your debtors. Simply set-up and automate follow-ups to get paid quickly.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Sales Integration</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Automatically create invoices from sales orders, delivery orders or base them on time and material. Re-invoice expenses on projects to your customer in just a few clicks.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_04.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_05.png">
+        </div>
+        <div class="oe_span6">
+        <h2 class="oe_slogan">Purchase Integration</h2>
+            <p class='oe_mt32'>
+Control supplier invocies based on purchase orders. Get real-time inventory valuation reports automatically posted in your accounts.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Multi-Level Analytic Accounting</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Integrate your analytic accounting operations with timesheets, projects, invoices, expenses, etc. No need to record transactions, all analytic entries are posted automatically following your business rules.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_06.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Everything you need to grow</h2>
+        <div class="oe_span6">
+            <img src="account_illu_02.png">
+        </div>
+        <div class="oe_span6"> 
+            <p class='oe_mt32'>
+Manage your assets, track expenses, control budgets, multi-level analytic accounting; OpenERP has all the features you need to sustain all your business activities.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row"> 
+       <h2 class="oe_slogan">Scale With Your Organization</h2>
+       <h3 class="oe_slogan">Used by very small to very large organizations</h3>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+OpenERP supports multiple currencies, multiple users with different access rights, multiple companies with real time consolidation and unlimited analytic plans.
+            </p>
+        </div>        
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_illu_03.png">
+        </div>  
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Dashboard & KPIs</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_06.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get direct access to key information with dynamic and customizable dashboards. Analyse your financial activities with the drill-up, drill-down, drill-across and filter features. 
+            </p>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP  Accounting is a great way to record all business transactions
+                    right when they happen. Awesome and cost-effective!
+                </q>
+                <cite class="oe_cite oe_clearfix oe_ml64">
+                    <div class="oe_author">Wolfgang Taferner</div>
+                    <div class="oe_job"><a href="http://tapo-it.at/en/" target="_blank">Tapo</a>, Austria.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We have found accounting module of OpenERP to be user
+                    friendly and highly customizable. It proved to be an accounting gem.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="testimonial_sunil.jpg">
+                    <div class="oe_author">Col. Sunil Prem.</div>
+                    <div class="oe_job">Director of <a href="http://www.navyuginfo.com" target="_blank">Navyug Infosolutions Pvt. Ltd</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/addons/account/html/sc00.png b/addons/account/html/sc00.png
new file mode 100644
index 00000000000..9605506c6a5
Binary files /dev/null and b/addons/account/html/sc00.png differ
diff --git a/addons/account/html/testimonial_sunil.jpg b/addons/account/html/testimonial_sunil.jpg
new file mode 100644
index 00000000000..f2ad6929a2b
Binary files /dev/null and b/addons/account/html/testimonial_sunil.jpg differ
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 172dea460df..139807ab49b 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -1,20 +1,20 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
 # * account
-# Els Van Vossel <evv@agaplan.eu>, 2012.
+# Els Van Vossel <evv@agaplan.eu>, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-19 18:03+0000\n"
+"PO-Revision-Date: 2013-04-15 23:02+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:20+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 "Language: nl\n"
 
 #. module: account
@@ -258,7 +258,7 @@ msgstr "Belgische rapporten"
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
-msgstr ""
+msgstr "Goedgekeurd"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
@@ -473,14 +473,14 @@ msgstr ""
 #. module: account
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Informatie Afzender naar Begunstigde"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
 msgid "Period :"
-msgstr ""
+msgstr "Periode:"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -494,6 +494,7 @@ msgstr "Boekhoudplansjabloon"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create refund, reconcile and create a new draft invoice"
 msgstr ""
+"Wijzigen: factuur crediteren, afpunten en een nieuwe conceptfactuur maken"
 
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
@@ -803,7 +804,7 @@ msgstr "Stel de bankrekeningen van uw bedrijf in"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Refund"
-msgstr ""
+msgstr "Creditnota maken"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -833,7 +834,7 @@ msgstr "Bent u zeker dat u de boeking wilt uitvoeren?"
 #: code:addons/account/account_invoice.py:1330
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Factuur is gedeeltelijk betaald: %s%s of %s%s (%s%s blijft open)"
 
 #. module: account
 #: view:account.invoice:0
@@ -1010,6 +1011,8 @@ msgid ""
 "                                                  opening/closing fiscal "
 "year process."
 msgstr ""
+"U kunt geen afpunting ongedaan maken als deze afpunting voortkomt uit een "
+"heropening."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -1052,7 +1055,7 @@ msgstr "Aankoopjournaal"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
-msgstr ""
+msgstr "Factuur betaald"
 
 #. module: account
 #: view:validate.account.move:0
@@ -1375,6 +1378,8 @@ msgid ""
 "The amount expressed in the secondary currency must be positif when journal "
 "item are debit and negatif when journal item are credit."
 msgstr ""
+"Het bedrag in secundaire munt moet positief zijn als de boekingslijn  debet "
+"is en negatief bij een creditbedrag."
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1940,7 +1945,7 @@ msgstr "Verkopen per rekeningtype"
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
-msgstr ""
+msgstr "15 dagen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -2084,7 +2089,7 @@ msgstr "Voorlopig rekeninguittreksel"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Factuur goedgekeurd"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
@@ -2342,6 +2347,7 @@ msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
 msgstr ""
+"U kunt het rekeningtype niet wijzigen in '%s' omdat er al boekingen zijn."
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2358,7 +2364,7 @@ msgstr "Boekjaar afsluiten"
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Journaal:"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2718,6 +2724,8 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
 "contains journal items!"
 msgstr ""
+"U kunt het rekeningtype niet wijzigen van 'Afgesloten' in een ander type als "
+"er boekingen zijn."
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
@@ -2811,7 +2819,7 @@ msgstr "Rekeningeigenschappen"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Maak een voorlopige creditnota"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -3360,7 +3368,7 @@ msgstr ""
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Afpuntingen ongedaan maken"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3558,7 +3566,7 @@ msgstr "Aantal cijfers voor de rekeningcode"
 #. module: account
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
-msgstr ""
+msgstr "Betaaltermijn leverancier"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3633,7 +3641,7 @@ msgstr "Elektronisch bestand"
 #. module: account
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
-msgstr ""
+msgstr "Afpuntingsreferentie"
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
@@ -3734,6 +3742,88 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hallo ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>Er is een nieuwe factuur voor u: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENTIE</strong><br />\n"
+"       &nbsp;&nbsp;Factuurnummer: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Totaal: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Datum: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referentie: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Uw contactpersoon: <a "
+"href=\"mailto:${object.user_id.email or "
+"''}?subject=Factuur%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>U kunt ook onmiddellijk betalen via Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Neem gerust contact met ons op als u vragen heeft.</p>\n"
+"    <p>Bedankt dat u hebt gekozen voor ${object.company_id.name or "
+"'ons'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Tel.:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web:&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: view:account.period:0
@@ -3922,6 +4012,8 @@ msgid ""
 "You cannot create journal items with a secondary currency without recording "
 "both 'currency' and 'amount currency' field."
 msgstr ""
+"U kunt geen boekingslijnen in een secundaire munt maken zonder beide velden "
+"'valuta' en 'bedrag valuta' in te vullen."
 
 #. module: account
 #: field:account.financial.report,display_detail:0
@@ -4224,7 +4316,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4498,7 +4590,7 @@ msgstr "Uw bankrekeningen instellen"
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Relatie-ID"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
@@ -4704,6 +4796,8 @@ msgid ""
 "This payment term will be used instead of the default one for sale orders "
 "and customer invoices"
 msgstr ""
+"Deze betalingsvoorwaarde vervangt de standaardvoorwaarde van de huidige "
+"relatie."
 
 #. module: account
 #: view:account.config.settings:0
@@ -4731,7 +4825,7 @@ msgstr "Geboekte lijnen"
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
-msgstr ""
+msgstr "Geen aanmaning"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4858,6 +4952,7 @@ msgstr "Maand"
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
 msgstr ""
+"U kunt de code van een rekening niet wijzigen als er al boekingen zijn."
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
@@ -4895,7 +4990,7 @@ msgstr "Rek.type"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
-msgstr ""
+msgstr "Bank en cheques"
 
 #. module: account
 #: field:account.account.template,note:0
@@ -4977,7 +5072,7 @@ msgstr "Schakel dit in als u ook rekeningen met een nulsaldo wilt weergeven."
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Afpunting openingsboekingen"
 
 #. module: account
 #. openerp-web
@@ -5018,7 +5113,7 @@ msgstr "Boekhoudplan"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
-msgstr ""
+msgstr "Betaalreferentie"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5092,7 +5187,7 @@ msgstr "Af te punten boekingen"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr ""
+msgstr "Btw-sjablonen"
 
 #. module: account
 #: sql_constraint:account.period:0
@@ -5667,6 +5762,8 @@ msgstr "Doelbewegingen"
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
+"Boeking kan niet worden verwijderd als deze is gekoppeld aan een factuur "
+"(Factuur: %s - boeking: %s)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6225,6 +6322,8 @@ msgid ""
 "This payment term will be used instead of the default one for purchase "
 "orders and supplier invoices"
 msgstr ""
+"Deze betalingsvoorwaarde vervangt de standaardvoorwaarde van de huidige "
+"relatie voor aankooporders en aankoopfacturen."
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -6734,7 +6833,7 @@ msgstr "Analytische lijn"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modellen"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1091
@@ -7055,6 +7154,12 @@ msgid ""
 "due date, make sure that the payment term is not set on the invoice. If you "
 "keep the payment term and the due date empty, it means direct payment."
 msgstr ""
+"Als u betalingstermijnen gebruikt, wordt de vervaldatum automatisch berekend "
+"bij het maken van de boekingen. De betalingsvoorwaarde kan verschillende "
+"vervaldatums berekenen, vb. 50% nu en 50% binnen een maand. Als u een "
+"specifieke vervaldatum wilt instellen, gebruikt u beter geen "
+"betalingstermijn. Als u zowel betalingstermijn als vervaldatum leeglaat, "
+"gaat het om een contante betaling."
 
 #. module: account
 #: code:addons/account/account.py:414
@@ -7296,6 +7401,8 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disabled"
 msgstr ""
+"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
+"nakijken, want deze worden niet ongedaan gemaakt."
 
 #. module: account
 #: view:account.account.template:0
@@ -7330,6 +7437,7 @@ msgid ""
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
 msgstr ""
+"U kunt geen secundaire munt ingeven die identiek is aan de firmamunt."
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -7467,7 +7575,7 @@ msgstr "Manueel"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Annuleren: maak een creditnota en punt af"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7564,7 +7672,7 @@ msgstr "Alle boekingen"
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
-msgstr ""
+msgstr "U kunt enkel boekingen met dezelfde relatie afpunten."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7682,7 +7790,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal-url"
 
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
@@ -8390,7 +8498,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
-msgstr ""
+msgstr "Restbedrag in valuta"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8444,6 +8552,8 @@ msgid ""
 "Refund base on this type. You can not Modify and Cancel if the invoice is "
 "already reconciled"
 msgstr ""
+"Creditnota voor dit type. U kunt niet wijzigen of annuleren als de factuur "
+"al is afgepunt."
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -8461,7 +8571,7 @@ msgstr "Volgorde"
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Paypal-rekening"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -8730,7 +8840,7 @@ msgstr "Omgekeerde analytische balans -"
 #: help:account.move.reconcile,opening_reconciliation:0
 msgid ""
 "Is this reconciliation produced by the opening of a new fiscal year ?."
-msgstr ""
+msgstr "Komt deze afpunting van een openingsboeking?"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9011,7 +9121,7 @@ msgstr "Eindbalans"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Gecentraliseerde tegenboeking"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -9047,6 +9157,12 @@ msgid ""
 "invoice will be created \n"
 "                                    so that you can edit it."
 msgstr ""
+"Gebruik deze optie als u een factuur wilt annuleren en een nieuwe maken.\n"
+"                                    De creditnota wordt gemaakt, goedgekeurd "
+"en afgepunt\n"
+"                                    met de huidige factuur. Een nieuwe, "
+"voorlopige factuur wordt gemaakt\n"
+"                                    die u kunt bewerken."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -9079,7 +9195,7 @@ msgstr "Rekeningtypen"
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Factuur (Ref. ${object.number or 'nvt' })"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1213
@@ -9149,6 +9265,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om een journaal toe te voegen.\n"
+"              </p><p>\n"
+"                Een journaal groepeert boekingen in functie\n"
+"                van de dagelijkse bezigheden.\n"
+"              </p><p>\n"
+"                Een firma geruikt doorgaans een journaal per betaalmethode "
+"(kas,\n"
+"                bankrekeningen, cheques), een aankoopdagboek, een "
+"verkoopdagboek\n"
+"                en een diversendagboek.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -9276,6 +9405,9 @@ msgid ""
 "computed. Because it is space consuming, we do not allow to use it while "
 "doing a comparison."
 msgstr ""
+"Met deze optie krijgt u meer details over de manier waarop de saldi worden "
+"berekend. Omdat dit ruimte inneemt, is deze optie niet mogelijk bij "
+"vergelijkingen."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
@@ -9292,6 +9424,8 @@ msgstr "De code van de rekening moet uniek zijn per firma."
 #: help:product.template,property_account_expense:0
 msgid "This account will be used to value outgoing stock using cost price."
 msgstr ""
+"Deze rekening dient voor de voorraadwaardering van de uitgaande voorraad op "
+"basis van de kostprijs."
 
 #. module: account
 #: view:account.invoice:0
@@ -9354,6 +9488,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een nieuwe recurrente boeking wilt maken.\n"
+"              </p><p>\n"
+"                Een terugkerende boeking wordt regelmatig op een bepaald "
+"tijdstip herhaald,\n"
+"                vb. bij vervallen van een contract of overeenkomst met een\n"
+"                klant of een leverancier. U kunt dergelijke boekingen "
+"voorbereiden\n"
+"                zodat deze automatisch worden geboekt.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.journal:0
@@ -9396,6 +9541,8 @@ msgid ""
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"Hiermee kunt u cheques schrijven en afdrukken.\n"
+"                Hiermee wordt de module account_check_writing geïnstalleerd."
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -9681,6 +9828,9 @@ msgid ""
 "chart\n"
 "                        of accounts."
 msgstr ""
+"Bevestigde facturen kunnen niet meer\n"
+"                        worden gewijzigd. Facturen krijgen een uniek nummer\n"
+"                        en de boekingen worden gemaakt."
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
@@ -9906,11 +10056,15 @@ msgid ""
 "payments.\n"
 "                This installs the module account_payment."
 msgstr ""
+"Hiermee kunt u betaalopdrachten maken\n"
+"                    * die als basis dienen voor verdere automatisering,\n"
+"                    * om efficiënter betalingen te kunnen uitvoeren.\n"
+"                Hiermee wordt de module account_payment geïnstalleerd."
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: account
 #: view:account.chart.template:0
@@ -10132,7 +10286,7 @@ msgstr "Kan geen boekingen maken tussen verschillende firma's."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
-msgstr ""
+msgstr "Periodieke verwerking"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -10212,7 +10366,7 @@ msgstr "Vervaldatum"
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
-msgstr ""
+msgstr "Contante betaling"
 
 #. module: account
 #: code:addons/account/account.py:1464
@@ -10424,11 +10578,16 @@ msgid ""
 "analytic account.\n"
 "                This installs the module account_budget."
 msgstr ""
+"Hiermee kunnen accountants budgetten beheren.\n"
+"                Als de hoofdbudgetten zijn ingesteld, kunnen de "
+"projectleiders\n"
+"                het geplande bedrag instellen per analytische rekening.\n"
+"                Hiermee wordt de module account_budget geïnstalleerd."
 
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10915,6 +11074,8 @@ msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disable"
 msgstr ""
+"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
+"nakijken, want deze worden niet ongedaan gemaakt."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1059
@@ -10949,6 +11110,9 @@ msgid ""
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"Dit rapport biedt een overzicht van het bedrag gefactureerd aan uw klant. De "
+"zoekfunctie kan worden aangepast om het overzicht van uw facturen te "
+"personaliseren, zodat u de gewenste analyse krijgt."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -11207,6 +11371,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een nieuw btw-vak wilt toevoegen.\n"
+"              </p><p>\n"
+"                Afhankelijk van uw land, dient een btw-vak om uw btw-"
+"aangifte in te vullen.\n"
+"                In OpenERP kunt u een btw-structuur instellen en elke btw-"
+"berekening\n"
+"                kan in een of meer btw-vakken worden opgenomen.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11233,6 +11407,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Selecteer de periode en het journaal.\n"
+"              </p><p>\n"
+"                Hiermee kan de boekhouder in een sneltempo boekingen "
+"invoeren in\n"
+"                OpenERP. Als u een aankoopfactuur wilt inboeken,\n"
+"                begint u met de kostenrekening. OpenERP stelt automatisch\n"
+"                de betrokken btw voor die is gekoppeld aan deze rekening, "
+"net\n"
+"                als de centralisatierekening.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -11403,7 +11589,7 @@ msgstr "Rekeningmodel"
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Verlies"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11475,7 +11661,7 @@ msgstr "Kostenrekening van productsjabloon"
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Betaaltermijn klant"
 
 #. module: account
 #: help:accounting.report,label_filter:0
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index ba985c5e0a8..d1816589139 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-22 23:17+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-04-18 17:44+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:19+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-19 05:24+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -431,7 +430,7 @@ msgstr "Data de criação"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Devolução da Venda"
+msgstr "Devolução de Compra"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -12678,13 +12677,6 @@ msgstr ""
 #~ msgid "This period is already closed !"
 #~ msgstr "Este período já está fechado"
 
-#, python-format
-#~ msgid ""
-#~ "Selected Move lines does not have any account move enties in draft state"
-#~ msgstr ""
-#~ "As linhas do movimento selecionado nao tem nenhuma conta a ser movida para o "
-#~ "estado de esboço"
-
 #~ msgid "Unpaid Customer Refunds"
 #~ msgstr "Reembolsos a clientes não pagos"
 
@@ -13232,6 +13224,13 @@ msgstr ""
 #~ msgid "Can not %s draft/proforma/cancel invoice."
 #~ msgstr "Não pode %s provisório/proforma/cancelar fatura."
 
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr ""
+#~ "As linhas de movimento selecionadas não tem nenhum movimento nesta conta no "
+#~ "modo provisório"
+
 #, python-format
 #~ msgid "Can not pay draft/proforma/cancel invoice."
 #~ msgstr "Não se pode pagar uma fatura provisória/proforma/cancelada"
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 6ded487f1d9..17687d26313 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-14 06:41+0000\n"
+"PO-Revision-Date: 2013-06-05 13:02+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:17+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -465,7 +465,7 @@ msgstr "Шаблона плана счетов"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create refund, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "Изменить: создать возврат, сверить и создать новый счет"
 
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
@@ -704,6 +704,8 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: account
 #: view:account.period:0
@@ -731,6 +733,8 @@ msgstr "Период журнала"
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"Вы не можете создать более одного движения за период в централизованном "
+"журнале."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -911,6 +915,7 @@ msgid ""
 "Print Report with the currency column if the currency differs from the "
 "company currency."
 msgstr ""
+"Печать отчета с колонкой валюты, если валюта отличается от валюты компании."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -950,6 +955,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                   Элементы журнала не найдены.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1639
@@ -1039,7 +1048,7 @@ msgstr "Обязательства"
 #: code:addons/account/account_invoice.py:867
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Пожалуйста, определите нумерацию в журнале, связанном с этим счетом."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1517,6 +1526,9 @@ msgid ""
 "And after getting confirmation from the bank it will be in 'Confirmed' "
 "status."
 msgstr ""
+"Когда новый отчет создан - статус станет \"Черновик\".\n"
+"После получения подтверждения из банка,  статус измениться на \" "
+"Подтверждено\"."
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -1560,6 +1572,8 @@ msgid ""
 "There is no default debit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Дебетовый счет по умолчанию не определен\n"
+"в журнале \"%s\"."
 
 #. module: account
 #: view:account.tax:0
@@ -1662,7 +1676,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
-msgstr ""
+msgstr "Просмотр нижнего колонтитула банковских счетов"
 
 #. module: account
 #: selection:account.account,type:0
@@ -7386,7 +7400,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Управление платежами заказчиков"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7415,7 +7429,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Счета клиенту"
+msgstr "Счета заказчику"
 
 #. module: account
 #: view:account.tax:0
@@ -10543,7 +10557,7 @@ msgstr "Состояние счета - сделано"
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Управление напоминаниями заказчикам об оплатах"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -11037,7 +11051,7 @@ msgstr "Счет расходов по шаблону ТМЦ"
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Срок платежа заказчика"
 
 #. module: account
 #: help:accounting.report,label_filter:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index ff84dd866e8..0e216ddb68f 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-01-30 03:58+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2013-04-25 09:04+0000\n"
+"Last-Translator: Oliver Yuan <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:20+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-26 05:34+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10748,7 +10748,7 @@ msgstr "手动的发票税(非主营业务纳税)"
 #: code:addons/account/account_invoice.py:550
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
-msgstr ""
+msgstr "供应商付款条件没有包含付款条件行"
 
 #. module: account
 #: field:account.account,parent_right:0
diff --git a/addons/account/installer.py b/addons/account/installer.py
index c00b80071b8..961b8f9e763 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -23,10 +23,16 @@ import datetime
 from dateutil.relativedelta import relativedelta
 import logging
 from operator import itemgetter
-from os.path import join as opj
 import time
+import urllib2
+import urlparse
 
-from openerp import tools
+try:
+    import simplejson as json
+except ImportError:
+    import json     # noqa
+
+from openerp.release import serie
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 
@@ -38,13 +44,28 @@ class account_installer(osv.osv_memory):
 
     def _get_charts(self, cr, uid, context=None):
         modules = self.pool.get('ir.module.module')
+
+        # try get the list on apps server
+        try:
+            apps_server = self.pool.get('ir.config_parameter').get_param(cr, uid, 'apps.server', 'https://apps.openerp.com')
+
+            up = urlparse.urlparse(apps_server)
+            url = '{0.scheme}://{0.netloc}/apps/charts?serie={1}'.format(up, serie)
+
+            j = urllib2.urlopen(url, timeout=3).read()
+            apps_charts = json.loads(j)
+
+            charts = dict(apps_charts)
+        except Exception:
+            charts = dict()
+
         # Looking for the module with the 'Account Charts' category
         category_name, category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_localization_account_charts')
         ids = modules.search(cr, uid, [('category_id', '=', category_id)], context=context)
-        charts = list(
-            sorted(((m.name, m.shortdesc)
-                    for m in modules.browse(cr, uid, ids, context=context)),
-                   key=itemgetter(1)))
+        if ids:
+            charts.update((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids, context=context))
+
+        charts = sorted(charts.items(), key=itemgetter(1))
         charts.insert(0, ('configurable', _('Custom')))
         return charts
 
@@ -57,9 +78,9 @@ class account_installer(osv.osv_memory):
                  "country."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
-        'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
+        'period': fields.selection([('month', 'Monthly'), ('3months', '3 Monthly')], 'Periods', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'has_default_company' : fields.boolean('Has Default Company', readonly=True),
+        'has_default_company': fields.boolean('Has Default Company', readonly=True),
     }
 
     def _default_company(self, cr, uid, context=None):
@@ -78,30 +99,29 @@ class account_installer(osv.osv_memory):
         'has_default_company': _default_has_default_company,
         'charts': 'configurable'
     }
-    
+
     def get_unconfigured_cmp(self, cr, uid, context=None):
         """ get the list of companies that have not been configured yet
         but don't care about the demo chart of accounts """
-        cmp_select = []
         company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
         cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
         configured_cmp = [r[0] for r in cr.fetchall()]
         return list(set(company_ids)-set(configured_cmp))
-    
+
     def check_unconfigured_cmp(self, cr, uid, context=None):
         """ check if there are still unconfigured companies """
         if not self.get_unconfigured_cmp(cr, uid, context=context):
-            raise osv.except_osv(_('No unconfigured company !'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
-    
+            raise osv.except_osv(_('No Unconfigured Company!'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        if context is None:context = {}
-        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+        if context is None: context = {}
+        res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         cmp_select = []
         # display in the widget selection only the companies that haven't been configured yet
         unconfigured_cmp = self.get_unconfigured_cmp(cr, uid, context=context)
         for field in res['fields']:
             if field == 'company_id':
-                res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
+                res['fields'][field]['domain'] = [('id', 'in', unconfigured_cmp)]
                 res['fields'][field]['selection'] = [('', '')]
                 if unconfigured_cmp:
                     cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
@@ -117,7 +137,7 @@ class account_installer(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         self.execute_simple(cr, uid, ids, context)
-        super(account_installer, self).execute(cr, uid, ids, context=context)
+        return super(account_installer, self).execute(cr, uid, ids, context=context)
 
     def execute_simple(self, cr, uid, ids, context=None):
         if context is None:
@@ -129,8 +149,8 @@ class account_installer(osv.osv_memory):
                 if not f_ids:
                     name = code = res['date_start'][:4]
                     if int(name) != int(res['date_stop'][:4]):
-                        name = res['date_start'][:4] +'-'+ res['date_stop'][:4]
-                        code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4]
+                        name = res['date_start'][:4] + '-' + res['date_stop'][:4]
+                        code = res['date_start'][2:4] + '-' + res['date_stop'][2:4]
                     vals = {
                         'name': name,
                         'code': code,
@@ -150,8 +170,7 @@ class account_installer(osv.osv_memory):
         chart = self.read(cr, uid, ids, ['charts'],
                           context=context)[0]['charts']
         _logger.debug('Installing chart of accounts %s', chart)
-        return modules | set([chart])
+        return (modules | set([chart])) - set(['has_default_company', 'configurable'])
 
-account_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/ir_sequence.py b/addons/account/ir_sequence.py
index 56e1a4d0367..d3615a847b7 100644
--- a/addons/account/ir_sequence.py
+++ b/addons/account/ir_sequence.py
@@ -38,7 +38,6 @@ class ir_sequence_fiscalyear(osv.osv):
             'Main Sequence must be different from current !'),
     ]
 
-ir_sequence_fiscalyear()
 
 class ir_sequence(osv.osv):
     _inherit = 'ir.sequence'
@@ -56,6 +55,5 @@ class ir_sequence(osv.osv):
                     return super(ir_sequence, self)._next(cr, uid, [line.sequence_id.id], context)
         return super(ir_sequence, self)._next(cr, uid, seq_ids, context)
 
-ir_sequence()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/partner.py b/addons/account/partner.py
index ae8d2fc1871..f582da6b765 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -66,7 +66,6 @@ class account_fiscal_position(osv.osv):
                 break
         return account_id
 
-account_fiscal_position()
 
 class account_fiscal_position_tax(osv.osv):
     _name = 'account.fiscal.position.tax'
@@ -84,7 +83,6 @@ class account_fiscal_position_tax(osv.osv):
          'A tax fiscal position could be defined only once time on same taxes.')
     ]
 
-account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
     _name = 'account.fiscal.position.account'
@@ -102,7 +100,6 @@ class account_fiscal_position_account(osv.osv):
          'An account fiscal position could be defined only once time on same accounts.')
     ]
 
-account_fiscal_position_account()
 
 class res_partner(osv.osv):
     _name = 'res.partner'
@@ -236,6 +233,10 @@ class res_partner(osv.osv):
         'last_reconciliation_date': fields.datetime('Latest Full Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the last date where a reconciliation has been made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 different ways: either the last unreconciled debit/credit entry of this partner was reconciled, either the user pressed the button "Nothing more to reconcile" during the manual reconciliation process.')
     }
 
-res_partner()
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
+            ['debit_limit', 'property_account_payable', 'property_account_receivable', 'property_account_position',
+             'property_payment_term', 'property_supplier_payment_term', 'last_reconciliation_date']
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 1267e20165b..3dcc68e315e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -50,6 +50,30 @@
             </field>
         </record>
 
+        <record id="action_open_partner_analytic_accounts" model="ir.actions.act_window">
+            <field name="context">{'search_default_partner_id': [active_id], 'default_partner_id': active_id}</field>
+            <field name="name">Contracts/Analytic Accounts</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_id" ref="view_account_analytic_account_tree"/>
+            <field name="search_view_id" ref="view_account_analytic_account_search"/>
+        </record>
+        <record model="ir.ui.view" id="partner_view_buttons">
+            <field name="name">partner.view.buttons</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form" />
+            <field name="priority" eval="10"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button type="action" string="Invoices" 
+                        name="%(account.action_invoice_tree)d" 
+                        context="{'search_default_partner_id': active_id,'default_partner_id': active_id}" groups="account.group_account_invoice"/>
+                    <button type="action" string="Journal Items" name="%(account.action_account_moves_all_tree)d" groups="account.group_account_user"/>
+                    <button type="action" string="Contracts" name="%(account.action_open_partner_analytic_accounts)d"
+                            groups="analytic.group_analytic_accounting"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="action_account_fiscal_position_form" model="ir.actions.act_window">
             <field name="name">Fiscal Positions</field>
             <field name="res_model">account.fiscal.position</field>
@@ -73,7 +97,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="History" position="before" version="7.0">
-                <page string="Accounting" col="4">
+                <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                     <group>
                         <group>
                             <field name="property_account_position" widget="selection"/>
@@ -103,20 +127,13 @@
                         </tree>
                     </field>
                 </page>
+                <page string="Accounting" name="accounting_disabled" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                    <div>
+                        <p>Accounting-related settings are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+                    </div>
+                </page>
                 </page>
             </field>
         </record>
-
-        <!--  Partners info tab view-->
-
-        <act_window
-            id="action_analytic_open"
-            name="Contracts/Analytic Accounts"
-            res_model="account.analytic.account"
-            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
-            src_model="res.partner"
-            view_type="form"
-            view_mode="tree,form"/>
-
     </data>
 </openerp>
diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 8971235c1f7..e45f8080518 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -123,24 +123,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The accountant confirms the statement.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
-            <field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/>
+            <field name="target_node_id" ref="process_node_accountingstatemententries0"/>
+            <field name="source_node_id" ref="account.process_node_draftstatement0"/>
         </record>
 
         <record id="process_transition_analyticinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_draftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_analytic0"/>
+            <field name="target_node_id" ref="process_node_draftinvoices0"/>
+            <field name="source_node_id" ref="process_node_analytic0"/>
         </record>
 
         <record id="process_transition_customerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
+            <field name="target_node_id" ref="process_node_invoiceinvoice0"/>
+            <field name="source_node_id" ref="process_node_draftinvoices0"/>
             <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
 
@@ -148,40 +148,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_accountingentries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_invoiceinvoice0"/>
+            <field name="target_node_id" ref="process_node_accountingentries0"/>
+            <field name="source_node_id" ref="process_node_invoiceinvoice0"/>
         </record>
 
         <record id="process_transition_entriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accounting entries are the first input of the reconciliation.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_accountingentries0"/>
+            <field name="target_node_id" ref="process_node_reconciliation0"/>
+            <field name="source_node_id" ref="process_node_accountingentries0"/>
         </record>
 
         <record id="process_transition_statemententries0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Manual or automatic creation of payment entries according to the statements&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
+            <field name="target_node_id" ref="process_node_paymententries0"/>
+            <field name="source_node_id" ref="process_node_bankstatement0"/>
         </record>
 
         <record id="process_transition_paymentreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Payment entries are the second input of the reconciliation.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_paymententries0"/>
+            <field name="target_node_id" ref="process_node_reconciliation0"/>
+            <field name="source_node_id" ref="process_node_paymententries0"/>
         </record>
 
         <record id="process_transition_reconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice can be paid.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/>
+            <field name="target_node_id" ref="process_node_paidinvoice0"/>
+            <field name="source_node_id" ref="process_node_reconciliation0"/>
         </record>
 
         <!--
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 64dd7520bc1..81b1748a6d4 100644
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -68,8 +68,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_electronicfile0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_electronicfile0"/>
         </record>
 
         <record id="process_transition_invoicemanually0" model="process.transition">
@@ -77,17 +77,17 @@
             <field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement.&quot;&quot;&quot;" name="note"/>
 
-            <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_manually0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_manually0"/>
         </record>
 
         <record id="process_transition_invoiceimport0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Import from invoice or payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from a supplier or customer invoice&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_importinvoice0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 58b98220f95..b1d9de904aa 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -111,16 +111,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft supplier invoices.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
+            <field name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
+            <field name="source_node_id" ref="process_node_analyticcost0"/>
         </record>
 
         <record id="process_transition_suppliercustomerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
+            <field name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
+            <field name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
             <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
 
@@ -128,40 +128,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplieraccountingentries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
+            <field name="target_node_id" ref="process_node_supplieraccountingentries0"/>
+            <field name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
         </record>
 
         <record id="process_transition_supplierentriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accounting entries are an input of the reconciliation.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/>
+            <field name="target_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="source_node_id" ref="process_node_supplieraccountingentries0"/>
         </record>
 
         <record id="process_transition_paymentorderbank0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The payment order is sent to the bank.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/>
+            <field name="target_node_id" ref="process_node_supplierbankstatement0"/>
+            <field name="source_node_id" ref="process_node_supplierpaymentorder0"/>
         </record>
 
         <record id="process_transition_paymentorderreconcilation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Bank statements are entered in the system.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/>
+            <field name="target_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="source_node_id" ref="process_node_supplierbankstatement0"/>
         </record>
 
         <record id="process_transition_supplierreconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;System payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
+            <field name="source_node_id" ref="process_node_supplierreconciliation0"/>
         </record>
 
    </data>
diff --git a/addons/account/product.py b/addons/account/product.py
index ce1ac83d6dd..3df3ad9bd17 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -39,7 +39,6 @@ class product_category(osv.osv):
             view_load=True,
             help="This account will be used for invoices to value expenses."),
     }
-product_category()
 
 #----------------------------------------------------------
 # Products
@@ -70,6 +69,5 @@ class product_template(osv.osv):
             help="This account will be used for invoices instead of the default one to value expenses for the current product."),
     }
 
-product_template()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 44d53839700..2c540cb6ee6 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -11,11 +11,11 @@
                     <page string="Accounting" groups="account.group_account_invoice">
                         <group name="properties">
                             <group>
-                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
+                                <field name="property_account_income" domain="[('type','=','other')]" groups="account.group_account_user"/>
                                 <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
                             </group>
                             <group>
-                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
+                                <field name="property_account_expense" domain="[('type','=','other')]" groups="account.group_account_user"/>
                                 <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
                             </group>
                         </group>
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index f4927331ca8..b4dcdde2d30 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -38,7 +38,6 @@ class account_analytic_journal(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 
-account_analytic_journal()
 
 class account_journal(osv.osv):
     _inherit="account.journal"
@@ -47,6 +46,5 @@ class account_journal(osv.osv):
         'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"),
     }
 
-account_journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index aa567d2fc79..6ce97b5c868 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -31,7 +31,7 @@
                 <search string="Analytic Account">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Analytic Account"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
                     <field name="user_id"/>
@@ -68,6 +68,7 @@
                     <field name="parent_id" invisible="1"/>
                     <field name="type"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="template_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -77,6 +78,7 @@
             <field name="name">Analytic Accounts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
+            <field name="context">{}</field> <!-- repair invalid context by setting empty one -->
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
diff --git a/addons/account/project/wizard/account_analytic_balance_report.py b/addons/account/project/wizard/account_analytic_balance_report.py
index 81d6c192962..02b2eb6e95d 100644
--- a/addons/account/project/wizard/account_analytic_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_balance_report.py
@@ -52,7 +52,6 @@ class account_analytic_balance(osv.osv_memory):
             'datas': datas,
             }
 
-account_analytic_balance()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/project/wizard/account_analytic_chart.py b/addons/account/project/wizard/account_analytic_chart.py
index 01c606d5f08..4a26eec7c95 100644
--- a/addons/account/project/wizard/account_analytic_chart.py
+++ b/addons/account/project/wizard/account_analytic_chart.py
@@ -46,5 +46,4 @@ class account_analytic_chart(osv.osv_memory):
         result['context'] = str(result_context)
         return result
 
-account_analytic_chart()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index fdb8eafb402..814cbb8cacc 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -52,5 +52,4 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
             'datas': datas,
             }
 
-account_analytic_cost_ledger_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
index 1c74c61e31f..ffd56352382 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
@@ -52,5 +52,4 @@ class account_analytic_cost_ledger(osv.osv_memory):
             'datas': datas,
             }
 
-account_analytic_cost_ledger()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.py b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
index 10f97baf755..9e54f4f848d 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@@ -51,5 +51,4 @@ class account_analytic_inverted_balance(osv.osv_memory):
             'datas': datas,
             }
 
-account_analytic_inverted_balance()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index e70649cd406..61fe2cd318a 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -71,5 +71,4 @@ class account_analytic_journal_report(osv.osv_memory):
             res.update({'analytic_account_journal_id': journal_ids})
         return res
 
-account_analytic_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index c5a496527c1..40777f73e7d 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -53,6 +53,5 @@ class project_account_analytic_line(osv.osv_memory):
               'search_view_id': id['res_id'],
               }
 
-project_account_analytic_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index dad0dedc9fc..f7d1177e3b0 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -81,6 +81,5 @@ class analytic_entries_report(osv.osv):
                      a.move_id,a.product_id,a.product_uom_id
             )
         """)
-analytic_entries_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index d53e6153981..6060d97c182 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -81,7 +81,7 @@ class account_entries_report(osv.osv):
         period_obj = self.pool.get('account.period')
         for arg in args:
             if arg[0] == 'period_id' and arg[2] == 'current_period':
-                current_period = period_obj.find(cr, uid)[0]
+                current_period = period_obj.find(cr, uid, context=context)[0]
                 args.append(['period_id','in',[current_period]])
                 break
             elif arg[0] == 'period_id' and arg[2] == 'current_year':
@@ -100,7 +100,7 @@ class account_entries_report(osv.osv):
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         period_obj = self.pool.get('account.period')
         if context.get('period', False) == 'current_period':
-            current_period = period_obj.find(cr, uid)[0]
+            current_period = period_obj.find(cr, uid, context=context)[0]
             domain.append(['period_id','in',[current_period]])
         elif context.get('year', False) == 'current_year':
             current_year = fiscalyear_obj.find(cr, uid)
@@ -152,6 +152,5 @@ class account_entries_report(osv.osv):
                 where l.state != 'draft'
             )
         """)
-account_entries_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 498cb1369a8..4f712ad58cc 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 31725a46b46..d8dc45f9a3b 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -70,6 +70,7 @@ class account_invoice_report(osv.osv):
         'categ_id': fields.many2one('product.category','Category of Product', readonly=True),
         'journal_id': fields.many2one('account.journal', 'Journal', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
+        'commercial_partner_id': fields.many2one('res.partner', 'Partner Company', help="Commercial Entity"),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
@@ -98,17 +99,18 @@ class account_invoice_report(osv.osv):
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
         'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
+        'country_id': fields.many2one('res.country', 'Country of the Partner Company'),
     }
     _order = 'date desc'
 
     def _select(self):
         select_str = """
-            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,
+            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id, sub.country_id,
                 sub.payment_term, sub.period_id, sub.uom_name, sub.currency_id, sub.journal_id,
                 sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
                 sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
                 sub.product_qty, sub.price_total / cr.rate as price_total, sub.price_average /cr.rate as price_average,
-                cr.rate as currency_rate, sub.residual / cr.rate as residual
+                cr.rate as currency_rate, sub.residual / cr.rate as residual, sub.commercial_partner_id as commercial_partner_id
         """
         return select_str
 
@@ -170,7 +172,9 @@ class account_invoice_report(osv.osv):
                                       LEFT JOIN account_invoice a ON a.id = l.invoice_id
                                       WHERE a.id = ai.id)
                                ELSE 1::bigint
-                          END::numeric AS residual
+                          END::numeric AS residual,
+                    ai.commercial_partner_id as commercial_partner_id,
+                    partner.country_id
         """
         return select_str
 
@@ -178,6 +182,7 @@ class account_invoice_report(osv.osv):
         from_str = """
                 FROM account_invoice_line ail
                 JOIN account_invoice ai ON ai.id = ail.invoice_id
+                JOIN res_partner partner ON ai.commercial_partner_id = partner.id
                 LEFT JOIN product_product pr ON pr.id = ail.product_id
                 left JOIN product_template pt ON pt.id = pr.product_tmpl_id
                 LEFT JOIN product_uom u ON u.id = ail.uos_id
@@ -193,7 +198,7 @@ class account_invoice_report(osv.osv):
                     ai.partner_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
                     ai.fiscal_position, ai.user_id, ai.company_id, ai.type, ai.state, pt.categ_id,
                     ai.date_due, ai.account_id, ail.account_id, ai.partner_bank_id, ai.residual,
-                    ai.amount_total, u.uom_type, u.category_id
+                    ai.amount_total, u.uom_type, u.category_id, ai.commercial_partner_id, partner.country_id
         """
         return group_by_str
 
@@ -217,6 +222,5 @@ class account_invoice_report(osv.osv):
                     self._table, 
                     self._select(), self._sub_select(), self._from(), self._group_by()))
 
-account_invoice_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index dad70f695dc..5f38db5e71f 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -14,6 +14,8 @@
                 <field name="type" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
+                <field name="commercial_partner_id" invisible="1"/>
+                <field name="country_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
                 <field name="uom_name" invisible="not context.get('set_visible',False)"/>
                 <field name="categ_id" invisible="1"/>
@@ -65,7 +67,9 @@
                 <field name="user_id" />
                 <field name="categ_id" filter_domain="[('categ_id', 'child_of', self)]"/>
                 <group expand="1" string="Group By...">
-                    <filter string="Partner" name="partner" icon="terp-partner" context="{'group_by':'partner_id','residual_visible':True}"/>
+                    <filter string="Partner" name="partner_id" context="{'group_by':'partner_id','residual_visible':True}"/>
+                    <filter string="Commercial Partner" name="commercial_partner_id" context="{'group_by':'commercial_partner_id','residual_visible':True}"/>
+                    <filter string="Commercial Partner's Country" name="country_id" context="{'group_by':'country_id'}"/>
                     <filter string="Salesperson" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Due Date" icon="terp-go-today" context="{'group_by':'date_due'}"/>
                     <filter string="Period" icon="terp-go-month" context="{'group_by':'period_id'}" name="period"/>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 9268c94d4c7..3582221df44 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -99,42 +99,39 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
-    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0" fontName="Helvetica"/>
-    <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard"/>
+    <paraStyle name="Text body" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index"/>
+
+    <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer"/>
+    <paraStyle name="Horizontal Line" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+
+    <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+
+    <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="-3.0" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="-3.0" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0"  fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
+
+    <paraStyle name="Table" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0"/>
+    <paraStyle name="Preformatted Text" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -144,12 +141,12 @@
     <pto_header><!-- Must be after setLang() -->
     <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
     <tr>
-        <td> <para style="terp_tblheader_Details">Description</para> </td>
-        <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
-        <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
+        <td><para style="terp_tblheader_Details"><b>Description</b></para></td>
+        <td><para style="terp_tblheader_Details_Centre"><b>Taxes</b></para></td>
+        <td><para style="terp_tblheader_Details_Centre"><b>Quantity</b></para></td>
+        <td><para style="terp_tblheader_Details_Right"><b>Unit Price</b></para></td>
+        <td><para style="terp_tblheader_Details_Right"><b>Disc.(%)</b></para></td>
+        <td><para style="terp_tblheader_Details_Right"><b>Price</b></para></td>
     </tr>
     </blockTable>
     </pto_header>
@@ -172,29 +169,29 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
-    <para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-    <para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="terp_header">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header"><b>Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+    <para style="terp_header"><b>PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</b></para>
+    <para style="terp_header"><b>Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</b></para>
+    <para style="terp_header"><b>Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+    <para style="terp_header"><b>Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+    <para style="terp_header"><b>Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
+    <para style="terp_header"><b>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</b></para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_Invoice_General_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Description</para>
+          <para style="terp_tblheader_General_Centre"><b>Description</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Invoice Date</para>
-        </td>
-    <td>
-          <para style="terp_tblheader_General_Centre">Source</para>
+          <para style="terp_tblheader_General_Centre"><b>Invoice Date</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Customer Code</para>
+          <para style="terp_tblheader_General_Centre"><b>Source</b></para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre"><b>Customer Code</b></para>
         </td>
       </tr>
     </blockTable>
@@ -220,22 +217,22 @@
     <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_tblheader_General">Description</para>
+          <para style="terp_tblheader_General"><b>Description</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Taxes</para>
+          <para style="terp_tblheader_General_Centre"><b>Taxes</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Quantity</para>
+          <para style="terp_tblheader_General_Right"><b>Quantity</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Unit Price</para>
+          <para style="terp_tblheader_General_Right"><b>Unit Price</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Disc.(%)</para>
+          <para style="terp_tblheader_General_Right"><b>Disc.(%)</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Price</para>
+          <para style="terp_tblheader_General_Right"><b>Price</b></para>
         </td>
       </tr>
     </blockTable>
@@ -298,10 +295,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Total:</para>
+          <para style="terp_tblheader_Details"><b>Total:</b></para>
         </td>
         <td>
-          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
+          <para style="terp_default_Bold_Right_9"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</b></para>
         </td>
       </tr>
     </blockTable>
@@ -311,13 +308,13 @@
     <blockTable colWidths="205.0,71.0,71.0,183.0" style="Table9">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
+          <para style="terp_tblheader_Details"><b>Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Base </para>
+          <para style="terp_tblheader_Details_Right"><b>Base </b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount </para>
+          <para style="terp_tblheader_Details_Right"><b>Amount </b></para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -361,7 +358,7 @@
     <blockTable colWidths="120.0,410.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
+          <para style="terp_default_Bold_9"><b>Fiscal Position Remark : </b></para>
         </td>
         <td>
           <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 11a6374b24e..60b994dad07 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -66,7 +66,6 @@ class report_account_receivable(osv.osv):
                 group by
                     to_char(date,'YYYY:IW'), a.type
             )""")
-report_account_receivable()
 
                     #a.type in ('receivable','payable')
 class temp_range(osv.osv):
@@ -77,7 +76,6 @@ class temp_range(osv.osv):
         'name': fields.char('Range',size=64)
     }
 
-temp_range()
 
 class report_aged_receivable(osv.osv):
     _name = "report.aged.receivable"
@@ -147,7 +145,6 @@ class report_aged_receivable(osv.osv):
                 select id,name from temp_range
             )""")
 
-report_aged_receivable()
 
 class report_invoice_created(osv.osv):
     _name = "report.invoice.created"
@@ -200,7 +197,6 @@ class report_invoice_created(osv.osv):
                 AND
                 (to_date(to_char(inv.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15))
             )""")
-report_invoice_created()
 
 class report_account_type_sales(osv.osv):
     _name = "report.account_type.sales"
@@ -241,7 +237,6 @@ class report_account_type_sales(osv.osv):
             group by
                 to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.user_type
             )""")
-report_account_type_sales()
 
 
 class report_account_sales(osv.osv):
@@ -283,6 +278,5 @@ class report_account_sales(osv.osv):
             group by
                 to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.id
             )""")
-report_account_sales()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py
index 1ee411708c7..f7785d0827b 100644
--- a/addons/account/report/account_treasury_report.py
+++ b/addons/account/report/account_treasury_report.py
@@ -78,6 +78,5 @@ class account_treasury_report(osv.osv):
             group by p.id, p.fiscalyear_id, p.date_start, am.company_id
             )
         """)
-account_treasury_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 53c604161ea..89d238b16e9 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -25,6 +25,7 @@ from dateutil.relativedelta import relativedelta
 from operator import itemgetter
 from os.path import join as opj
 
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT as DF
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 from openerp import tools
@@ -132,12 +133,43 @@ class account_config_settings(osv.osv_memory):
         count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
         return bool(count == 1)
 
+    def _get_default_fiscalyear_data(self, cr, uid, company_id, context=None):
+        """Compute default period, starting and ending date for fiscalyear
+        - if in a fiscal year, use its period, starting and ending date
+        - if past fiscal year, use its period, and new dates [ending date of the latest +1 day ; ending date of the latest +1 year]
+        - if no fiscal year, use monthly, 1st jan, 31th dec of this year
+        :return: (date_start, date_stop, period) at format DEFAULT_SERVER_DATETIME_FORMAT
+        """
+        fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+                [('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
+                 ('company_id', '=', company_id)])
+        if fiscalyear_ids:
+            # is in a current fiscal year, use this one
+            fiscalyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context)
+            if len(fiscalyear.period_ids) == 5:  # 4 periods of 3 months + opening period
+                period = '3months'
+            else:
+                period = 'month'
+            return (fiscalyear.date_start, fiscalyear.date_stop, period)
+        else:
+            past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+                [('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
+            if past_fiscalyear_ids:
+                # use the latest fiscal, sorted by (start_date, id)
+                latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
+                latest_stop = datetime.datetime.strptime(latest_year.date_stop, DF)
+                if len(latest_year.period_ids) == 5:
+                    period = '3months'
+                else:
+                    period = 'month'
+                return ((latest_stop+datetime.timedelta(days=1)).strftime(DF), latest_stop.replace(year=latest_stop.year+1).strftime(DF), period)
+            else:
+                return (time.strftime('%Y-01-01'), time.strftime('%Y-12-31'), 'month')
+
+
     _defaults = {
         'company_id': _default_company,
         'has_default_company': _default_has_default_company,
-        'date_start': lambda *a: time.strftime('%Y-01-01'),
-        'date_stop': lambda *a: time.strftime('%Y-12-31'),
-        'period': 'month',
     }
 
     def create(self, cr, uid, values, context=None):
@@ -161,6 +193,7 @@ class account_config_settings(osv.osv_memory):
             fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
                 [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
                  ('company_id', '=', company_id)])
+            date_start, date_stop, period = self._get_default_fiscalyear_data(cr, uid, company_id, context=context)
             values = {
                 'expects_chart_of_accounts': company.expects_chart_of_accounts,
                 'currency_id': company.currency_id.id,
@@ -170,6 +203,9 @@ class account_config_settings(osv.osv_memory):
                 'has_fiscal_year': bool(fiscalyear_count),
                 'chart_template_id': False,
                 'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+                'date_start': date_start,
+                'date_stop': date_stop,
+                'period': period,
             }
             # update journals and sequences
             for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
@@ -302,4 +338,10 @@ class account_config_settings(osv.osv_memory):
         dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
         dp.write({'digits': config.decimal_precision})
 
+    def onchange_analytic_accounting(self, cr, uid, ids, analytic_accounting, context=None):
+        if analytic_accounting:
+            return {'value': {
+                'module_account_accountant': True,
+                }}
+        return {}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 7977c0fc505..ce8b41fc2da 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -130,7 +130,7 @@
                                 <label for="module_account_accountant"/>
                             </div>
                             <div>
-                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <field name="group_analytic_accounting" class="oe_inline" on_change="onchange_analytic_accounting(group_analytic_accounting, context)"/>
                                 <label for="group_analytic_accounting"/>
                             </div>
                             <div>
diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py
index 9564b4e57c6..a7d3e5bc345 100644
--- a/addons/account/res_currency.py
+++ b/addons/account/res_currency.py
@@ -43,6 +43,5 @@ class res_currency_account(osv.osv):
                 rate = float(tot2)/float(tot1)
         return rate
 
-res_currency_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index dbbfe3cc069..cbc0abc4f4d 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -26,7 +26,7 @@ openerp.account = function (instance) {
             if (this.partners) {
                 this.$el.prepend(QWeb.render("AccountReconciliation", {widget: this}));
                 this.$(".oe_account_recon_previous").click(function() {
-                    self.current_partner = (self.current_partner - 1) % self.partners.length;
+                    self.current_partner = (((self.current_partner - 1) % self.partners.length) + self.partners.length) % self.partners.length;
                     self.search_by_partner();
                 });
                 this.$(".oe_account_recon_next").click(function() {
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index 88d31b5b6c5..f6f0c90b1e2 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -246,6 +246,5 @@ class account_automatic_reconcile(osv.osv_memory):
             'context': context,
         }
 
-account_automatic_reconcile()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index 73fd52b3fcb..c3726ece676 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -73,6 +73,5 @@ class account_change_currency(osv.osv_memory):
         obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_change_currency()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 32b83a0a670..38df2f7484d 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -105,6 +105,5 @@ class account_chart(osv.osv_memory):
         'fiscalyear': _get_fiscalyear,
     }
 
-account_chart()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index dde07eb7034..2ce7118335a 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -93,6 +93,5 @@ class accounting_report(osv.osv_memory):
             'datas': data,
         }
 
-accounting_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index d4f7b3e6654..6ceb833816b 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -278,6 +278,5 @@ class account_fiscalyear_close(osv.osv_memory):
 
         return {'type': 'ir.actions.act_window_close'}
 
-account_fiscalyear_close()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index 746f1c47976..ed84ab65184 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -56,6 +56,5 @@ class account_fiscalyear_close_state(osv.osv_memory):
 
             return {'type': 'ir.actions.act_window_close'}
 
-account_fiscalyear_close_state()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index ba48dd34fe2..5be9ebc5c80 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -220,6 +220,5 @@ class account_invoice_refund(osv.osv_memory):
         return self.compute_refund(cr, uid, ids, data_refund, context=context)
 
 
-account_invoice_refund()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 70d2984cef0..1aed2c6c477 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -42,7 +42,6 @@ class account_invoice_confirm(osv.osv_memory):
             
         return {'type': 'ir.actions.act_window_close'}
 
-account_invoice_confirm()
 
 class account_invoice_cancel(osv.osv_memory):
     """
@@ -64,6 +63,5 @@ class account_invoice_cancel(osv.osv_memory):
             account_invoice_obj.signal_invoice_cancel(cr , uid, [record['id']])
         return {'type': 'ir.actions.act_window_close'}
 
-account_invoice_cancel()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_journal_select.py b/addons/account/wizard/account_journal_select.py
index 7edd7923f4c..a4a1d4a6a9f 100644
--- a/addons/account/wizard/account_journal_select.py
+++ b/addons/account/wizard/account_journal_select.py
@@ -45,6 +45,5 @@ class account_journal_select(osv.osv_memory):
             result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
         return result
 
-account_journal_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 283068ae693..0fb4633163b 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -59,6 +59,5 @@ the bank account\nin the journal definition for reconciliation.'))
             'type': 'ir.actions.act_window'
              }
 
-account_move_bank_reconcile()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index 76af8538e05..658a6c5d503 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -50,6 +50,5 @@ class account_move_line_reconcile_select(osv.osv_memory):
             'type': 'ir.actions.act_window'
         }
 
-account_move_line_reconcile_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index b56621f2114..630db9fd1d6 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -67,6 +67,5 @@ class account_move_line_select(osv.osv_memory):
         result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
         return result
 
-account_move_line_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index f9009fc8199..31fbeddeea8 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -39,6 +39,5 @@ class account_move_line_unreconcile_select(osv.osv_memory):
                 'type': 'ir.actions.act_window'
         }
 
-account_move_line_unreconcile_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index 3b5d956d381..f4e90ae9f2f 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -43,6 +43,5 @@ class account_open_closed_fiscalyear(osv.osv_memory):
             cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
         return {'type': 'ir.actions.act_window_close'}
 
-account_open_closed_fiscalyear()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index fad757c0ff9..a50861c65ef 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -55,6 +55,5 @@ class account_period_close(osv.osv_memory):
 
         return {'type': 'ir.actions.act_window_close'}
 
-account_period_close()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 81609249fd7..0d5a3525af4 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -91,7 +91,6 @@ class account_move_line_reconcile(osv.osv_memory):
                                         period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_move_line_reconcile()
 
 class account_move_line_reconcile_writeoff(osv.osv_memory):
     """
@@ -149,7 +148,6 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
             context['analytic_id'] = data['analytic_id'][0]
         if context['date_p']:
             date = context['date_p']
-
         ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
@@ -158,6 +156,5 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
                 period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_move_line_reconcile_writeoff()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index 1c317111888..bcbdb3fb5db 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -98,6 +98,5 @@ class account_partner_reconcile_process(osv.osv_memory):
         'next_partner_id': _get_partner,
     }
 
-account_partner_reconcile_process()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index e883a59c102..fd3c966e306 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -38,6 +38,5 @@ class account_balance_report(osv.osv_memory):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}
 
-account_balance_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 1054e7fa285..c483487b78f 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -86,6 +86,5 @@ class account_aged_trial_balance(osv.osv_memory):
             'datas': data
         }
 
-account_aged_trial_balance()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index da8be6d4735..a6bc111fa35 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -38,7 +38,6 @@ class account_central_journal(osv.osv_memory):
                 'datas': data,
         }
 
-account_central_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 52a35327845..c457140684a 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -178,6 +178,5 @@ class account_common_report(osv.osv_memory):
         data['form']['used_context'] = used_context
         return self._print_report(cr, uid, ids, data, context=context)
 
-account_common_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 7cedf427386..13b83c32958 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -41,7 +41,6 @@ class account_common_account_report(osv.osv_memory):
         data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
         return data
 
-account_common_account_report()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index 609c2840ca6..a03315ecf7c 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -50,6 +50,5 @@ class account_common_journal_report(osv.osv_memory):
         data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
         return data
 
-account_common_journal_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index 9779005b0de..d50a54ef32c 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -42,7 +42,6 @@ class account_common_partner_report(osv.osv_memory):
         data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
         return data
 
-account_common_partner_report()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_journal.py b/addons/account/wizard/account_report_general_journal.py
index 4a170a84db1..e5e516b1f38 100644
--- a/addons/account/wizard/account_report_general_journal.py
+++ b/addons/account/wizard/account_report_general_journal.py
@@ -34,7 +34,6 @@ class account_general_journal(osv.osv_memory):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal', 'datas': data}
 
-account_general_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index a10ff624fee..fae60df63fb 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -58,6 +58,5 @@ class account_report_general_ledger(osv.osv_memory):
             return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data}
         return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data}
 
-account_report_general_ledger()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index 33a7a42072c..fbe18f27d69 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -50,6 +50,5 @@ class account_partner_balance(osv.osv_memory):
             'datas': data,
     }
 
-account_partner_balance()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index d1e6dd9809e..fdabe49ff17 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -67,6 +67,5 @@ class account_partner_ledger(osv.osv_memory):
                 'datas': data,
         }
 
-account_partner_ledger()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index b91fe04660a..3ad45268248 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -72,7 +72,6 @@ class account_print_journal(osv.osv_memory):
             report_name = 'account.journal.period.print'
         return {'type': 'ir.actions.report.xml', 'report_name': report_name, 'datas': data}
 
-account_print_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index 1351b8f0ac1..1950a139983 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -37,6 +37,5 @@ class account_state_open(osv.osv_memory):
             obj_invoice.signal_open_test(cr, uid, context['active_ids'][0])
         return {'type': 'ir.actions.act_window_close'}
 
-account_state_open()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index f5babc4fd87..a61f3eee252 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -48,6 +48,5 @@ class account_subscription_generate(osv.osv_memory):
         result['domain'] = str([('id','in',moves_created)])
         return result
 
-account_subscription_generate()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 84859e2077c..3283d2ba6d1 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -38,7 +38,7 @@ class account_tax_chart(osv.osv_memory):
 
     def _get_period(self, cr, uid, context=None):
         """Return default period value"""
-        period_ids = self.pool.get('account.period').find(cr, uid)
+        period_ids = self.pool.get('account.period').find(cr, uid, context=context)
         return period_ids and period_ids[0] or False
 
     def account_tax_chart_open_window(self, cr, uid, ids, context=None):
@@ -73,6 +73,5 @@ class account_tax_chart(osv.osv_memory):
         'target_move': 'posted'
     }
 
-account_tax_chart()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index ff592a329c7..425e549fec2 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -33,7 +33,6 @@ class account_unreconcile(osv.osv_memory):
             obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_unreconcile()
 
 class account_unreconcile_reconcile(osv.osv_memory):
     _name = "account.unreconcile.reconcile"
@@ -48,6 +47,5 @@ class account_unreconcile_reconcile(osv.osv_memory):
             obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_unreconcile_reconcile()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 795284c8fef..06f02719065 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -71,6 +71,5 @@ class account_use_model(osv.osv_memory):
             'type': 'ir.actions.act_window',
         }
 
-account_use_model()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index faf7f8e2ccd..050191db187 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -40,7 +40,6 @@ class validate_account_move(osv.osv_memory):
         obj_move.button_validate(cr, uid, ids_move, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-validate_account_move()
 
 class validate_account_move_lines(osv.osv_memory):
     _name = "validate.account.move.lines"
@@ -58,10 +57,9 @@ class validate_account_move_lines(osv.osv_memory):
                 move_ids.append(line.move_id.id)
         move_ids = list(set(move_ids))
         if not move_ids:
-            raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move enties in draft state.'))
+            raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move entries in draft state.'))
         obj_move.button_validate(cr, uid, move_ids, context)
         return {'type': 'ir.actions.act_window_close'}
-validate_account_move_lines()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index a60a7906e28..37bf4b029a6 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -59,6 +59,5 @@ class account_vat_declaration(osv.osv_memory):
             'datas': datas,
         }
 
-account_vat_declaration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index 49178dfd3ea..4b7e63585d8 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
@@ -21,9 +20,9 @@ class CashBox(osv.osv_memory):
         active_model = context.get('active_model', False) or False
         active_ids = context.get('active_ids', []) or []
 
-        records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
+        records = self.pool[active_model].browse(cr, uid, active_ids, context=context)
 
-        return self._run(cr, uid, ids, records, context=None)
+        return self._run(cr, uid, ids, records, context=context)
 
     def _run(self, cr, uid, ids, records, context=None):
         for box in self.browse(cr, uid, ids, context=context):
@@ -63,11 +62,12 @@ class CashBoxIn(CashBox):
             'name' : box.name,
         }
 
-CashBoxIn()
 
 class CashBoxOut(CashBox):
     _name = 'cash.box.out'
 
+    _columns = CashBox._columns.copy()
+
     def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
         amount = box.amount or 0.0
         return {
@@ -78,4 +78,3 @@ class CashBoxOut(CashBox):
             'name' : box.name,
         }
 
-CashBoxOut()
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 33ab3be209c..b3dd2302a2f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -259,17 +259,14 @@ class account_analytic_account(osv.osv):
             return res
 
         if child_ids:
-            cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
-                    FROM account_analytic_line \
-                    JOIN account_analytic_journal \
-                        ON account_analytic_line.journal_id = account_analytic_journal.id  \
-                    WHERE account_analytic_line.account_id IN %s \
-                        AND account_analytic_journal.type = 'sale' \
-                    GROUP BY account_analytic_line.account_id", (child_ids,))
-            for account_id, sum in cr.fetchall():
-                res[account_id] = round(sum,2)
+            #Search all invoice lines not in cancelled state that refer to this analytic account
+            inv_line_obj = self.pool.get("account.invoice.line")
+            inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
+            for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
+                res[line.account_analytic_id.id] += line.price_subtotal
         for acc in self.browse(cr, uid, res.keys(), context=context):
             res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
+
         res_final = res
         return res_final
 
@@ -481,7 +478,7 @@ class account_analytic_account(osv.osv):
         'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
             help="Computed using the formula: Maximum Time - Total Worked Time"),
         'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
-            help="Computed using the formula: Maximum Time - Total Invoiced Time"),
+            help="Computed using the formula: Expected on timesheets - Total invoiced on timesheets"),
         'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
             help="Sum of quotations for this contract."),
         'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
@@ -633,6 +630,21 @@ class account_analytic_account(osv.osv):
             pass
         return result
 
+
+    def hr_to_invoice_timesheets(self, cr, uid, ids, context=None):
+        domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general'), ('account_id', 'in', ids)]
+        names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+        name = _('Timesheets to Invoice of %s') % ','.join(names)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': name,
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'domain' : domain,
+            'res_model': 'account.analytic.line',
+            'nodestroy': True,
+        }
+
     def _prepare_invoice(self, cr, uid, contract, context=None):
         context = context or {}
 
@@ -641,7 +653,7 @@ class account_analytic_account(osv.osv):
         fpos_obj = self.pool.get('account.fiscal.position')
 
         if not contract.partner_id:
-            raise osv.except_osv(_('No Customer Defined !'),_("You must first select a Customer for Contract %s!") % contract.name )
+            raise osv.except_osv(_('No Customer Defined!'),_("You must first select a Customer for Contract %s!") % contract.name )
 
         fpos = contract.partner_id.property_account_position.id or False
         journal_ids = journal_obj.search(cr, uid, [('type', '=','sale'),('company_id', '=', contract.company_id.id or False)], limit=1)
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 6f670b2c6b9..cd4be740815 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -98,8 +98,8 @@
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
                                 <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
-                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
-                                        type="action"
+                                    <button name="hr_to_invoice_timesheets"
+                                        type="object"
                                         class="oe_link"
                                         string="⇒ Invoice"/>
                                     or view 
@@ -213,7 +213,7 @@
                 <search string="Contracts">
                     <field name="name" filter_domain="['|', ('name','ilike',self),('code','ilike',self)]" string="Contract"/>
                     <field name="date"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="manager_id"/>
                     <field name="parent_id"/>
                     <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="Contracts in progress (open, draft)"/>
@@ -267,7 +267,7 @@
             </field>
         </record>
         <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
-        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
+        <menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="8" parent="base.menu_sales"/>
 
         <!-- Action Sales/Invoicing/Time and Material to Invoice -->
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 3944c48afb6..339d425c717 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2011-02-19 12:16+0000\n"
+"PO-Revision-Date: 2013-05-31 07:35+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:25+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ Счет"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -196,6 +196,8 @@ msgid ""
 "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
 "'normal','template'])]}"
 msgstr ""
+"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
+"'normal','template'])]}"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -335,7 +337,7 @@ msgstr "Теоретическая выручка"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "К продлению"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -431,7 +433,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Всего в счет"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -546,18 +548,18 @@ msgstr "Дата последней операции по этому счету.
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Обязательное использование шаблонов."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Contract Template"
-msgstr ""
+msgstr "Шаблон контракта"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -612,7 +614,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Total"
-msgstr ""
+msgstr "Итого"
 
 #~ msgid "Hours summary by user"
 #~ msgstr "Итого часов по пользователям"
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 9d7df0aa010..1696874f0f5 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -67,7 +67,6 @@ class account_analytic_default(osv.osv):
                 best_index = index
         return res
 
-account_analytic_default()
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
@@ -82,7 +81,6 @@ class account_invoice_line(osv.osv):
             res_prod['value'].update({'account_analytic_id': False})
         return res_prod
 
-account_invoice_line()
 
 
 class stock_picking(osv.osv):
@@ -97,7 +95,6 @@ class stock_picking(osv.osv):
 
         return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 
-stock_picking()
 
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
@@ -118,6 +115,5 @@ class sale_order_line(osv.osv):
                 inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id': rec.analytic_id.id}, context=context)
         return create_ids
 
-sale_order_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index 4d7b5295f16..86fed1b535a 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-11-27 13:19+0000\n"
+"PO-Revision-Date: 2013-04-15 15:56+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:28+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -40,6 +40,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een product voor de analytische rekening in analytische "
+"standaardrekening (vb. maak een nieuwe verkoopfactuur of verkooporder: als "
+"we dit product kiezen, wordt de analytische rekening voorgesteld)."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -64,6 +67,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een relatie voor de analytische rekening in analytische "
+"standaardrekening (vb. maak een nieuwe verkoopfactuur of verkooporder: als "
+"we deze relatie kiezen, wordt de analytische rekening voorgesteld)."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -118,6 +124,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een firma voor de analytische rekening in analytische standaardrekening "
+"(vb. maak een nieuwe verkoopfactuur of verkooporder: als we deze firma "
+"kiezen, wordt de analytische rekening voorgesteld)."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/security/account_analytic_default_security.xml b/addons/account_analytic_default/security/account_analytic_default_security.xml
index 63c6e30eb22..cdce2a9955e 100644
--- a/addons/account_analytic_default/security/account_analytic_default_security.xml
+++ b/addons/account_analytic_default/security/account_analytic_default_security.xml
@@ -4,7 +4,7 @@
 
     <record id="analytic_default_comp_rule" model="ir.rule">
         <field name="name">Analytic Default multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_default"/>
+        <field name="model_id" ref="model_account_analytic_default"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 5834db99cd3..4cf12098fff 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -40,10 +40,10 @@ class one2many_mod2(fields.one2many):
             plan = journal.plan_id
             if plan and len(plan.plan_ids) > pnum:
                 acc_id = plan.plan_ids[pnum].root_analytic_id.id
-                ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('analytic_account_id','child_of',[acc_id])], limit=self._limit)
+                ids2 = obj.pool[self._obj].search(cr, user, [(self._fields_id,'in',ids),('analytic_account_id','child_of',[acc_id])], limit=self._limit)
         if ids2 is None:
-            ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids)], limit=self._limit)
-        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+            ids2 = obj.pool[self._obj].search(cr, user, [(self._fields_id,'in',ids)], limit=self._limit)
+        for r in obj.pool[self._obj]._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             res[r[self._fields_id]].append( r['id'] )
         return res
 
@@ -65,7 +65,6 @@ class account_analytic_line(osv.osv):
         'percentage': fields.float('Percentage')
     }
 
-account_analytic_line()
 
 class account_analytic_plan(osv.osv):
     _name = "account.analytic.plan"
@@ -75,7 +74,6 @@ class account_analytic_plan(osv.osv):
         'plan_ids': fields.one2many('account.analytic.plan.line', 'plan_id', 'Analytic Plans'),
     }
 
-account_analytic_plan()
 
 class account_analytic_plan_line(osv.osv):
     _name = "account.analytic.plan.line"
@@ -94,7 +92,6 @@ class account_analytic_plan_line(osv.osv):
         'max_required': 100.0,
     }
 
-account_analytic_plan_line()
 
 class account_analytic_plan_instance(osv.osv):
     _name = "account.analytic.plan.instance"
@@ -257,7 +254,6 @@ class account_analytic_plan_instance(osv.osv):
                 vals['code'] = this.code and (str(this.code)+'*') or "*"
         return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context=context)
 
-account_analytic_plan_instance()
 
 class account_analytic_plan_instance_line(osv.osv):
     _name = "account.analytic.plan.instance.line"
@@ -280,7 +276,6 @@ class account_analytic_plan_instance_line(osv.osv):
             res.append((record['id'], record['analytic_account_id']))
         return res
 
-account_analytic_plan_instance_line()
 
 class account_journal(osv.osv):
     _inherit = "account.journal"
@@ -289,7 +284,6 @@ class account_journal(osv.osv):
         'plan_id': fields.many2one('account.analytic.plan', 'Analytic Plans'),
     }
 
-account_journal()
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
@@ -315,7 +309,6 @@ class account_invoice_line(osv.osv):
             res_prod['value'].update({'analytics_id': rec.analytics_id.id})
         return res_prod
 
-account_invoice_line()
 
 class account_move_line(osv.osv):
 
@@ -339,7 +332,7 @@ class account_move_line(osv.osv):
         for line in self.browse(cr, uid, ids, context=context):
            if line.analytics_id:
                if not line.journal_id.analytic_journal_id:
-                   raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal.") % (line.journal_id.name,))
+                   raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal.") % (line.journal_id.name,))
 
                toremove = analytic_line_obj.search(cr, uid, [('move_id','=',line.id)], context=context)
                if toremove:
@@ -370,7 +363,6 @@ class account_move_line(osv.osv):
         result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         return result
 
-account_move_line()
 
 class account_invoice(osv.osv):
     _name = "account.invoice"
@@ -425,14 +417,12 @@ class account_invoice(osv.osv):
                     il['analytic_lines'].append((0, 0, al_vals))
         return iml
 
-account_invoice()
 
 class account_analytic_plan(osv.osv):
     _inherit = "account.analytic.plan"
     _columns = {
         'default_instance_id': fields.many2one('account.analytic.plan.instance', 'Default Entries'),
     }
-account_analytic_plan()
 
 class analytic_default(osv.osv):
     _inherit = "account.analytic.default"
@@ -440,7 +430,6 @@ class analytic_default(osv.osv):
         'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
 
-analytic_default()
 
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
@@ -459,7 +448,6 @@ class sale_order_line(osv.osv):
                     inv_line_obj.write(cr, uid, [line.id], {'analytics_id': rec.analytics_id.id}, context=context)
         return create_ids
 
-sale_order_line()
 
 
 class account_bank_statement(osv.osv):
@@ -483,12 +471,11 @@ class account_bank_statement(osv.osv):
             for st_line in st.line_ids:
                 if st_line.analytics_id:
                     if not st.journal_id.analytic_journal_id:
-                        raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal.") % (st.journal_id.name,))
+                        raise osv.except_osv(_('No Analytic Journal!'),_("You have to define an analytic journal on the '%s' journal.") % (st.journal_id.name,))
                 if not st_line.amount:
                     continue
         return True
 
-account_bank_statement()
 
 
 class account_bank_statement_line(osv.osv):
@@ -497,6 +484,5 @@ class account_bank_statement_line(osv.osv):
     _columns = {
         'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
-account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 3dcbcda6952..be46b9a6923 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -64,30 +64,6 @@
         </field>
     </record>
 
-<!-- Replace analytic_id with analytics_id in account.invoice.line -->
-
-    <record model="ir.ui.view" id="view_invoice_line_form_inherit">
-        <field name="name">account.invoice.line.form.inherit</field>
-        <field name="model">account.invoice.line</field>
-        <field name="inherit_id" ref="account.view_invoice_line_form"/>
-        <field name="arch" type="xml">
-            <field name="account_analytic_id" position="replace">
-                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
-            </field>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="invoice_supplier_form_inherit">
-        <field name="name">account.invoice.supplier.form.inherit</field>
-        <field name="model">account.invoice</field>
-        <field name="inherit_id" ref="account.invoice_supplier_form"/>
-        <field name="priority">2</field>
-        <field name="arch" type="xml">
-            <field name="account_analytic_id" position="replace">
-                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
-            </field>
-        </field>
-    </record>
 
     <!-- views for account.analytic.plan.instance -->
     <record model="ir.ui.view" id="account_analytic_plan_instance_form">
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index ba32246e8d6..29cb3ea910f 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 10:00+0000\n"
+"PO-Revision-Date: 2013-05-31 07:41+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:26+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -48,7 +48,7 @@ msgstr "Ставка (%)"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Итог должен быть между %s и %s."
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -131,7 +131,7 @@ msgstr "Не показывать пустые строки"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "Нет позиций аналитики относящихся к счету %s."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -315,7 +315,7 @@ msgstr "Журнал аналитики"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "Пожалуйста, введите имя и код перед сохранением модели."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -347,7 +347,7 @@ msgstr "Журнал"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "Вы должны определить журнал аналитики для журнала '%s'"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -375,7 +375,7 @@ msgstr "Позиция счета"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Аналитический план счетов не определен."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -402,7 +402,7 @@ msgstr "Разнесение аналитики"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "Модель с таким названием и кодом уже существует."
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index 640443c8a0b..d3581d6c457 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -71,6 +71,5 @@ class account_crossovered_analytic(osv.osv_memory):
             'datas': datas,
         }
 
-account_crossovered_analytic()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index 7038a6f1025..3a206aa227e 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -55,6 +55,5 @@ class analytic_plan_create_model(osv.osv_memory):
         else:
             return {'type': 'ir.actions.act_window_close'}
 
-analytic_plan_create_model()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
index 443642d048b..b52d9ed3bbd 100644
--- a/addons/account_anglo_saxon/product.py
+++ b/addons/account_anglo_saxon/product.py
@@ -48,7 +48,6 @@ class product_category(osv.osv):
             help="This account will be used to value outgoing stock using cost price."),
 
     }
-product_category()
 
 class product_template(osv.osv):
     _inherit = "product.template"
@@ -78,7 +77,6 @@ class product_template(osv.osv):
             help="This account will be used to value outgoing stock using cost price."),
 
     }
-product_template()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
index 959f8b7eb49..c10a2a97d80 100644
--- a/addons/account_anglo_saxon/purchase.py
+++ b/addons/account_anglo_saxon/purchase.py
@@ -37,6 +37,5 @@ class purchase_order(osv.osv):
                 new_account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
                 line.update({'account_id': new_account_id})
         return line
-purchase_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py
index 191249a6640..1cf3ecf21ef 100644
--- a/addons/account_anglo_saxon/stock.py
+++ b/addons/account_anglo_saxon/stock.py
@@ -57,7 +57,6 @@ class stock_picking(osv.osv):
                             self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a})
         return res
 
-stock_picking()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 5a22a888772..5c019155fdc 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -70,7 +70,6 @@ class account_asset_category(osv.osv):
            res['value'] = {'account_depreciation_id': account_asset_id}
         return res
 
-account_asset_category()
 
 class account_asset_asset(osv.osv):
     _name = 'account.asset.asset'
@@ -80,10 +79,10 @@ class account_asset_asset(osv.osv):
         for asset in self.browse(cr, uid, ids, context=context):
             if asset.account_move_line_ids: 
                 raise osv.except_osv(_('Error!'), _('You cannot delete an asset that contains posted depreciation lines.'))
-        return super(account_account, self).unlink(cr, uid, ids, context=context)
+        return super(account_asset_asset, self).unlink(cr, uid, ids, context=context)
 
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         if periods:
             return periods[0]
         else:
@@ -361,7 +360,6 @@ class account_asset_asset(osv.osv):
             'context': context,
         }
 
-account_asset_asset()
 
 class account_asset_depreciation_line(osv.osv):
     _name = 'account.asset.depreciation.line'
@@ -456,7 +454,6 @@ class account_asset_depreciation_line(osv.osv):
                 asset.write({'state': 'close'})
         return created_move_ids
 
-account_asset_depreciation_line()
 
 class account_move_line(osv.osv):
     _inherit = 'account.move.line'
@@ -465,7 +462,6 @@ class account_move_line(osv.osv):
         'entry_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
 
     }
-account_move_line()
 
 class account_asset_history(osv.osv):
     _name = 'account.asset.history'
@@ -490,6 +486,5 @@ class account_asset_history(osv.osv):
         'user_id': lambda self, cr, uid, ctx: uid
     }
 
-account_asset_history()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index 7e2f24f0d0a..d5b1c298c0b 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -35,7 +35,6 @@ class account_invoice(osv.osv):
         res['asset_id'] = x.get('asset_id', False)
         return res
 
-account_invoice()
 
 class account_invoice_line(osv.osv):
 
@@ -66,6 +65,5 @@ class account_invoice_line(osv.osv):
                     asset_obj.validate(cr, uid, [asset_id], context=context)
         return True
 
-account_invoice_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index c4cb17bded3..fe1fcf473ba 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -223,7 +223,7 @@
                 <filter icon="terp-check" string="Current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
                 <filter icon="terp-dialog-close" string="Closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
                 <field name="category_id"/>
-                <field name="partner_id"/>
+                <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
             </search>
         </field>
     </record>
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index 5bee5f9bfd9..3413cf38ac8 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-11-27 13:35+0000\n"
+"PO-Revision-Date: 2013-04-15 15:59+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -148,7 +148,7 @@ msgstr "Dit is het bedrag dat u niet kunt afschrijven."
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "De tijd tussen twee afschrijvingen, in maanden"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
@@ -265,7 +265,7 @@ msgstr "Duur wijzigen"
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "Het aantal keer dat er moet worden afgeschreven."
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -295,7 +295,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Volgende afschrijvingsperiode"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -346,7 +346,7 @@ msgstr "Investeringscategorie zoeken"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "maanden"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
@@ -608,7 +608,7 @@ msgstr "Afschrijvingsmethode"
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Current Depreciation"
-msgstr ""
+msgstr "Huidige afschrijving"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
@@ -653,6 +653,9 @@ msgid ""
 "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
 "  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
 msgstr ""
+"Kies de methode om het aantal afschrijvingsregels te berekenen.\n"
+"  * Lineair: op basis van: brutowaarde / aantal afschrijvingen\n"
+"  * Degressief: op basis van: restwaarde * degressieve factor"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po
index a0950a98370..d6bc83aacb5 100644
--- a/addons/account_asset/i18n/ru.po
+++ b/addons/account_asset/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-31 08:06+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -148,7 +148,7 @@ msgstr ""
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "Количество времени между амортизациями, в месяцах"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
@@ -160,7 +160,7 @@ msgstr "Дата амортизации"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Ошибка! Нельзя создавать рекурсивные активы."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -205,7 +205,7 @@ msgstr "# позиций амортизации"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Количество месяцев в периоде"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -234,7 +234,7 @@ msgstr "Счет активов"
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
 #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
 msgid "Compute Assets"
-msgstr ""
+msgstr "Вычислить активы"
 
 #. module: account_asset
 #: field:account.asset.category,method_period:0
@@ -265,12 +265,12 @@ msgstr "Изменить длительность"
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "Количество амортизаций необходимых для обесценивания актива"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Аналитическая информация"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -293,7 +293,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Следующий период амортизации"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -344,7 +344,7 @@ msgstr "Поиск категории актива"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "месяцы"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
@@ -372,7 +372,7 @@ msgstr ""
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -406,7 +406,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr ""
+msgstr "Активы в рабочем состоянии"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -427,7 +427,7 @@ msgstr ""
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -474,12 +474,12 @@ msgstr "Вычислить"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "История актива"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
-msgstr ""
+msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
@@ -505,7 +505,7 @@ msgstr "История"
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute Asset"
-msgstr ""
+msgstr "Вычислить актив"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
@@ -521,7 +521,7 @@ msgstr "Общий"
 #: field:account.asset.asset,prorata:0
 #: field:account.asset.category,prorata:0
 msgid "Prorata Temporis"
-msgstr ""
+msgstr "По истечении срока"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
@@ -553,7 +553,7 @@ msgstr "Элементы журнала"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Актив - интервал времени для изменения"
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_date:0
@@ -574,6 +574,8 @@ msgid ""
 "Choose the period for which you want to automatically post the depreciation "
 "lines of running assets"
 msgstr ""
+"Выберите период, за который вы хотите автоматически создавать записи "
+"амортизации  для актива"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -588,12 +590,12 @@ msgstr "Метод амортизации"
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Current Depreciation"
-msgstr ""
+msgstr "Текущая аммортизация"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Название актива"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -618,7 +620,7 @@ msgstr "Журнал"
 #. module: account_asset
 #: field:account.asset.history,name:0
 msgid "History name"
-msgstr ""
+msgstr "Название истории"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciated_value:0
@@ -657,7 +659,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "Валовая стоимость"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
@@ -703,12 +705,12 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Нумерация"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
 msgid "State here the time between 2 depreciations, in months"
-msgstr ""
+msgstr "Время между двумя амортизациями в месяцах"
 
 #. module: account_asset
 #: field:account.asset.history,date:0
@@ -729,7 +731,7 @@ msgstr "Число амортизаций"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Create Move"
-msgstr ""
+msgstr "Создать перемещение"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/th.po b/addons/account_asset/i18n/th.po
new file mode 100644
index 00000000000..fdc6c7b4754
--- /dev/null
+++ b/addons/account_asset/i18n/th.po
@@ -0,0 +1,741 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-05-15 10:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
+#: field:account.move.line,asset_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
+msgid "Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview on all depreciation. "
+"The\n"
+"            tool search can also be used to personalise your Assets reports "
+"and\n"
+"            so, match this analysis to your needs;\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 1554880ac38..40ab1c778f0 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -82,6 +82,5 @@ class asset_asset_report(osv.osv):
                     a.purchase_value, a.id, a.salvage_value
         )""")
 	
-asset_asset_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index 4865196c4a8..c772c6e4103 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -49,7 +49,7 @@
                 <field name="asset_id"/>
                 <field name="asset_category_id"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <group expand="1" string="Group By...">
diff --git a/addons/account_asset/security/ir.model.access.csv b/addons/account_asset/security/ir.model.access.csv
old mode 100755
new mode 100644
diff --git a/addons/account_asset/wizard/__init__.py b/addons/account_asset/wizard/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
old mode 100755
new mode 100644
index 19782c76367..f27507ac2b3
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -127,6 +127,5 @@ class asset_modify(osv.osv_memory):
         asset_obj.compute_depreciation_board(cr, uid, [asset_id], context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-asset_modify()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py
old mode 100755
new mode 100644
index cc870329840..f7cc6cf89c0
--- a/addons/account_asset/wizard/wizard_asset_compute.py
+++ b/addons/account_asset/wizard/wizard_asset_compute.py
@@ -30,7 +30,7 @@ class asset_depreciation_confirmation_wizard(osv.osv_memory):
     }
    
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         if periods:
             return periods[0]
         return False
@@ -55,6 +55,5 @@ class asset_depreciation_confirmation_wizard(osv.osv_memory):
             'type': 'ir.actions.act_window',
         }
 
-asset_depreciation_confirmation_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 60dcc6dfa25..b9e44ee8f9c 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -56,7 +56,6 @@ class account_bank_statement(osv.osv):
                     (tuple([x.id for x in st.line_ids]),))
         return True
 
-account_bank_statement()
 
 class account_bank_statement_line_global(osv.osv):
     _name = 'account.bank.statement.line.global'
@@ -100,7 +99,6 @@ class account_bank_statement_line_global(osv.osv):
             ids = self.search(cr, user, args, context=context, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-account_bank_statement_line_global()
 
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
@@ -130,6 +128,5 @@ class account_bank_statement_line(osv.osv):
             Please go to the associated bank statement in order to delete and/or modify bank statement line.'))
         return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
 
-account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_bank_statement_extensions/i18n/hu.po b/addons/account_bank_statement_extensions/i18n/hu.po
new file mode 100644
index 00000000000..a631c43ade0
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/hu.po
@@ -0,0 +1,362 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-05 23:08+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-06 05:40+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Kezdeményezőtől a kedvezményezetthez intézett információ"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Jóváhagyott"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Globális ID azonosító"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Szülő kód"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Tartozik"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Kiválasztott számlakivonat sorok visszavonása"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Value Date"
+msgstr "Értéknap"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Csoportosítás ezzel..."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Tervezet"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Kivonat"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Kiválasztott bankszámla kivonat sorok jóváhagyása"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Bank kivonat egyenleg kimutatás"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Sorok elvetése"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Köptegelt fizetés információ"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "Status"
+msgstr "Állapot"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid ""
+"Delete operation not allowed.             Please go to the associated bank "
+"statement in order to delete and/or modify bank statement line."
+msgstr ""
+"A törlés végrehajtás nem engedélyezett. Kérem menjen az ide vonatkozó banki "
+"kivonathoz, hogy azt törölhesse és/vagy módosíthassa."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "or"
+msgstr "vagy"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Jóváhagyott sorok5"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Tranzakciók"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Típus"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Napló"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Jóváhagyott kivonat sorok"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Jóváírási tranzakció"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "kiválasztott kivonat sorok visszavonása"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Ellanoldali szám"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Záró egyenleg"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Dátum"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Globális összeg"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Terhelés tranzakciók"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Kiterjesztett szűrők…"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Jóváhagyott sorokat enm lehet többé megváltoztatni."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Biztos benne, hogy vissza akarja vonni a kijelölt banki kivonat sorokat?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Név"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr "OBI"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Jegyzetek"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Kézi"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Bank Transaction"
+msgstr "Banki tranzakciók"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Jóváírás"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Összeg"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Főkönyvi számla"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Ellenoldal pénzneme"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "Ellenoldali BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Alárendelt kódok"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Banki tranzakciók keresése"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr "Biztos, hogy jóvá akarja hagyni a kiválasztott banki kivonat sorait?"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Ugynahhoz, a kötegelt utaláson belüli, globalizált szinthez tartozó "
+"tranzakció azonosító kód"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Tervezet kivonat sorok."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Bankkivonat sor"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Kód"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Ellenoldal megnevezése"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankszámlák"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bankszámlakivonat"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Kivonat sor"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "A kódnak egyedinek kell lennie !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Bankkivonat sorai"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid "Warning!"
+msgstr "Figyelem!"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Alárendelt kötegelt utalások"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Mégse"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Kivonat sorai"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Teljes érték"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "Globalizált ID azonosító"
diff --git a/addons/account_bank_statement_extensions/res_partner_bank.py b/addons/account_bank_statement_extensions/res_partner_bank.py
index f866634a08c..22baa78d39f 100644
--- a/addons/account_bank_statement_extensions/res_partner_bank.py
+++ b/addons/account_bank_statement_extensions/res_partner_bank.py
@@ -35,5 +35,4 @@ class res_partner_bank(osv.osv):
             ids = self.search(cr, user, args, context=context, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-res_partner_bank()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
index 46d71354d4b..15c242e9c33 100644
--- a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
+++ b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
@@ -32,6 +32,5 @@ class cancel_statement_line(osv.osv_memory):
         line_obj.write(cr, uid, line_ids, {'state': 'draft'}, context=context)
         return {}
 
-cancel_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
index 3a887a52441..c330a2cc359 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
@@ -32,6 +32,5 @@ class confirm_statement_line(osv.osv_memory):
         line_obj.write(cr, uid, line_ids, {'state': 'confirm'}, context=context)
         return {}
 
-confirm_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index a88c468fff1..e6fc3a29668 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -48,7 +48,6 @@ class account_budget_post(osv.osv):
     }
     _order = "name"
 
-account_budget_post()
 
 
 class crossovered_budget(osv.osv):
@@ -104,7 +103,6 @@ class crossovered_budget(osv.osv):
         })
         return True
 
-crossovered_budget()
 
 class crossovered_budget_lines(osv.osv):
 
@@ -202,7 +200,6 @@ class crossovered_budget_lines(osv.osv):
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
 
-crossovered_budget_lines()
 
 class account_analytic_account(osv.osv):
     _inherit = "account.analytic.account"
@@ -211,6 +208,5 @@ class account_analytic_account(osv.osv):
         'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'),
     }
 
-account_analytic_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index 0cdb7504f75..90285b90d1e 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -50,6 +50,5 @@ class account_budget_analytic(osv.osv_memory):
             'datas': datas,
         }
 
-account_budget_analytic()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index 97fc43c8e9d..6f89a3cd95c 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -51,6 +51,5 @@ class account_budget_crossvered_report(osv.osv_memory):
             'datas': datas,
         }
 
-account_budget_crossvered_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
index f42c39ec6ac..6e3131b584c 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
@@ -53,7 +53,6 @@ class account_budget_crossvered_summary_report(osv.osv_memory):
             'datas': datas,
         }
 
-account_budget_crossvered_summary_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index 5db6c68d508..54c3180ee0d 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -52,6 +52,5 @@ class account_budget_report(osv.osv_memory):
             'datas': datas,
         }
 
-account_budget_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_cancel/i18n/th.po b/addons/account_cancel/i18n/th.po
new file mode 100644
index 00000000000..eabcc0814dd
--- /dev/null
+++ b/addons/account_cancel/i18n/th.po
@@ -0,0 +1,23 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-15 07:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr ""
diff --git a/addons/account_check_writing/account.py b/addons/account_check_writing/account.py
index 62b7336dc5f..035e3a710b0 100644
--- a/addons/account_check_writing/account.py
+++ b/addons/account_check_writing/account.py
@@ -29,7 +29,6 @@ class account_journal(osv.osv):
         'use_preprint_check': fields.boolean('Use Preprinted Check'),
         }
 
-account_journal()
 
 class res_company(osv.osv):
     _inherit = "res.company"
@@ -46,5 +45,4 @@ class res_company(osv.osv):
         'check_layout' : lambda *a: 'top',
     }
     
-res_company()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py
index 7a5d12f5cff..8e1ad2e1fbf 100644
--- a/addons/account_check_writing/account_voucher.py
+++ b/addons/account_check_writing/account_voucher.py
@@ -97,4 +97,3 @@ class account_voucher(osv.osv):
             res['arch'] = etree.tostring(doc)
         return res
 
-account_voucher()
diff --git a/addons/account_check_writing/i18n/hu.po b/addons/account_check_writing/i18n/hu.po
new file mode 100644
index 00000000000..528cb4fed60
--- /dev/null
+++ b/addons/account_check_writing/i18n/hu.po
@@ -0,0 +1,247 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-11 22:57+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-12 05:21+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Fennt lévő csekk"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Nyitó egyenleg"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+#: view:account.voucher:0
+msgid "Print Check"
+msgstr "Csekk nyomtatása"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Középen lévő csekk"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Fennt lévő csekk kompatibilis a Quicken, QuickBooks és Microsoft Money "
+"csekkekekl. A középen lévő csekkek kompatibilisek a Peachtree, ACCPAC és "
+"DacEasy csekkekel. Az alul lévő csekkek kompatibilisek a Peachtree, ACCPAC "
+"és DacEasy only csekkekel."
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Alul lévő csekkek"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr "Csekkek kötegelt nyomtatása"
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+msgstr "Egyik, már kinyomtatott csekk már el van látva számmal."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Jelölje be ezt, ha naplót csekkírásra használja."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Csekk írás engedélyezése."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Leírás"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Napló"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Csekkek írása"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Kedvezmény"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Eredeti összeg"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr "Csekk elrendezése"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Csekk írás engedélyezése"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Kifizetés"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Előre nyomtatott csekk használata"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Csekk nyomtatás (Alsó)"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új csekk létrehozásához. \n"
+"              </p><p>\n"
+"                A csekk kifizetési lap lehetővé teszi a beszállítókhoz "
+"történt \n"
+"                csekken történt kifizetések nyomon követését. Ha kiválaszt "
+"egy beszállítót,\n"
+"                a fizetési módot és az összeget, OpenERP javasolni fogja \n"
+"                a fizetés összeegyeztetését a még nyitott beszállítói "
+"számlákkal és\n"
+"                fizetésekkel.\n"
+"              </p>\n"
+"            "
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Fizetési határidő"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+msgid "Print Check (Middle)"
+msgstr "Csekk nyomtatás (Középső)"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Vállalatok"
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr "Hiba!"
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr "A következő csekkszám nyomtatása"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Esedékes egyenleg"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check (Top)"
+msgstr "Csekk nyomtatás (Felső)"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Csekk végösszege"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Könyvelési bizonylat"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr "vagy"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Összeg szavakkal"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr "Csekk kötegelt nyomtatása"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr "Mégse"
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr "Következő csekk száma"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr "Csekk"
diff --git a/addons/account_check_writing/i18n/ru.po b/addons/account_check_writing/i18n/ru.po
index ba474c72a22..8e68dd7152a 100644
--- a/addons/account_check_writing/i18n/ru.po
+++ b/addons/account_check_writing/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 13:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-06-03 07:47+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:51+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -25,13 +25,13 @@ msgstr ""
 #. module: account_check_writing
 #: report:account.print.check.top:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Открытый баланс"
 
 #. module: account_check_writing
 #: view:account.check.write:0
 #: view:account.voucher:0
 msgid "Print Check"
-msgstr ""
+msgstr "Напечатать чек"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -82,7 +82,7 @@ msgstr "Описание"
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Журнал"
 
 #. module: account_check_writing
 #: model:ir.actions.act_window,name:account_check_writing.action_write_check
@@ -95,14 +95,14 @@ msgstr ""
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Discount"
-msgstr ""
+msgstr "Скидка"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Original Amount"
-msgstr ""
+msgstr "Первоначальная сумма"
 
 #. module: account_check_writing
 #: field:res.company,check_layout:0
@@ -119,7 +119,7 @@ msgstr ""
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Payment"
-msgstr ""
+msgstr "Платеж"
 
 #. module: account_check_writing
 #: field:account.journal,use_preprint_check:0
@@ -153,7 +153,7 @@ msgstr ""
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Due Date"
-msgstr ""
+msgstr "Дата исполнения"
 
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
@@ -163,13 +163,13 @@ msgstr ""
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: account_check_writing
 #: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: account_check_writing
 #: help:account.check.write,check_number:0
@@ -202,12 +202,12 @@ msgstr ""
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
-msgstr ""
+msgstr "Сумма прописью"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_check_write
@@ -217,7 +217,7 @@ msgstr ""
 #. module: account_check_writing
 #: view:account.check.write:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: account_check_writing
 #: field:account.check.write,check_number:0
diff --git a/addons/account_check_writing/wizard/account_check_batch_printing.py b/addons/account_check_writing/wizard/account_check_batch_printing.py
index afeb5de6445..c3a13e2c687 100644
--- a/addons/account_check_writing/wizard/account_check_batch_printing.py
+++ b/addons/account_check_writing/wizard/account_check_batch_printing.py
@@ -83,5 +83,4 @@ class account_check_write(osv.osv_memory):
             'nodestroy': True
             }
 
-account_check_write()
 
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 036feaaf0e5..715860cab83 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -165,9 +165,8 @@ class res_partner(osv.osv):
             else:
                 action_text = partner.latest_followup_level_id_without_lit.manual_action_note or ''
 
-            #Check date: put the minimum date if it existed already
-            action_date = (partner.payment_next_action_date and min(partner.payment_next_action_date, fields.date.context_today(self, cr, uid, context=context))
-                           ) or fields.date.context_today(self, cr, uid, context=context)
+            #Check date: only change when it did not exist already
+            action_date = partner.payment_next_action_date or fields.date.context_today(self, cr, uid, context=context)
 
             # Check responsible: if partner has not got a responsible already, take from follow-up
             responsible_id = False
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index 6be11399b68..fba0bce460b 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -9,11 +9,12 @@
             <field name="model">res.partner</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <tree string="Customer Followup">
-                    <field name="name"/>
+                <tree string="Customer Followup" create="false" delete="false">
+                    <field name="display_name"/>
                     <field name="payment_next_action_date"/>
                     <field name="payment_next_action"/>
                     <field name="user_id" invisible="1"/>
+                    <field name="country_id" invisible="1"/>
                     <field name="parent_id" invisible="1"/>
                     <field name="payment_responsible_id"/>
                     <field name="payment_earliest_due_date"/>
@@ -29,7 +30,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_tree"/>
             <field name="arch" type="xml">
-                 <field name="name" position="after">
+                 <field name="display_name" position="after">
                      <field name="payment_responsible_id" invisible="1"/>
                  </field>
              </field>
@@ -97,7 +98,7 @@
                                 <button name="action_done" type="object" string="⇾ Mark as Done"
                                      help="Click to mark the action as done." class="oe_link"
                                      attrs="{'invisible':[('payment_next_action_date','=', False)]}"
-                                     groups="base.group_partner_manager"/>
+                                     groups="account.group_account_user"/>
                                 <field name="payment_next_action" placeholder="Action to be taken e.g. Give a phonecall, Check if it's paid, ..."/>
                             </div>
                         </group>
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 1a92e60dfc9..64a73d776ef 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -1,20 +1,21 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account_followup
-#
+# * account_followup
+# Els Van Vossel <evv@agaplan.eu>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-17 09:57+0000\n"
-"Last-Translator: Niels Huylebroeck <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2013-04-15 23:02+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:11+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
+"Language: nl\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -22,12 +23,12 @@ msgstr ""
 #: model:email.template,subject:account_followup.email_template_account_followup_level1
 #: model:email.template,subject:account_followup.email_template_account_followup_level2
 msgid "${user.company_id.name} Payment Reminder"
-msgstr ""
+msgstr "${user.company_id.name} Aanmaning"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
-msgstr ""
+msgstr "Het maximale aanmaningsniveau"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -43,33 +44,33 @@ msgstr "Aanmanen"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Volgende actiedatum"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,manual_action:0
 msgid "Manual Action"
-msgstr ""
+msgstr "Manuele actie"
 
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
-msgstr ""
+msgstr "Moet worden afgedrukt"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "⇾ Als Gedaan markeren"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
 msgid "Action To Do"
-msgstr ""
+msgstr "Uit te voeren actie"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -89,39 +90,39 @@ msgstr "Factuurdatum"
 #. module: account_followup
 #: field:account_followup.print,email_subject:0
 msgid "Email Subject"
-msgstr "E-mail onderwerp"
+msgstr "E-mailonderwerp"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s"
-msgstr ""
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "days overdue, do the following actions:"
-msgstr ""
+msgstr "dagen vervallen, voer volgende acties uit:"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-up Steps"
-msgstr ""
+msgstr "Aanmaningsstappen"
 
 #. module: account_followup
 #: field:account_followup.print,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "E-mailbericht"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
-msgstr ""
+msgstr "Aanmaningen versturen"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 #: code:addons/account_followup/account_followup.py:263
 #, python-format
 msgid "Amount"
-msgstr ""
+msgstr "Bedrag"
 
 #. module: account_followup
 #: help:res.partner,payment_next_action:0
@@ -129,11 +130,14 @@ msgid ""
 "This is the next action to be taken.  It will automatically be set when the "
 "partner gets a follow-up level that requires a manual action. "
 msgstr ""
+"Dit is de volgende actie die moet worden ondernomen. Deze wordt automatisch "
+"ingesteld als de relatie een aanmaningsniveau bereikt waarvoor een manuele "
+"actie is vereist. "
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "Niemand verantwoordelijk"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -158,6 +162,24 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Beste %(partner_name)s,\n"
+"\n"
+"Het spijt ons te moeten vaststellen dat, ondanks een eerdere aanmaning, u "
+"nog steeds een openstaand saldo hebt.\n"
+"\n"
+"Wij verzoeken u dringend het openstaande saldo te betalen. Bij gebrek aan "
+"betaling, zijn wij genoodzaakt de verdere levering van goederen en diensten "
+"stop te zetten.\n"
+"Gelieve de betalingen uit te voeren binnen de 8 dagen.\n"
+"\n"
+"Als er een probleem is rond de betaling waarvan wij niet op de hoogte zijn, "
+"kunt u steeds contact opnemen met onze boekhouding, zodat dit snel kan "
+"worden opgelost.\n"
+"\n"
+"Hierna vindt u een overzicht van de vervallen documenten.\n"
+"\n"
+"Hoogachtend,\n"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -195,6 +217,38 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Beste ${object.name},</p>\n"
+"    <p>\n"
+"    Volgens onze informatie, heeft u nog een openstaand saldo. Wij verzoeken "
+"u het nodige te doen om deze betaling binnen de 8 dagen over te schrijven op "
+"onze rekening.\n"
+"\n"
+"Indien uw betaling deze e-mail heeft gekruist, mag u dit bericht als "
+"onbestaand beschouwen. Neem gerust contact op met onze boekhouding mocht u "
+"nog vragen hebben.\n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"Met vriendelijke groeten,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -209,17 +263,17 @@ msgstr "Totaal debet"
 #. module: account_followup
 #: field:res.partner,payment_next_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Volgende actie"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Partner Name"
-msgstr ""
+msgstr "Relatienaam"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "Duid iemand aan die verantwoordelijk is"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -231,7 +285,7 @@ msgstr "Aanmaning"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "VAT:"
-msgstr "BTW:"
+msgstr "Btw:"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -255,11 +309,24 @@ msgid ""
 "                        same customer, the actions of the most \n"
 "                        overdue invoice will be executed."
 msgstr ""
+"Om klanten aan te manen tot betaling, kunt u\n"
+"                        verschillende acties instellen in functie van de "
+"grootte\n"
+"                        van het openstaand bedrag. Deze acties worden "
+"samengevoegd\n"
+"                        in aanmaningsniveaus die worden aangesproken als de\n"
+"                        vervaldatum van een factuur een ingesteld aantal "
+"dagen\n"
+"                        overschrijdt. Als de klant ook andere openstaande "
+"facturen heeft,\n"
+"                        worden de acties uitgevoerd in functie van het "
+"langst \n"
+"                        openstaande document."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Date :"
-msgstr "Datum :"
+msgstr "Datum:"
 
 #. module: account_followup
 #: field:account_followup.print,partner_ids:0
@@ -269,43 +336,43 @@ msgstr "Relaties"
 #. module: account_followup
 #: sql_constraint:account_followup.followup:0
 msgid "Only one follow-up per company is allowed"
-msgstr ""
+msgstr "Per bedrijf is maar een aanmaningsniveau toegelaten."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:254
 #, python-format
 msgid "Invoices Reminder"
-msgstr "Facturen aanmaning"
+msgstr "Aanmaning facturen"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_letter:0
 msgid "When processing, it will print a letter"
-msgstr ""
+msgstr "Bij verwerking wordt een brief gemaakt"
 
 #. module: account_followup
 #: field:res.partner,payment_earliest_due_date:0
 msgid "Worst Due Date"
-msgstr ""
+msgstr "Slechtste vervaldatum"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Not Litigation"
-msgstr ""
+msgstr "Geen betwisting"
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send emails and generate letters"
-msgstr ""
+msgstr "Verstuur e-mails en maak brieven"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_customer_followup
 msgid "Manual Follow-Ups"
-msgstr ""
+msgstr "Manuele aanmaningen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s"
-msgstr ""
+msgstr "%(partner_name)s"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level1
@@ -347,6 +414,42 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Beste ${object.name},</p>\n"
+"   <p>\n"
+"    Het spijt ons te moeten vaststellen dat, ondanks een eerdere aanmaning, "
+"u nog steeds een openstaand saldo hebt.\n"
+"Wij verzoeken u dringend het openstaande saldo te betalen. Bij gebrek aan "
+"betaling, zijn wij genoodzaakt de verdere levering van goederen en diensten "
+"stop te zetten.\n"
+"Gelieve de betalingen uit te voeren binnen de 8 dagen.\n"
+"\n"
+"Als er een probleem is rond de betaling waarvan wij niet op de hoogte zijn, "
+"kunt u steeds contact opnemen met onze boekhouding, zodat dit snel kan "
+"worden opgelost.\n"
+"\n"
+"Hierna vindt u een overzicht van de vervallen documenten.\n"
+" </p>\n"
+"<br/>\n"
+"Hoogachtend,\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -356,49 +459,49 @@ msgstr "Debet"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Follow-up Statistics"
-msgstr ""
+msgstr "Aanmaningsstatistieken"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Send Overdue Email"
-msgstr ""
+msgstr "Aanmaningsmail sturen"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-up Criteria"
-msgstr ""
+msgstr "Aanmaningscriteria"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr "Bepaalt de volgorde bij het afbeelden van de aanmaningregels"
+msgstr "Bepaalt de volgorde bij het weergeven van de aanmaningslijnen."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid " will be sent"
-msgstr ""
+msgstr " wordt verstuurd"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User's Company Name"
-msgstr ""
+msgstr "Bedrijfsnaam van gebruiker"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_letter:0
 msgid "Send a Letter"
-msgstr ""
+msgstr "Brief sturen"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 msgid "Payment Follow-ups"
-msgstr ""
+msgstr "Aanmaningen"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Due Days"
-msgstr ""
+msgstr "Dagen vervallen"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -414,48 +517,48 @@ msgstr "Laatste aanmaning"
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup
 msgid "Reconcile Invoices & Payments"
-msgstr ""
+msgstr "Facturen en betalingen afpunten"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_s
 msgid "Do Manual Follow-Ups"
-msgstr ""
+msgstr "Manuele aanmaningen uitvoeren"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Bt."
 
 #. module: account_followup
 #: field:account_followup.print,email_conf:0
 msgid "Send Email Confirmation"
-msgstr ""
+msgstr "Bevestiging per e-mail sturen"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up Entries with period in current year"
-msgstr ""
+msgstr "Aanmaningen met periode in huidig jaar"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest follow-up"
-msgstr ""
+msgstr "Laatste aanmaning"
 
 #. module: account_followup
 #: field:account_followup.print,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr "Stuur email-bericht in taal relatie"
+msgstr "Stuur e-mail in taal relatie"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:169
 #, python-format
 msgid " email(s) sent"
-msgstr ""
+msgstr " e-mail(s) verstuurd"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
 msgid "Print Follow-up & Send Mail to Customers"
-msgstr ""
+msgstr "Aanmaningen afdrukken & mail sturen naar klanten"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
@@ -466,12 +569,12 @@ msgstr "Afgedrukt bericht"
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Anybody"
-msgstr ""
+msgstr "Iedereen"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
 msgid "When processing, it will send an email"
-msgstr ""
+msgstr "Bij verwerking wordt een e-mail verstuurd"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -481,7 +584,7 @@ msgstr "Relatie voor aanmaning"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Print Overdue Payments"
-msgstr ""
+msgstr "Vervallen documenten afdrukken"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -494,11 +597,13 @@ msgstr "Aanmaningen"
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
+"E-mail is niet verstuurd, omdat er voor de relatie geen e-mailadres is "
+"ingevuld."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow-up"
-msgstr ""
+msgstr "Aanmaningen"
 
 #. module: account_followup
 #: help:res.partner,payment_responsible_id:0
@@ -506,11 +611,13 @@ msgid ""
 "Optionally you can assign a user to this field, which will make him "
 "responsible for the action."
 msgstr ""
+"U kunt eventueel een gebruiker toewijzen aan dit veld. Dit betekent dat hij "
+"verantwoordelijk is voor deze actie."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
 msgid "Results from the sending of the different letters and emails"
-msgstr ""
+msgstr "Resultaten van het versturen van brieven en e-mails"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -518,43 +625,45 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"Uw beschrijving is niet geldig. Gebruik de juiste parameter of %% als u het "
+"percentageteken wilt gebruiken."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " manual action(s) assigned:"
-msgstr ""
+msgstr " manuele actie(s) toegewezen"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Relatie zoeken"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Letters and Emails"
-msgstr ""
+msgstr "Brieven en e-mails sturen"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Follow-up"
-msgstr ""
+msgstr "Aanmaningen zoeken"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Account Move line"
-msgstr ""
+msgstr "Boeking"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
-msgstr ""
+msgstr "Brieven en e-mails sturen: overzicht acties"
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -562,21 +671,23 @@ msgid ""
 "If not specified by the latest follow-up level, it will send from the "
 "default email template"
 msgstr ""
+"Indien dit niet is ingesteld via de laatste aanmaning, dan wordt de "
+"standaard e-mailsjabloon gebruikt."
 
 #. module: account_followup
 #: sql_constraint:account_followup.followup.line:0
 msgid "Days of the follow-up levels must be different"
-msgstr ""
+msgstr "De dagen moeten verschillen per aanmaningsniveau."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Click to mark the action as done."
-msgstr ""
+msgstr "Klik om de actie als Gedaan te markeren."
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-Ups Analysis"
-msgstr ""
+msgstr "Aanmaningsanalyse"
 
 #. module: account_followup
 #: help:res.partner,payment_next_action_date:0
@@ -586,11 +697,15 @@ msgid ""
 "action. Can be practical to set manually e.g. to see if he keeps his "
 "promises."
 msgstr ""
+"Dit is als er manuele opvolging nodig is. De datum wordt ingesteld op de "
+"huidige datum als de relatie een aanmaningsniveau bereikt waarvoor een "
+"manuele handeling nodig is. Kan handig zijn om dit als manueel in te "
+"stellen, vb. om na te gaan of beloften worden nagekomen."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Print overdue payments report independent of follow-up line"
-msgstr ""
+msgstr "Aanmaningen afdrukken onafgezien van de aanmaningslijn."
 
 #. module: account_followup
 #: help:account_followup.print,date:0
@@ -609,7 +724,7 @@ msgstr "Verzenddatum aanmaning"
 #: view:res.partner:0
 #: field:res.partner,payment_responsible_id:0
 msgid "Follow-up Responsible"
-msgstr ""
+msgstr "Verantwoordelijk voor aanmaning"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level2
@@ -646,16 +761,48 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Beste ${object.name},</p>\n"
+"    <p>\n"
+"    Ondanks het feit dat wij u meerdere aanmaningen hebben gestuurd, is uw "
+"openstaand saldo nog steeds niet betaald.\n"
+"Indien de betaling ervan niet binnen de 8 dagen op onze rekening staat, "
+"schakelen wij een advocaat in om het verschuldigde saldo bij u te innen. U "
+"ontvangt hierover geen verdere communicatie.\n"
+"Wij gaan ervan uit dat deze stap niet nodig zal zijn. De details van de "
+"openstaande betalingen vindt u hierna.\n"
+"Aarzel niet contact op te nemen met onze boekhouding als u nog vragen "
+"heeft.\n"
+"</p>\n"
+"<br/>\n"
+"Hoogachtend,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Document: Rekeninguittreksel"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-up Levels"
-msgstr ""
+msgstr "Aanmaningsniveaus"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line4
@@ -678,11 +825,27 @@ msgid ""
 "Best Regards,\n"
 "            "
 msgstr ""
+"\n"
+"Beste %(partner_name)s,\n"
+"\n"
+"Ondanks meerdere aanmaningen, merken wij dat uw saldo nog steeds openstaat.\n"
+"\n"
+"Indien het openstaande saldo niet binnen 8 dagen op onze rekening is gestort "
+", zullen wij een advocaat inschakelen. Wij sturen in dat verband geen "
+"bericht meer.\n"
+"\n"
+"Wij gaan ervan uit dat deze actie niet nodig zal zijn. Details van de "
+"openstaande documenten vindt u hierbij.\n"
+"\n"
+"Aarzel niet contact op te nemen met de boekhouding als u nog vragen heeft.\n"
+"\n"
+"Hoogachtend,\n"
+"            "
 
 #. module: account_followup
 #: field:res.partner,payment_amount_due:0
 msgid "Amount Due"
-msgstr ""
+msgstr "Vervallen bedrag"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -692,19 +855,19 @@ msgstr "Laatste aanmaning"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Download Letters"
-msgstr ""
+msgstr "Brieven downloaden"
 
 #. module: account_followup
 #: field:account_followup.print,company_id:0
 #: field:res.partner,unreconciled_aml_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "onbekend"
 
 #. module: account_followup
 #: code:addons/account_followup/account_followup.py:314
 #, python-format
 msgid "Printed overdue payments report"
-msgstr ""
+msgstr "Afgedrukt aanmaningsrapport"
 
 #. module: account_followup
 #: help:account_followup.followup.line,manual_action:0
@@ -712,6 +875,7 @@ msgid ""
 "When processing, it will set the manual action to be taken for that "
 "customer. "
 msgstr ""
+"Bij verwerking zal de manuele actie voor die klant worden ingesteld. "
 
 #. module: account_followup
 #: view:res.partner:0
@@ -721,18 +885,25 @@ msgid ""
 "                            order to exclude it from the next follow-up "
 "actions."
 msgstr ""
+"Hieronder vindt u een overzicht van de transacties voor deze\n"
+"                            klant. U kunt \"Stuur geen aanmaning\" kiezen "
+"om\n"
+"                            de factuur uit te sluiten van volgende "
+"aanmaningsacties."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " email(s) should have been sent, but "
-msgstr ""
+msgstr " e-mail(s) zouden moeten zijn verstuurd, maar "
 
 #. module: account_followup
 #: help:account_followup.print,test_print:0
 msgid ""
 "Check if you want to print follow-ups without changing follow-ups level."
 msgstr ""
+"Schakel dit veld in als u aanmaningen wilt afdrukken zonder het niveau te "
+"veranderen."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
@@ -742,23 +913,23 @@ msgstr "Boekingen"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr ""
+msgstr "Totaal:"
 
 #. module: account_followup
 #: field:account_followup.followup.line,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "E-mailsjabloon"
 
 #. module: account_followup
 #: field:account_followup.print,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Overzicht"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_email:0
 msgid "Send an Email"
-msgstr ""
+msgstr "E-mail versturen"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -768,7 +939,7 @@ msgstr "Krediet"
 #. module: account_followup
 #: field:res.partner,payment_amount_overdue:0
 msgid "Amount Overdue"
-msgstr ""
+msgstr "Vervallen bedrag"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -776,12 +947,14 @@ msgid ""
 "The maximum follow-up level without taking into account the account move "
 "lines with litigation"
 msgstr ""
+"Het maximale aanmaningsniveau, zonder rekening te houden met boekingen die "
+"worden betwist."
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:res.partner,latest_followup_date:0
 msgid "Latest Follow-up Date"
-msgstr ""
+msgstr "Datum laatste aanmaning"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_default
@@ -814,6 +987,33 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Beste ${object.name},</p>\n"
+"    <p>\n"
+"    Volgens onze administratie hebben wij het onderstaande bedrag nog niet "
+"ontvangen. Wij verzoeken\n"
+"u het verschuldigde bedrag uiterlijk binnen 8 dagen over te maken.\n"
+"Indien dit schrijven uw betaling heeft gekruist, kunt u deze herinnering als "
+"niet verzonden beschouwen.\n"
+"Voor meer info kunt u steeds contact opnemen met onze boekhouding.\n"
+"    </p>\n"
+"<br/>\n"
+"Hoogachtend,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"<br/>\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -826,17 +1026,17 @@ msgstr "Saldo"
 #. module: account_followup
 #: help:res.partner,payment_note:0
 msgid "Payment Note"
-msgstr ""
+msgstr "Betalingsbewijs"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "My Follow-ups"
-msgstr ""
+msgstr "Mijn aanmaningen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s"
-msgstr ""
+msgstr "%(company_name)s"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -854,28 +1054,40 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Beste %(partner_name)s,\n"
+"\n"
+"Volgens onze administratie hebben wij het onderstaande bedrag nog niet "
+"ontvangen. Wij verzoeken u het verschuldigde bedrag binnen 8 dagen over te "
+"maken.\n"
+"\n"
+"Indien dit schrijven uw betaling heeft gekruist, kunt u deze herinnering als "
+"niet verzonden beschouwen.\n"
+"Voor meer info kunt u steeds contact opnemen met onze boekhouding.\n"
+"\n"
+"Hoogachtend,\n"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
-msgstr ""
+msgstr "Laatste boeking"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Periode"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:228
 #, python-format
 msgid "%s partners have no credits and as such the action is cleared"
-msgstr ""
+msgstr "%s relaties hebben geen schulden en de actie wordt gewist"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Follow-up Report"
-msgstr ""
+msgstr "Aanmaningsrapport"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -883,48 +1095,50 @@ msgid ""
 ", the latest payment follow-up\n"
 "                            was:"
 msgstr ""
+", het laatste aanmaningsniveau\n"
+"                            was:"
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Close"
-msgstr ""
+msgstr "Afsluiten"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr ""
+msgstr "Betwist"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr ""
+msgstr "Max. aanmaningsniveau"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " had unknown email address(es)"
-msgstr ""
+msgstr " had een onbekend e-mailadres"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_finance_followup
 #: view:res.partner:0
 msgid "Payment Follow-up"
-msgstr ""
+msgstr "Aanmaningen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Current Date"
-msgstr ""
+msgstr ": Huidige datum"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -933,16 +1147,19 @@ msgid ""
 "                        set the manual actions per customer, according to "
 "the follow-up levels defined."
 msgstr ""
+"Met deze actie stuurt u aanmaningsmails, kunt u brieven afdrukken en\n"
+"                        manuele acties instellen per klant, in functie van "
+"de ingestelde aanmaningsniveaus."
 
 #. module: account_followup
 #: field:account_followup.followup.line,name:0
 msgid "Follow-Up Action"
-msgstr ""
+msgstr "Aanmaningsactie"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Inclusief betwiste boekingen"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -955,7 +1172,7 @@ msgstr "Omschrijving"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Summary of actions"
-msgstr ""
+msgstr "Overzicht van acties"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -965,17 +1182,17 @@ msgstr "Ref"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "After"
-msgstr ""
+msgstr "Na"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr ""
+msgstr "Dit boekjaar"
 
 #. module: account_followup
 #: field:res.partner,latest_followup_level_id_without_lit:0
 msgid "Latest Follow-up Level without litigation"
-msgstr ""
+msgstr "Laatste aanmaningsniveau met betwisting"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -985,16 +1202,20 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Geen boekingen gevonden.\n"
+"                </p>\n"
+"            "
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr ""
+msgstr "Relatieboekingen"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up lines"
-msgstr ""
+msgstr "Aanmaningsregels"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -1015,6 +1236,21 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Beste %(partner_name)s,\n"
+"\n"
+"Ondanks eerdere aanmaningen, heeft u nog steeds een openstaand saldo.\n"
+"\n"
+"Als uw betaling binnen de 8 dagen opnieuw uitblijft, zijn wij genoodzaakt de "
+"vordering definitief uit handen te geven.\n"
+"\n"
+"Wij vertrouwen erop dat u het niet zover zult laten komen. Details van hety "
+"openstaande saldo vindt u hierna.\n"
+"\n"
+"Indien u nog vragen heeft, kunt u steeds contact opnemen met onze "
+"boekhouding.\n"
+"\n"
+"Hoogachtend,\n"
 
 #. module: account_followup
 #: help:account_followup.print,partner_lang:0
@@ -1022,6 +1258,8 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Wijzig de tekst niet als u de e-mail in de taal van de relatie wilt sturen, "
+"of stel de tekst in op firma."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -1034,12 +1272,18 @@ msgid ""
 "installed\n"
 "                            using to top right icon."
 msgstr ""
+"Schrijf hier de inleiding van uw brief,\n"
+"                            in functie van het aanmaningsniveau. U kunt\n"
+"                            de volgende parameters in de tekst gebruiken. "
+"Vergeet\n"
+"                            niet all geïnstalleerde talen te vertalen via "
+"het pictogram in de rechterbovenhoek."
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: model:ir.actions.act_window,name:account_followup.action_followup_stat
 msgid "Follow-ups Sent"
-msgstr ""
+msgstr "Verstuurde aanmaningen"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -1049,34 +1293,34 @@ msgstr "Naam:"
 #. module: account_followup
 #: field:res.partner,latest_followup_level_id:0
 msgid "Latest Follow-up Level"
-msgstr ""
+msgstr "Laatste aanmaningsniveau"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move:0
 #: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
-msgstr ""
+msgstr "Eerste boeking"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Follow-up Statistics by Partner"
-msgstr ""
+msgstr "Aanmaningsstatistieken per relatie"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " letter(s) in report"
-msgstr ""
+msgstr " brieven in rapport"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Partners with Overdue Credits"
-msgstr ""
+msgstr "Klanten met openstaande facturen"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Customer Followup"
-msgstr ""
+msgstr "Aanmaningen"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -1092,42 +1336,52 @@ msgid ""
 "              </p>\n"
 "          "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u de aanmaningsniveaus wilt instellen met de "
+"daaraan gekoppelde acties.\n"
+"              </p><p>\n"
+"                Per stap kunt u de acties opgeven en ook de dagen vervallen. "
+"U kunt\n"
+"                brieven en e-mailsjablonen maken om specifieke berichten "
+"naar de klant te sturen.\n"
+"              </p>\n"
+"          "
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid "Follow-up letter of "
-msgstr ""
+msgstr "Aanmaningsbrief van "
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "The"
-msgstr ""
+msgstr "De"
 
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "Send follow-ups"
-msgstr ""
+msgstr "Aanmaningen versturen"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "Totaal credit"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgorde"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Follow-ups To Do"
-msgstr ""
+msgstr "Te versturen aanmaningen"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "Klantenref.:"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -1141,26 +1395,30 @@ msgid ""
 "the reminder.  Could be negative if you want to send a polite alert "
 "beforehand."
 msgstr ""
+"Het aantal dagen dat de vervaldatum van de factuur moet zijn overschreden "
+"voordat een aanmaning wordt verstuurd. Kan negatief zijn als u vooraf een "
+"vriendelijk bericht wilt sturen."
 
 #. module: account_followup
 #: help:res.partner,latest_followup_date:0
 msgid "Latest date that the follow-up level of the partner was changed"
 msgstr ""
+"Laatste datum waarop het aanmaningsniveau van de relatie is gewijzigd."
 
 #. module: account_followup
 #: field:account_followup.print,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Testafdruk"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": User Name"
-msgstr ""
+msgstr ": Gberuikersnaam"
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "Boekhouding"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -1170,7 +1428,7 @@ msgstr "Geblokkeerd"
 #. module: account_followup
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
-msgstr ""
+msgstr "Betalingsbelofte klant"
 
 #~ msgid "All payable entries"
 #~ msgstr "Alle crediteuren"
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index f6cb2cf0412..b57c8e4315e 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-11 15:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2013-05-31 10:28+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:11+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -22,7 +22,7 @@ msgstr ""
 #: model:email.template,subject:account_followup.email_template_account_followup_level1
 #: model:email.template,subject:account_followup.email_template_account_followup_level2
 msgid "${user.company_id.name} Payment Reminder"
-msgstr ""
+msgstr "${user.company_id.name} напоминание о платеже"
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
@@ -43,12 +43,12 @@ msgstr "Дальнейшие действия"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Дата следующего действия"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "⇾ отметить как сделанное"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
@@ -94,7 +94,7 @@ msgstr "Тема эл.письма"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s"
-msgstr ""
+msgstr "%(user_signature)s"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -109,19 +109,19 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.print,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "Тело эл. письма"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
 msgid "Send Follow-Ups"
-msgstr ""
+msgstr "Послать напоминания"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 #: code:addons/account_followup/account_followup.py:263
 #, python-format
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
 #. module: account_followup
 #: help:res.partner,payment_next_action:0
@@ -133,7 +133,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "Нет ответственного"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -209,17 +209,17 @@ msgstr "Всего по дебету"
 #. module: account_followup
 #: field:res.partner,payment_next_action:0
 msgid "Next Action"
-msgstr ""
+msgstr "Следующее действие"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid ": Partner Name"
-msgstr ""
+msgstr ": Название партнера"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "Назначить ответственного"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -305,7 +305,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s"
-msgstr ""
+msgstr "%(partner_name)s"
 
 #. module: account_followup
 #: model:email.template,body_html:account_followup.email_template_account_followup_level1
@@ -377,7 +377,7 @@ msgstr "Определяет порядок вывода списка напом
 #: code:addons/account_followup/wizard/account_followup_print.py:166
 #, python-format
 msgid " will be sent"
-msgstr ""
+msgstr " будет отправлен"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -388,7 +388,7 @@ msgstr ""
 #: view:account_followup.followup.line:0
 #: field:account_followup.followup.line,send_letter:0
 msgid "Send a Letter"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -466,7 +466,7 @@ msgstr "Напечатанное сообщение"
 #: code:addons/account_followup/wizard/account_followup_print.py:155
 #, python-format
 msgid "Anybody"
-msgstr ""
+msgstr "Кто угодно"
 
 #. module: account_followup
 #: help:account_followup.followup.line,send_email:0
@@ -528,7 +528,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Поиск партнера"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
@@ -554,7 +554,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.print:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_followup
 #: view:res.partner:0
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index 9ca8d3c2332..8d120cb88ba 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -91,6 +91,5 @@ class account_followup_stat(osv.osv):
                 GROUP BY
                     l.id, l.partner_id, l.company_id, l.blocked, l.period_id
             )""")
-account_followup_stat()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml
index 6fee6a77ac1..b7c38e89f5e 100644
--- a/addons/account_followup/report/account_followup_report.xml
+++ b/addons/account_followup/report/account_followup_report.xml
@@ -6,7 +6,7 @@
             <field name="name">account_followup.stat.tree</field>
             <field name="model">account_followup.stat</field>
             <field name="arch" type="xml">
-                <tree string="Follow-up lines">
+                <tree string="Follow-up lines" create="false">
                     <field name="partner_id"/>
                     <field name="date_move"/>
                     <field name="date_move_last"/>
diff --git a/addons/account_followup/security/account_followup_security.xml b/addons/account_followup/security/account_followup_security.xml
index 1586403d701..69c9a44a1b9 100644
--- a/addons/account_followup/security/account_followup_security.xml
+++ b/addons/account_followup/security/account_followup_security.xml
@@ -4,7 +4,7 @@
 
     <record id="account_followup_comp_rule" model="ir.rule">
         <field name="name">Account Follow-up multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_followup_followup"/>
+        <field name="model_id" ref="model_account_followup_followup"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 37b4300b03f..c14b5c071f6 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -72,7 +72,6 @@ class account_followup_stat_by_partner(osv.osv):
                     GROUP BY
                     l.partner_id, l.company_id
             )""") #Blocked is to take into account litigation
-account_followup_stat_by_partner()
 
 
 class account_followup_sending_results(osv.osv_memory):
@@ -106,7 +105,6 @@ class account_followup_sending_results(osv.osv_memory):
         'description':_get_description,
     }
  
-account_followup_sending_results()
 
 
 class account_followup_print(osv.osv_memory):
@@ -315,6 +313,5 @@ class account_followup_print(osv.osv_memory):
                 to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': stat_line_id}
         return {'partner_ids': partner_list, 'to_update': to_update}
 
-account_followup_print()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index bcce77a54ce..8fa98780c83 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -42,6 +42,5 @@ class Invoice(osv.osv):
                 raise osv.except_osv(_('Error!'), _("You cannot cancel an invoice which has already been imported in a payment order. Remove it from the following payment order : %s."%(payment_order_name)))
         return super(Invoice, self).action_cancel(cr, uid, ids, context=context)
 
-Invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index c601d9e8da3..266876db95f 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -57,6 +57,5 @@ class account_move_line(osv.osv):
                 raise osv.except_osv(_('Error!'), _('There is no partner defined on the entry line.'))
         return line2bank
 
-account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 2b0fe1271d2..dc001e2e2a3 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -62,7 +62,6 @@ class payment_mode(osv.osv):
         return {'value': result}
 
 
-payment_mode()
 
 class payment_order(osv.osv):
     _name = 'payment.order'
@@ -170,7 +169,6 @@ class payment_order(osv.osv):
             payment_line_obj.write(cr, uid, payment_line_ids, {'date': False}, context=context)
         return super(payment_order, self).write(cr, uid, ids, vals, context=context)
 
-payment_order()
 
 class payment_line(osv.osv):
     _name = 'payment.line'
@@ -417,6 +415,5 @@ class payment_line(osv.osv):
             res['communication2']['states']['normal'] = [('readonly', False)]
         return res
 
-payment_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index ca2315d81b1..02675baf0b2 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -253,10 +253,10 @@
             <para style="terp_default_Centre_9">[[ get_invoice_name(line.ml_inv_ref.id) or '-' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
+            <para style="terp_default_Centre_9">[[not line.date and '-' or formatLang(line.date,date=True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount or '-', currency_obj=line.company_currency) ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount or 0.0, currency_obj=line.company_currency) ]] </para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.amount_currency, currency_obj=line.currency) ]] </para>
diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml
index 4bca00eaa6d..fbe29699e86 100644
--- a/addons/account_payment/security/account_payment_security.xml
+++ b/addons/account_payment/security/account_payment_security.xml
@@ -15,21 +15,21 @@
 
     <record id="payment_mode_comp_rule" model="ir.rule">
         <field name="name">Payment Mode company rule</field>
-        <field model="ir.model" name="model_id" ref="model_payment_mode"/>
+        <field name="model_id" ref="model_payment_mode"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="payment_order_comp_rule" model="ir.rule">
         <field name="name">Payment order multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_payment_order"/>
+        <field name="model_id" ref="model_payment_order"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="payment_line_comp_rule" model="ir.rule">
         <field name="name">Payment line multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_payment_line"/>
+        <field name="model_id" ref="model_payment_line"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 4bd969726fe..03e25dfbc45 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -23,6 +23,7 @@ import time
 from lxml import etree
 
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 
 class payment_order_create(osv.osv_memory):
     """
@@ -108,7 +109,7 @@ class payment_order_create(osv.osv_memory):
         context.update({'line_ids': line_ids})
         model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'view_create_payment_order_lines')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {'name': ('Entrie Lines'),
+        return {'name': _('Entry Lines'),
                 'context': context,
                 'view_type': 'form',
                 'view_mode': 'form',
@@ -118,6 +119,5 @@ class payment_order_create(osv.osv_memory):
                 'target': 'new',
         }
 
-payment_order_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 03ff46125f5..5e2dc652068 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -54,6 +54,5 @@ class account_payment_make_payment(osv.osv_memory):
 #        id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
 #        return obj_act.read(cr, uid, [id])[0]
 
-account_payment_make_payment()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index edd47065e3a..92b1b1452f5 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -118,6 +118,5 @@ class account_payment_populate_statement(osv.osv_memory):
                 line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
         return {'type': 'ir.actions.act_window_close'}
 
-account_payment_populate_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py
index 5b344600599..3b8b2335068 100644
--- a/addons/account_sequence/account_sequence.py
+++ b/addons/account_sequence/account_sequence.py
@@ -40,7 +40,6 @@ class account_move(osv.osv):
                 self.write(cr, uid, [move.id], {'internal_sequence_number': seq_no})
         return res
 
-account_move()
 
 class account_journal(osv.osv):
     _inherit = "account.journal"
@@ -49,7 +48,6 @@ class account_journal(osv.osv):
         'internal_sequence_id': fields.many2one('ir.sequence', 'Internal Sequence', help="This sequence will be used to maintain the internal number for the journal entries related to this journal."),
     }
 
-account_journal()
 
 class account_move_line(osv.osv):
     _inherit = "account.move.line"
@@ -58,6 +56,5 @@ class account_move_line(osv.osv):
         'internal_sequence_number': fields.related('move_id','internal_sequence_number', type='char', relation='account.move', help='Internal Sequence Number', string='Internal Number'),
     }
 
-account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_sequence/account_sequence_installer.py b/addons/account_sequence/account_sequence_installer.py
index e800bbad7ee..91316a61962 100644
--- a/addons/account_sequence/account_sequence_installer.py
+++ b/addons/account_sequence/account_sequence_installer.py
@@ -79,6 +79,5 @@ class account_sequence_installer(osv.osv_memory):
         ir_values_obj.set(cr, uid, key='default', key2=False, name='internal_sequence_id', models =[('account.journal', False)], value=ir_seq)
         return res
 
-account_sequence_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index da7bb8e308d..cc60108bf20 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -24,7 +24,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
@@ -56,5 +56,4 @@ class accounting_assert_test(osv.osv):
         'sequence': 10,
     }
 
-accounting_assert_test()
 
diff --git a/addons/account_test/i18n/ru.po b/addons/account_test/i18n/ru.po
new file mode 100644
index 00000000000..d36d83d2e99
--- /dev/null
+++ b/addons/account_test/i18n/ru.po
@@ -0,0 +1,241 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-05 07:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid ""
+"Code should always set a variable named `result` with the result of your "
+"test, that can be a list or\n"
+"a dictionary. If `result` is an empty list, it means that the test was "
+"succesful. Otherwise it will\n"
+"try to translate and print what is inside `result`.\n"
+"\n"
+"If the result of your test is a dictionary, you can set a variable named "
+"`column_order` to choose in\n"
+"what order you want to print `result`'s content.\n"
+"\n"
+"Should you need them, you can also use the following variables into your "
+"code:\n"
+"    * cr: cursor to the database\n"
+"    * uid: ID of the current user\n"
+"\n"
+"In any ways, the code must be legal python statements with correct "
+"indentation (if needed).\n"
+"\n"
+"Example: \n"
+"    sql = '''SELECT id, name, ref, date\n"
+"             FROM account_move_line \n"
+"             WHERE account_id IN (SELECT id FROM account_account WHERE type "
+"= 'view')\n"
+"          '''\n"
+"    cr.execute(sql)\n"
+"    result = cr.dictfetchall()"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_02
+msgid "Test 2: Opening a fiscal year"
+msgstr "Проверка 2: Открытие фискального года"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05
+msgid ""
+"Check that reconciled invoice for Sales/Purchases has reconciled entries for "
+"Payable and Receivable Accounts"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_03
+msgid ""
+"Check if movement lines are balanced and have the same date and period"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr ""
+
+#. module: account_test
+#: report:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr "Проверка 1: Общий баланс"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06
+msgid "Check that paid/reconciled invoices are not in 'Open' state"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05_2
+msgid ""
+"Check that reconciled account moves, that define Payable and Receivable "
+"accounts, are belonging to reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Tests"
+msgstr "Проверки"
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr "Описание проверки"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06_1
+msgid "Check that there's no move for any account with « View » account type"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_08
+msgid "Test 9 : Accounts and partners on account moves"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,name:account_test.action_accounting_assert
+#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+#: model:ir.ui.menu,name:account_test.menu_action_license
+msgid "Accounting Tests"
+msgstr ""
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:74
+#, python-format
+msgid "The test was passed successfully"
+msgstr "Проверка прошла успешно"
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6 : Invoices status"
+msgstr ""
+
+#. module: account_test
+#: model:ir.model,name:account_test.model_accounting_assert_test
+msgid "accounting.assert.test"
+msgstr "accounting.assert.test"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05
+msgid ""
+"Test 5.1 : Payable and Receivable accountant lines of reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,code_exec:0
+msgid "Python code"
+msgstr "Код на Python"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_07
+msgid ""
+"Check on bank statement that the Closing Balance = Starting Balance + sum of "
+"statement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_07
+msgid "Test 8 : Closing balance on bank statements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_03
+msgid "Test 3: Movement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05_2
+msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Expression"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_02
+msgid ""
+"Check if the balance of the new opened fiscal year matches with last year's "
+"balance"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Python Code"
+msgstr "Код на Python"
+
+#. module: account_test
+#: model:ir.actions.act_window,help:account_test.action_accounting_assert
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create Accounting Test.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr "Проверяет баланс: сумма дебита = сумма кредита"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_08
+msgid "Check that general accounts and partners on account moves are active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06_1
+msgid "Test 7: « View  » account type"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code Help"
+msgstr ""
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 345c3378aa0..a043b15a518 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -67,6 +67,7 @@ This module manages:
         'test/sales_payment.yml',
         'test/account_voucher_report.yml',
         'test/case1_usd_usd.yml',
+        'test/case1_usd_usd_payment_rate.yml',
         'test/case2_usd_eur_debtor_in_eur.yml',
         'test/case2_usd_eur_debtor_in_usd.yml',
         'test/case3_eur_eur.yml',
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c6f754ed18f..81eb76ff3a8 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -26,6 +26,19 @@ from openerp.osv import fields, osv
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 from openerp.tools import float_compare
+from openerp.report import report_sxw
+
+class res_currency(osv.osv):
+    _inherit = "res.currency"
+
+    def _get_current_rate(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+        res = super(res_currency, self)._get_current_rate(cr, uid, ids, name, arg, context=context)
+        if context.get('voucher_special_currency') in ids and context.get('voucher_special_currency_rate'):
+            res[context.get('voucher_special_currency')] = context.get('voucher_special_currency_rate')
+        return res
+
 
 class res_company(osv.osv):
     _inherit = "res.company"
@@ -40,7 +53,6 @@ class res_company(osv.osv):
             domain="[('type', '=', 'other')]",),
     }
 
-res_company()
 
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
@@ -85,7 +97,7 @@ class account_voucher(osv.osv):
         if context is None: context = {}
         if context.get('period_id', False):
             return context.get('period_id')
-        periods = self.pool.get('account.period').find(cr, uid)
+        periods = self.pool.get('account.period').find(cr, uid, context=context)
         return periods and periods[0] or False
 
     def _make_journal_search(self, cr, uid, ttype, context=None):
@@ -154,7 +166,7 @@ class account_voucher(osv.osv):
             journal = journal_pool.browse(cr, uid, journal_id, context=context)
             if journal.currency:
                 return journal.currency.id
-        return False
+        return self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
 
     def _get_partner(self, cr, uid, context=None):
         if context is None: context = {}
@@ -223,26 +235,26 @@ class account_voucher(osv.osv):
     def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, type, context=None):
         context = context or {}
         if not line_dr_ids and not line_cr_ids:
-            return {'value':{}}
+            return {'value':{'writeoff_amount': 0.0}}
         line_osv = self.pool.get("account.voucher.line")
         line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
         line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
-
         #compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher
         is_multi_currency = False
-        if voucher_currency:
-            # if the voucher currency is not False, it means it is different than the company currency and we need to display the options
-            is_multi_currency = True
-        else:
-            #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to define the options
-            for voucher_line in line_dr_ids+line_cr_ids:
-                company_currency = False
-                company_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).company_id.currency_id.id
-                if voucher_line.get('currency_id', company_currency) != company_currency:
-                    is_multi_currency = True
-                    break
+        #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to see the options
+        for voucher_line in line_dr_ids+line_cr_ids:
+            line_id = voucher_line.get('id') and self.pool.get('account.voucher.line').browse(cr, uid, voucher_line['id'], context=context).move_line_id.id or voucher_line.get('move_line_id')
+            if line_id and self.pool.get('account.move.line').browse(cr, uid, line_id, context=context).currency_id:
+                is_multi_currency = True
+                break
         return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}}
 
+    def _get_journal_currency(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for voucher in self.browse(cr, uid, ids, context=context):
+            res[voucher.id] = voucher.journal_id.currency and voucher.journal_id.currency.id or voucher.company_id.currency_id.id
+        return res
+
     def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
         if not ids: return {}
         currency_obj = self.pool.get('res.currency')
@@ -259,20 +271,48 @@ class account_voucher(osv.osv):
         return res
 
     def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
-        if not ids: return {}
+        if context is None:
+            context = {}
+        res = {}
+        ctx = context.copy()
+        for v in self.browse(cr, uid, ids, context=context):
+            ctx.update({'date': v.date})
+            #make a new call to browse in order to have the right date in the context, to get the right currency rate
+            voucher = self.browse(cr, uid, v.id, context=ctx)
+            ctx.update({
+              'voucher_special_currency': voucher.payment_rate_currency_id and voucher.payment_rate_currency_id.id or False,
+              'voucher_special_currency_rate': voucher.currency_id.rate * voucher.payment_rate,})
+            res[voucher.id] =  self.pool.get('res.currency').compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, voucher.amount, context=ctx)
+        return res
+
+    def _get_currency_help_label(self, cr, uid, currency_id, payment_rate, payment_rate_currency_id, context=None):
+        """
+        This function builds a string to help the users to understand the behavior of the payment rate fields they can specify on the voucher. 
+        This string is only used to improve the usability in the voucher form view and has no other effect.
+
+        :param currency_id: the voucher currency
+        :type currency_id: integer
+        :param payment_rate: the value of the payment_rate field of the voucher
+        :type payment_rate: float
+        :param payment_rate_currency_id: the value of the payment_rate_currency_id field of the voucher
+        :type payment_rate_currency_id: integer
+        :return: translated string giving a tip on what's the effect of the current payment rate specified
+        :rtype: str
+        """
+        rml_parser = report_sxw.rml_parse(cr, uid, 'currency_help_label', context=context)
+        currency_pool = self.pool.get('res.currency')
+        currency_str = payment_rate_str = ''
+        if currency_id:
+            currency_str = rml_parser.formatLang(1, currency_obj=currency_pool.browse(cr, uid, currency_id, context=context))
+        if payment_rate_currency_id:
+            payment_rate_str  = rml_parser.formatLang(payment_rate, currency_obj=currency_pool.browse(cr, uid, payment_rate_currency_id, context=context))
+        currency_help_label = _('At the operation date, the exchange rate was\n%s = %s') % (currency_str, payment_rate_str)
+        return currency_help_label
+
+    def _fnct_currency_help_label(self, cr, uid, ids, name, args, context=None):
         res = {}
-        rate = 1.0
         for voucher in self.browse(cr, uid, ids, context=context):
-            if voucher.currency_id:
-                if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id:
-                    rate =  1 / voucher.payment_rate
-                else:
-                    ctx = context.copy()
-                    ctx.update({'date': voucher.date})
-                    voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate
-                    company_currency_rate = voucher.company_id.currency_id.rate
-                    rate = voucher_rate * company_currency_rate
-            res[voucher.id] =  voucher.amount / rate
+            res[voucher.id] = self._get_currency_help_label(cr, uid, voucher.currency_id.id, voucher.payment_rate, voucher.payment_rate_currency_id.id, context=context)
         return res
 
     _name = 'account.voucher'
@@ -305,8 +345,7 @@ class account_voucher(osv.osv):
             domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
         'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
-#        'currency_id':fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', readonly=True),
+        'currency_id': fields.function(_get_journal_currency, type='many2one', relation='res.currency', string='Currency', readonly=True, required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state':fields.selection(
             [('draft','Draft'),
@@ -347,6 +386,7 @@ class account_voucher(osv.osv):
             help='The specific rate that will be used, in this voucher, between the selected currency (in \'Payment Rate Currency\' field)  and the voucher currency.'),
         'paid_amount_in_company_currency': fields.function(_paid_amount_in_company_currency, string='Paid Amount in Company Currency', type='float', readonly=True),
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
+        'currency_help_label': fields.function(_fnct_currency_help_label, type='text', string="Helping Sentence", help="This sentence helps you to know how to specify the payment rate by giving you the direct effect it has"), 
     }
     _defaults = {
         'active': True,
@@ -423,6 +463,8 @@ class account_voucher(osv.osv):
         partner_pool = self.pool.get('res.partner')
         position_pool = self.pool.get('account.fiscal.position')
         line_pool = self.pool.get('account.voucher.line')
+        if not line_ids:
+            line_ids = []
         res = {
             'tax_amount': False,
             'amount': False,
@@ -517,23 +559,26 @@ class account_voucher(osv.osv):
         return default
 
     def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
-        res =  {'value': {'paid_amount_in_company_currency': amount}}
-        company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
-        if rate and amount and currency_id:# and currency_id == payment_rate_currency_id:
-            voucher_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context).rate
-            if company_currency.id == payment_rate_currency_id:
-                company_rate = rate
-            else:
-                company_rate = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.rate
-            res['value']['paid_amount_in_company_currency'] = amount / voucher_rate * company_rate
+        res =  {'value': {'paid_amount_in_company_currency': amount, 'currency_help_label': self._get_currency_help_label(cr, uid, currency_id, rate, payment_rate_currency_id, context=context)}}
+        if rate and amount and currency_id:
+            company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
+            #context should contain the date, the payment currency and the payment rate specified on the voucher
+            amount_in_company_currency = self.pool.get('res.currency').compute(cr, uid, currency_id, company_currency.id, amount, context=context)
+            res['value']['paid_amount_in_company_currency'] = amount_in_company_currency
         return res
 
     def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
         if context is None:
             context = {}
-        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
         ctx = context.copy()
         ctx.update({'date': date})
+        #read the voucher rate with the right date in the context
+        currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
+        voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+        ctx.update({
+            'voucher_special_currency': payment_rate_currency_id,
+            'voucher_special_currency_rate': rate * voucher_rate})
+        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=ctx)
         vals = self.onchange_rate(cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
         for key in vals.keys():
             res[key].update(vals[key])
@@ -547,6 +592,7 @@ class account_voucher(osv.osv):
         journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
         company_id = journal.company_id.id
         payment_rate = 1.0
+        currency_id = currency_id or journal.company_id.currency_id.id
         payment_rate_currency_id = currency_id
         ctx = context.copy()
         ctx.update({'date': date})
@@ -562,24 +608,62 @@ class account_voucher(osv.osv):
                     # is not in the voucher currency
                     payment_rate_currency_id = voucher_line['currency_id']
                     tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
-                    voucher_currency_id = currency_id or journal.company_id.currency_id.id
-                    payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
+                    payment_rate = tmp / currency_obj.browse(cr, uid, currency_id, context=ctx).rate
                     break
+        vals['value'].update({
+            'payment_rate': payment_rate,
+            'currency_id': currency_id,
+            'payment_rate_currency_id': payment_rate_currency_id
+        })
+        #read the voucher rate with the right date in the context
+        voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+        ctx.update({
+            'voucher_special_currency_rate': payment_rate * voucher_rate,
+            'voucher_special_currency': payment_rate_currency_id})
         res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
         for key in res.keys():
             vals[key].update(res[key])
-        vals['value'].update({'payment_rate': payment_rate})
-        if payment_rate_currency_id:
-            vals['value'].update({'payment_rate_currency_id': payment_rate_currency_id})
         return vals
 
+    def basic_onchange_partner(self, cr, uid, ids, partner_id, journal_id, ttype, context=None):
+        partner_pool = self.pool.get('res.partner')
+        journal_pool = self.pool.get('account.journal')
+        res = {'value': {'account_id': False}}
+        if not partner_id or not journal_id:
+            return res
+
+        journal = journal_pool.browse(cr, uid, journal_id, context=context)
+        partner = partner_pool.browse(cr, uid, partner_id, context=context)
+        account_id = False
+        if journal.type in ('sale','sale_refund'):
+            account_id = partner.property_account_receivable.id
+        elif journal.type in ('purchase', 'purchase_refund','expense'):
+            account_id = partner.property_account_payable.id
+        else:
+            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
+
+        res['value']['account_id'] = account_id
+        return res
+
     def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
         if not journal_id:
             return {}
-        res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
-        vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
+        if context is None:
+            context = {}
+        #TODO: comment me and use me directly in the sales/purchases views
+        res = self.basic_onchange_partner(cr, uid, ids, partner_id, journal_id, ttype, context=context)
+        if ttype in ['sale', 'purchase']:
+            return res
+        ctx = context.copy()
+        # not passing the payment_rate currency and the payment_rate in the context but it's ok because they are reset in recompute_payment_rate
+        ctx.update({'date': date})
+        vals = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=ctx)
+        vals2 = self.recompute_payment_rate(cr, uid, ids, vals, currency_id, date, ttype, journal_id, amount, context=context)
         for key in vals.keys():
             res[key].update(vals[key])
+        for key in vals2.keys():
+            res[key].update(vals2[key])
+        #TODO: can probably be removed now
         #TODO: onchange_partner_id() should not returns [pre_line, line_dr_ids, payment_rate...] for type sale, and not 
         # [pre_line, line_cr_ids, payment_rate...] for type purchase.
         # We should definitively split account.voucher object in two and make distinct on_change functions. In the 
@@ -622,8 +706,6 @@ class account_voucher(osv.osv):
         if context is None:
             context = {}
         context_multi_currency = context.copy()
-        if date:
-            context_multi_currency.update({'date': date})
 
         currency_pool = self.pool.get('res.currency')
         move_line_pool = self.pool.get('account.move.line')
@@ -647,18 +729,6 @@ class account_voucher(osv.osv):
         journal = journal_pool.browse(cr, uid, journal_id, context=context)
         partner = partner_pool.browse(cr, uid, partner_id, context=context)
         currency_id = currency_id or journal.company_id.currency_id.id
-        account_id = False
-        if journal.type in ('sale','sale_refund'):
-            account_id = partner.property_account_receivable.id
-        elif journal.type in ('purchase', 'purchase_refund','expense'):
-            account_id = partner.property_account_payable.id
-        else:
-            account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
-
-        default['value']['account_id'] = account_id
-
-        if journal.type not in ('cash', 'bank'):
-            return default
 
         total_credit = 0.0
         total_debit = 0.0
@@ -716,12 +786,13 @@ class account_voucher(osv.osv):
             if _remove_noise_in_o2m():
                 continue
 
-            if line.currency_id and currency_id==line.currency_id.id:
+            if line.currency_id and currency_id == line.currency_id.id:
                 amount_original = abs(line.amount_currency)
                 amount_unreconciled = abs(line.amount_residual_currency)
             else:
-                amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
-                amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
+                #always use the amount booked in the company currency as the basis of the conversion into the voucher currency
+                amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0, context=context_multi_currency)
+                amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual), context=context_multi_currency)
             line_currency_id = line.currency_id and line.currency_id.id or company_currency
             rs = {
                 'name':line.move_id.name,
@@ -767,10 +838,15 @@ class account_voucher(osv.osv):
         if context is None:
             context = {}
         res = {'value': {}}
-        #set the default payment rate of the voucher and compute the paid amount in company currency
-        if currency_id and currency_id == payment_rate_currency_id:
+        if currency_id:
+            #set the default payment rate of the voucher and compute the paid amount in company currency
             ctx = context.copy()
             ctx.update({'date': date})
+            #read the voucher rate with the right date in the context
+            voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+            ctx.update({
+                'voucher_special_currency_rate': payment_rate * voucher_rate, 
+                'voucher_special_currency': payment_rate_currency_id})
             vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
             for key in vals.keys():
                 res[key].update(vals[key])
@@ -790,7 +866,8 @@ class account_voucher(osv.osv):
         period_pool = self.pool.get('account.period')
         currency_obj = self.pool.get('res.currency')
         ctx = context.copy()
-        ctx.update({'company_id': company_id})
+        ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
+        voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
         pids = period_pool.find(cr, uid, date, context=ctx)
         if pids:
             res['value'].update({'period_id':pids[0]})
@@ -799,9 +876,8 @@ class account_voucher(osv.osv):
             payment_rate = 1.0
             if payment_rate_currency_id != currency_id:
                 tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
-                voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
                 payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
-            vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
+            vals = self.onchange_payment_rate_currency(cr, uid, ids, voucher_currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
             vals['value'].update({'payment_rate': payment_rate})
             for key in vals.keys():
                 res[key].update(vals[key])
@@ -824,7 +900,15 @@ class account_voucher(osv.osv):
         currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
+        else:
+            currency_id = journal.company_id.currency_id.id
         vals['value'].update({'currency_id': currency_id})
+        #in case we want to register the payment directly from an invoice, it's confusing to allow to switch the journal 
+        #without seeing that the amount is expressed in the journal currency, and not in the invoice currency. So to avoid
+        #this common mistake, we simply reset the amount to 0 if the currency is not the invoice currency.
+        if context.get('payment_expected_currency') and currency_id != context.get('payment_expected_currency'):
+            vals['value']['amount'] = 0
+            amount = 0
         res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
         for key in res.keys():
             vals[key].update(res[key])
@@ -906,8 +990,8 @@ class account_voucher(osv.osv):
         current_currency = self._get_current_currency(cr, uid, voucher_id, context)
         if current_currency <> company_currency:
             context_multi_currency = context.copy()
-            voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
-            context_multi_currency.update({'date': voucher_brw.date})
+            voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+            context_multi_currency.update({'date': voucher.date})
             return context_multi_currency
         return context
 
@@ -922,33 +1006,33 @@ class account_voucher(osv.osv):
         :return: mapping between fieldname and value of account move line to create
         :rtype: dict
         '''
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
         debit = credit = 0.0
         # TODO: is there any other alternative then the voucher type ??
         # ANSWER: We can have payment and receipt "In Advance".
         # TODO: Make this logic available.
         # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
-        if voucher_brw.type in ('purchase', 'payment'):
-            credit = voucher_brw.paid_amount_in_company_currency
-        elif voucher_brw.type in ('sale', 'receipt'):
-            debit = voucher_brw.paid_amount_in_company_currency
+        if voucher.type in ('purchase', 'payment'):
+            credit = voucher.paid_amount_in_company_currency
+        elif voucher.type in ('sale', 'receipt'):
+            debit = voucher.paid_amount_in_company_currency
         if debit < 0: credit = -debit; debit = 0.0
         if credit < 0: debit = -credit; credit = 0.0
         sign = debit - credit < 0 and -1 or 1
         #set the first line of the voucher
         move_line = {
-                'name': voucher_brw.name or '/',
+                'name': voucher.name or '/',
                 'debit': debit,
                 'credit': credit,
-                'account_id': voucher_brw.account_id.id,
+                'account_id': voucher.account_id.id,
                 'move_id': move_id,
-                'journal_id': voucher_brw.journal_id.id,
-                'period_id': voucher_brw.period_id.id,
-                'partner_id': voucher_brw.partner_id.id,
+                'journal_id': voucher.journal_id.id,
+                'period_id': voucher.period_id.id,
+                'partner_id': voucher.partner_id.id,
                 'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and sign * voucher_brw.amount or 0.0,
-                'date': voucher_brw.date,
-                'date_maturity': voucher_brw.date_due
+                'amount_currency': company_currency <> current_currency and sign * voucher.amount or 0.0,
+                'date': voucher.date,
+                'date_maturity': voucher.date_due
             }
         return move_line
 
@@ -961,31 +1045,31 @@ class account_voucher(osv.osv):
         :rtype: dict
         '''
         seq_obj = self.pool.get('ir.sequence')
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
-        if voucher_brw.number:
-            name = voucher_brw.number
-        elif voucher_brw.journal_id.sequence_id:
-            if not voucher_brw.journal_id.sequence_id.active:
+        voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        if voucher.number:
+            name = voucher.number
+        elif voucher.journal_id.sequence_id:
+            if not voucher.journal_id.sequence_id.active:
                 raise osv.except_osv(_('Configuration Error !'),
                     _('Please activate the sequence of selected journal !'))
             c = dict(context)
-            c.update({'fiscalyear_id': voucher_brw.period_id.fiscalyear_id.id})
-            name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=c)
+            c.update({'fiscalyear_id': voucher.period_id.fiscalyear_id.id})
+            name = seq_obj.next_by_id(cr, uid, voucher.journal_id.sequence_id.id, context=c)
         else:
             raise osv.except_osv(_('Error!'),
                         _('Please define a sequence on the journal.'))
-        if not voucher_brw.reference:
+        if not voucher.reference:
             ref = name.replace('/','')
         else:
-            ref = voucher_brw.reference
+            ref = voucher.reference
 
         move = {
             'name': name,
-            'journal_id': voucher_brw.journal_id.id,
-            'narration': voucher_brw.narration,
-            'date': voucher_brw.date,
+            'journal_id': voucher.journal_id.id,
+            'narration': voucher.narration,
+            'date': voucher.date,
             'ref': ref,
-            'period_id': voucher_brw.period_id.id,
+            'period_id': voucher.period_id.id,
         }
         return move
 
@@ -1012,7 +1096,10 @@ class account_voucher(osv.osv):
                 raise osv.except_osv(_('Insufficient Configuration!'),_("You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
         # Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
         # the receivable/payable account may have a secondary currency, which render this field mandatory
-        account_currency_id = company_currency <> current_currency and current_currency or False
+        if line.account_id.currency_id:
+            account_currency_id = line.account_id.currency_id.id
+        else:
+            account_currency_id = company_currency <> current_currency and current_currency or False
         move_line = {
             'journal_id': line.voucher_id.journal_id.id,
             'period_id': line.voucher_id.period_id.id,
@@ -1055,16 +1142,11 @@ class account_voucher(osv.osv):
         :return: the amount in the currency of the voucher's company
         :rtype: float
         '''
+        if context is None:
+            context = {}
         currency_obj = self.pool.get('res.currency')
         voucher = self.browse(cr, uid, voucher_id, context=context)
-        res = amount
-        if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id:
-            # the rate specified on the voucher is for the company currency
-            res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount * voucher.payment_rate))
-        else:
-            # the rate specified on the voucher is not relevant, we use all the rates in the system
-            res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
-        return res
+        return currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
 
     def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
         '''
@@ -1088,39 +1170,45 @@ class account_voucher(osv.osv):
         tot_line = line_total
         rec_lst_ids = []
 
-        voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+        date = self.read(cr, uid, voucher_id, ['date'], context=context)['date']
         ctx = context.copy()
-        ctx.update({'date': voucher_brw.date})
+        ctx.update({'date': date})
+        voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context=ctx)
+        voucher_currency = voucher.journal_id.currency or voucher.company_id.currency_id
+        ctx.update({
+            'voucher_special_currency_rate': voucher_currency.rate * voucher.payment_rate ,
+            'voucher_special_currency': voucher.payment_rate_currency_id and voucher.payment_rate_currency_id.id or False,})
         prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-        for line in voucher_brw.line_ids:
+        for line in voucher.line_ids:
             #create one move line per voucher line where amount is not 0.0
             # AND (second part of the clause) only if the original move line was not having debit = credit = 0 (which is a legal value)
             if not line.amount and not (line.move_line_id and not float_compare(line.move_line_id.debit, line.move_line_id.credit, precision_rounding=prec) and not float_compare(line.move_line_id.debit, 0.0, precision_rounding=prec)):
                 continue
             # convert the amount set on the voucher line into the currency of the voucher's company
-            amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher_brw.id, context=ctx)
+            # this calls res_curreny.compute() with the right context, so that it will take either the rate on the voucher if it is relevant or will use the default behaviour
+            amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher.id, context=ctx)
             # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
             # currency rate difference
             if line.amount == line.amount_unreconciled:
                 if not line.move_line_id:
                     raise osv.except_osv(_('Wrong voucher line'),_("The invoice you are willing to pay is not valid anymore."))
-                sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+                sign = voucher.type in ('payment', 'purchase') and -1 or 1
                 currency_rate_difference = sign * (line.move_line_id.amount_residual - amount)
             else:
                 currency_rate_difference = 0.0
             move_line = {
-                'journal_id': voucher_brw.journal_id.id,
-                'period_id': voucher_brw.period_id.id,
+                'journal_id': voucher.journal_id.id,
+                'period_id': voucher.period_id.id,
                 'name': line.name or '/',
                 'account_id': line.account_id.id,
                 'move_id': move_id,
-                'partner_id': voucher_brw.partner_id.id,
+                'partner_id': voucher.partner_id.id,
                 'currency_id': line.move_line_id and (company_currency <> line.move_line_id.currency_id.id and line.move_line_id.currency_id.id) or False,
                 'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
                 'quantity': 1,
                 'credit': 0.0,
                 'debit': 0.0,
-                'date': voucher_brw.date
+                'date': voucher.date
             }
             if amount < 0:
                 amount = -amount
@@ -1136,9 +1224,9 @@ class account_voucher(osv.osv):
                 tot_line -= amount
                 move_line['credit'] = amount
 
-            if voucher_brw.tax_id and voucher_brw.type in ('sale', 'purchase'):
+            if voucher.tax_id and voucher.type in ('sale', 'purchase'):
                 move_line.update({
-                    'account_tax_id': voucher_brw.tax_id.id,
+                    'account_tax_id': voucher.tax_id.id,
                 })
 
             if move_line.get('account_tax_id', False):
@@ -1150,7 +1238,6 @@ class account_voucher(osv.osv):
             foreign_currency_diff = 0.0
             amount_currency = False
             if line.move_line_id:
-                voucher_currency = voucher_brw.currency_id and voucher_brw.currency_id.id or voucher_brw.journal_id.company_id.currency_id.id
                 # We want to set it on the account move line as soon as the original line had a foreign currency
                 if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
                     # we compute the amount in that foreign currency.
@@ -1158,22 +1245,19 @@ class account_voucher(osv.osv):
                         # if the voucher and the voucher line share the same currency, there is no computation to do
                         sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
                         amount_currency = sign * (line.amount)
-                    elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
-                        # if the rate is specified on the voucher, we must use it
-                        voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
-                        amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate * voucher_rate
                     else:
-                        # otherwise we use the rates of the system (giving the voucher date in the context)
+                        # if the rate is specified on the voucher, it will be used thanks to the special keys in the context
+                        # otherwise we use the rates of the system
                         amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
-                if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
-                    sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+                if line.amount == line.amount_unreconciled:
+                    sign = voucher.type in ('payment', 'purchase') and -1 or 1
                     foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency
 
             move_line['amount_currency'] = amount_currency
             voucher_line = move_line_obj.create(cr, uid, move_line)
             rec_ids = [voucher_line, line.move_line_id.id]
 
-            if not currency_obj.is_zero(cr, uid, voucher_brw.company_id.currency_id, currency_rate_difference):
+            if not currency_obj.is_zero(cr, uid, voucher.company_id.currency_id, currency_rate_difference):
                 # Change difference entry in company currency
                 exch_lines = self._get_exchange_lines(cr, uid, line, move_id, currency_rate_difference, company_currency, current_currency, context=context)
                 new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
@@ -1220,32 +1304,32 @@ class account_voucher(osv.osv):
         currency_obj = self.pool.get('res.currency')
         move_line = {}
 
-        voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
-        current_currency_obj = voucher_brw.currency_id or voucher_brw.journal_id.company_id.currency_id
+        voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+        current_currency_obj = voucher.currency_id or voucher.journal_id.company_id.currency_id
 
         if not currency_obj.is_zero(cr, uid, current_currency_obj, line_total):
             diff = line_total
             account_id = False
             write_off_name = ''
-            if voucher_brw.payment_option == 'with_writeoff':
-                account_id = voucher_brw.writeoff_acc_id.id
-                write_off_name = voucher_brw.comment
-            elif voucher_brw.type in ('sale', 'receipt'):
-                account_id = voucher_brw.partner_id.property_account_receivable.id
+            if voucher.payment_option == 'with_writeoff':
+                account_id = voucher.writeoff_acc_id.id
+                write_off_name = voucher.comment
+            elif voucher.type in ('sale', 'receipt'):
+                account_id = voucher.partner_id.property_account_receivable.id
             else:
-                account_id = voucher_brw.partner_id.property_account_payable.id
-            sign = voucher_brw.type == 'payment' and -1 or 1
+                account_id = voucher.partner_id.property_account_payable.id
+            sign = voucher.type == 'payment' and -1 or 1
             move_line = {
                 'name': write_off_name or name,
                 'account_id': account_id,
                 'move_id': move_id,
-                'partner_id': voucher_brw.partner_id.id,
-                'date': voucher_brw.date,
+                'partner_id': voucher.partner_id.id,
+                'date': voucher.date,
                 'credit': diff > 0 and diff or 0.0,
                 'debit': diff < 0 and -diff or 0.0,
-                'amount_currency': company_currency <> current_currency and (sign * -1 * voucher_brw.writeoff_amount) or False,
+                'amount_currency': company_currency <> current_currency and (sign * -1 * voucher.writeoff_amount) or False,
                 'currency_id': company_currency <> current_currency and current_currency or False,
-                'analytic_account_id': voucher_brw.analytic_id and voucher_brw.analytic_id.id or False,
+                'analytic_account_id': voucher.analytic_id and voucher.analytic_id.id or False,
             }
 
         return move_line
@@ -1346,13 +1430,17 @@ class account_voucher_line(osv.osv):
     _order = "move_line_id"
 
     # If the payment is in the same currency than the invoice, we keep the same amount
-    # Otherwise, we compute from company currency to payment currency
+    # Otherwise, we compute from invoice currency to payment currency
     def _compute_balance(self, cr, uid, ids, name, args, context=None):
         currency_pool = self.pool.get('res.currency')
         rs_data = {}
         for line in self.browse(cr, uid, ids, context=context):
             ctx = context.copy()
             ctx.update({'date': line.voucher_id.date})
+            voucher_rate = self.pool.get('res.currency').read(cr, uid, line.voucher_id.currency_id.id, ['rate'], context=ctx)['rate']
+            ctx.update({
+                'voucher_special_currency': line.voucher_id.payment_rate_currency_id and line.voucher_id.payment_rate_currency_id.id or False,
+                'voucher_special_currency_rate': line.voucher_id.payment_rate * voucher_rate})
             res = {}
             company_currency = line.voucher_id.journal_id.company_id.currency_id.id
             voucher_currency = line.voucher_id.currency_id and line.voucher_id.currency_id.id or company_currency
@@ -1362,13 +1450,11 @@ class account_voucher_line(osv.osv):
                 res['amount_original'] = 0.0
                 res['amount_unreconciled'] = 0.0
             elif move_line.currency_id and voucher_currency==move_line.currency_id.id:
-                res['amount_original'] = currency_pool.compute(cr, uid, move_line.currency_id.id, voucher_currency, abs(move_line.amount_currency), context=ctx)
-                res['amount_unreconciled'] = currency_pool.compute(cr, uid, move_line.currency_id and move_line.currency_id.id or company_currency, voucher_currency, abs(move_line.amount_residual_currency), context=ctx)
-            elif move_line and move_line.credit > 0:
-                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit, context=ctx)
-                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
+                res['amount_original'] = abs(move_line.amount_currency)
+                res['amount_unreconciled'] = abs(move_line.amount_residual_currency)
             else:
-                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit, context=ctx)
+                #always use the amount booked in the company currency as the basis of the conversion into the voucher currency
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit or move_line.debit or 0.0, context=ctx)
                 res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
 
             rs_data[line.id] = res
@@ -1488,7 +1574,6 @@ class account_voucher_line(osv.osv):
             'type':ttype
         })
         return values
-account_voucher_line()
 
 class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
@@ -1537,10 +1622,9 @@ class account_bank_statement(osv.osv):
         for bk_st in self.browse(cr, uid, ids, context=context):
             if vals.get('journal_id') and bk_st.line_ids:
                 if any([x.voucher_id and True or False for x in bk_st.line_ids]):
-                    raise osv.except_osv(_('Unable to change journal !'), _('You can not change the journal as you already reconciled some statement lines!'))
+                    raise osv.except_osv(_('Unable to Change Journal!'), _('You can not change the journal as you already reconciled some statement lines!'))
         return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
 
-account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
@@ -1594,7 +1678,6 @@ class account_bank_statement_line(osv.osv):
         voucher_obj.unlink(cr, uid, unlink_ids, context=context)
         return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
 
-account_bank_statement_line()
 
 def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
     results = []
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index f429480f656..4674d62b6a0 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -129,7 +129,7 @@
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                     <separator/>
                     <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted'), ('audit','=',False)]" help="To Review"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" />
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/account_voucher/html/account_illu_01.png b/addons/account_voucher/html/account_illu_01.png
new file mode 100644
index 00000000000..2e0dbf4aac2
Binary files /dev/null and b/addons/account_voucher/html/account_illu_01.png differ
diff --git a/addons/account_voucher/html/account_sc_00.png b/addons/account_voucher/html/account_sc_00.png
new file mode 100644
index 00000000000..63332b46575
Binary files /dev/null and b/addons/account_voucher/html/account_sc_00.png differ
diff --git a/addons/account_voucher/html/account_sc_02.png b/addons/account_voucher/html/account_sc_02.png
new file mode 100644
index 00000000000..709e444ba0d
Binary files /dev/null and b/addons/account_voucher/html/account_sc_02.png differ
diff --git a/addons/account_voucher/html/account_sc_03.png b/addons/account_voucher/html/account_sc_03.png
new file mode 100644
index 00000000000..a3e3afc34c0
Binary files /dev/null and b/addons/account_voucher/html/account_sc_03.png differ
diff --git a/addons/account_voucher/html/account_sc_04.png b/addons/account_voucher/html/account_sc_04.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/account_voucher/html/account_sc_04.png differ
diff --git a/addons/account_voucher/html/account_sc_06.png b/addons/account_voucher/html/account_sc_06.png
new file mode 100644
index 00000000000..9605506c6a5
Binary files /dev/null and b/addons/account_voucher/html/account_sc_06.png differ
diff --git a/addons/account_voucher/html/bazile.png b/addons/account_voucher/html/bazile.png
new file mode 100644
index 00000000000..30f37e70b4a
Binary files /dev/null and b/addons/account_voucher/html/bazile.png differ
diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html
new file mode 100644
index 00000000000..d59c110dde5
--- /dev/null
+++ b/addons/account_voucher/html/index.html
@@ -0,0 +1,140 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Invoicing Made Easy</h2>
+        <h3 class="oe_slogan">Send professional invoices &amp; get paid online</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=account">
+                    <img src="account_sc_00.png" alt="Online Demo">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Create and send professional looking invoices &amp; get paid
+                online. It automatically integrates with other apps to bill
+                automatically based on your activities.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <h2 class="oe_slogan">Send Invoices With No Effort</h2>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Send invoices directly to your clients in just a click. The
+                invoice is automatically attached to the email as a PDF file.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_03.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <h2 class="oe_slogan">Get Paid Faster</h2>
+    <h3 class="oe_slogan">Electronic invoicing and automated follow-ups</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_02.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get paid online with paypal or other payment processing service. Get rid of
+the stress of having to constantly remind your debtors. Simply set-up and
+automate follow-ups to get paid quickly.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Connect Your Bank Accounts</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Import your bank statements and reconcile them in just a few clicks. Prepare
+payment orders based on your supplier invoices and payment terms.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture" src="account_illu_01.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Analyse Your Sales &amp; Costs</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_06.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get direct access to key information with dynamic and customizable dashboards.
+Analyse your invoicing by product, customer, salesperson, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Integration With Other Apps</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Bill automatically based on sales orders, delivery orders, contracts or on time and
+material. Define recurrencies to produce recurring invoice automatically.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_04.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP allowed us to automate sending 10.000 invoices per month.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="bazile.png">
+                    <div class="oe_author">Yves Morel</div>
+                    <div class="oe_job">Director of <a href="http://www.bazile.fr" target="_blank">Bazile Telecom</a>.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We have found invoicing module of OpenERP to be user
+                    friendly and highly customizable.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="testimonial_sunil.jpg">
+                    <div class="oe_author">Col. Sunil Prem.</div>
+                    <div class="oe_job">Director of <a href="http://www.navyuginfo.com" target="_blank">Navyug Infosolutions Pvt. Ltd</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/account_voucher/html/testimonial_sunil.jpg b/addons/account_voucher/html/testimonial_sunil.jpg
new file mode 100644
index 00000000000..f2ad6929a2b
Binary files /dev/null and b/addons/account_voucher/html/testimonial_sunil.jpg differ
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index 0cdc8cd8399..a58e655aec6 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-19 18:04+0000\n"
+"PO-Revision-Date: 2013-04-26 16:01+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:33+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 "Language: nl\n"
 
 #. module: account_voucher
@@ -138,6 +138,8 @@ msgid ""
 "You can not change the journal as you already reconciled some statement "
 "lines!"
 msgstr ""
+"U kunt het journaal niet veranderen, omdat er al uittreksellijnen zijn "
+"afgepunt."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -148,7 +150,7 @@ msgstr "Goedkeuren"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr ""
+msgstr "Leveranciersbetalingen"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -223,7 +225,7 @@ msgstr "Berichten"
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipts"
-msgstr ""
+msgstr "Aankoopbewijzen"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -431,7 +433,7 @@ msgstr "Debet"
 #: code:addons/account_voucher/account_voucher.py:1547
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Het dagboek kan niet worden gewijzigd"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -745,7 +747,7 @@ msgstr "Augustus"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "Betaling bevestigen"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
@@ -786,7 +788,7 @@ msgstr "Betaald"
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipts"
-msgstr ""
+msgstr "Verkoopbewijzen"
 
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
@@ -834,7 +836,7 @@ msgstr "Onmiddellijk betalen"
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Dr/Cr"
-msgstr ""
+msgstr "Db/Cr"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
@@ -845,7 +847,7 @@ msgstr "Vorige betalingen?"
 #: code:addons/account_voucher/account_voucher.py:1112
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "De factuur die u wilt betalen, is niet meer geldig."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -884,7 +886,7 @@ msgstr "Gelieve een reeks in te stellen voor het journaal."
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "Klantenbetalingen"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
@@ -938,7 +940,7 @@ msgstr "Nummer"
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Credit"
-msgstr ""
+msgstr "Credit"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
@@ -1279,7 +1281,7 @@ msgstr "Openstaand saldo"
 #. module: account_voucher
 #: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
 msgid "Status <b>changed</b>"
-msgstr ""
+msgstr "Status <b>vgewijzigd</b>"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1014
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 63cad344ed0..ef38a07e478 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 17:46+0000\n"
+"PO-Revision-Date: 2013-05-29 13:17+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:33+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-30 05:45+0000\n"
+"X-Generator: Launchpad (build 16652)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Сверка"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:369
@@ -45,7 +45,7 @@ msgstr "Общая сумма"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Открыть записи журнала по заказчику"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -63,7 +63,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "(Обновить)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -90,7 +90,7 @@ msgstr "Март"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -115,13 +115,13 @@ msgstr "Номер транзакции."
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Группировать по году в дате счета"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -135,6 +135,8 @@ msgid ""
 "You can not change the journal as you already reconciled some statement "
 "lines!"
 msgstr ""
+"Вы не можете изменить журнал, так как вы уже сверили некоторые позиции "
+"документа!"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -145,7 +147,7 @@ msgstr "Утвердить"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr ""
+msgstr "Оплаты поставщикам"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -167,7 +169,7 @@ msgstr "Искать ваучеры"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "Корреспондирующий счет"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -189,7 +191,7 @@ msgstr "OK"
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "Полная сверка"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0
@@ -207,7 +209,7 @@ msgstr "Примечания"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
@@ -225,7 +227,7 @@ msgstr "Элемент журнала"
 #: code:addons/account_voucher/account_voucher.py:981
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -235,7 +237,7 @@ msgstr "Суммма"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "Варианты оплаты"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -254,6 +256,8 @@ msgstr "Отменено"
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
+"Вы должны настроить код базового счета и код налогового счета для налога "
+"'%s'!"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -271,7 +275,7 @@ msgstr ""
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -294,12 +298,12 @@ msgstr "Налог"
 #: code:addons/account_voucher/account_voucher.py:879
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "Корреспондирующий коментарий"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -312,6 +316,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -326,7 +332,7 @@ msgstr "Информация о платеже"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(обновить)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -395,7 +401,7 @@ msgstr "Ваучер поставщика"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -406,7 +412,7 @@ msgstr "Дебет"
 #: code:addons/account_voucher/account_voucher.py:1547
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Невозможно изменить журнал!"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -446,7 +452,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Открыть журнал проводок по поставщику"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
@@ -461,7 +467,7 @@ msgstr "Памятка"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "Вы уверены, что надо отменить сверку и саму запись ?"
 
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
@@ -494,13 +500,13 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "Сумма разницы"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Средн. задержка"
 
 #. module: account_voucher
 #: code:addons/account_voucher/invoice.py:34
@@ -554,7 +560,7 @@ msgstr "Оплаченная сумма"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Оплата разницы"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -568,7 +574,7 @@ msgstr "Для проверки"
 #: code:addons/account_voucher/account_voucher.py:1194
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "изменить"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1014
@@ -599,7 +605,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.invoice:0
 msgid "Register Payment"
-msgstr ""
+msgstr "Регистрация оплаты"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -614,7 +620,7 @@ msgstr "декабрём"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Группировать по месяцу даты счета"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -647,7 +653,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "Вы уверены в отмене сверки"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -665,13 +671,13 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "Сверка платежного баланса"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:975
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Ошибка конфигурации !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -695,18 +701,18 @@ msgstr ""
 #: field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr ""
+msgstr "Распределение"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -716,7 +722,7 @@ msgstr "Август"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "Утвердить оплату"
 
 #. module: account_voucher
 #: help:account.voucher,audit:0
@@ -724,6 +730,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Отметьте, если вы не уверены в этой проводке журнала и хотите отметить её "
+"\"для проверки\" опытному бухгалтеру."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -734,7 +742,7 @@ msgstr "Октябрь"
 #: code:addons/account_voucher/account_voucher.py:976
 #, python-format
 msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "Пожалуйста, включите нумерацию выбранного журнала!"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -749,7 +757,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "Оплачено"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
@@ -760,7 +768,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
@@ -787,7 +795,7 @@ msgstr "Расширенные фильтры..."
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "Оплаченная сумма в валюте компании"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@@ -814,7 +822,7 @@ msgstr "Предыдущие платежи ?"
 #: code:addons/account_voucher/account_voucher.py:1112
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "Счет, который вы готовы платить, уже не актуален ."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -830,30 +838,30 @@ msgstr "Журнал ваучеров"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: account_voucher
 #: field:account.voucher,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"
 
 #. module: account_voucher
 #: field:account.voucher,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:982
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Пожалуйста, определите нумерацию журнала."
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "Платежи клиентов"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
@@ -865,7 +873,7 @@ msgstr ""
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Группировать по дате счета"
 
 #. module: account_voucher
 #: view:account.voucher:0
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index c0584ddbd52..c11f9d532e9 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -41,6 +41,7 @@ class invoice(osv.osv):
             'target': 'new',
             'domain': '[]',
             'context': {
+                'payment_expected_currency': inv.currency_id.id,
                 'default_partner_id': self.pool.get('res.partner')._find_accounting_partner(inv.partner_id).id,
                 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
                 'default_reference': inv.name,
@@ -52,6 +53,5 @@ class invoice(osv.osv):
             }
         }
 
-invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
index 2ab76c252f5..246cd8b47e8 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt.py
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -126,6 +126,5 @@ class sale_receipt_report(osv.osv):
             )
         """)
 
-sale_receipt_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml
index 04540fd8aa0..daa5934b256 100644
--- a/addons/account_voucher/security/account_voucher_security.xml
+++ b/addons/account_voucher/security/account_voucher_security.xml
@@ -3,13 +3,13 @@
     <data noupdate="1">
         <record id="voucher_comp_rule" model="ir.rule">
             <field name="name">Voucher multi-company</field>
-            <field model="ir.model" name="model_id" ref="model_account_voucher"/>
+            <field name="model_id" ref="model_account_voucher"/>
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
         <record id="voucher_line_comp_rule" model="ir.rule">
             <field name="name">Voucher Line multi-company</field>
-            <field model="ir.model" name="model_id" ref="model_account_voucher_line"/>
+            <field name="model_id" ref="model_account_voucher_line"/>
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index c9270dc695c..2cd612affc7 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -6,7 +6,7 @@
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company
-    journal_id: account.bank_journal
+    journal_id: account.sales_journal
     name: Voucher for Axelor
     narration: Basic Pc
     line_cr_ids:
diff --git a/addons/account_voucher/test/case1_usd_usd_payment_rate.yml b/addons/account_voucher/test/case1_usd_usd_payment_rate.yml
new file mode 100644
index 00000000000..037fc1497ec
--- /dev/null
+++ b/addons/account_voucher/test/case1_usd_usd_payment_rate.yml
@@ -0,0 +1,247 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create 2 Invoices in USD and make 1 Payment in USD based on the currency rating given by the bank which is slightly different that the one encoded in OpenERP
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
+-
+  I create currency USD in OpenERP for January of 1.333333 Rate
+-
+  !python {model: res.currency.rate}: |
+    from datetime import datetime
+    curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+    date = '%s-01-01' %(datetime.now().year)
+    ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)])
+    self.write(cr, uid, ids, {'rate': 1.333333})
+-
+  I create currency USD in OpenERP for February of 1.250000 Rate
+-
+  !record {model: res.currency.rate, id: feb_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-02-01' %(datetime.now().year)"
+    rate: 1.250000
+
+-
+  I create currency USD in OpenERP for March of 1.111111 Rate
+-
+  !record {model: res.currency.rate, id: mar_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-03-01' %(datetime.now().year)"
+    rate: 1.111111
+
+-
+  I create currency USD in OpenERP for April of 1.052632 Rate
+-
+  !record {model: res.currency.rate, id: apr_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-04-01' %(datetime.now().year)"
+    rate: 1.052632
+
+-
+  I create a cash account with currency USD
+-
+  !record {model: account.account, id: account_cash_usd_id}:
+    currency_id: base.USD
+    name: "cash account in usd"
+    code: "Xcash usd"
+    type: 'liquidity'
+    user_type: "account.data_account_type_cash"
+
+-
+  I create a bank journal with USD as currency
+-
+  !record {model: account.journal, id: bank_journal_USD}:
+    name: Bank Journal(USD)
+    code: BUSD
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
+    currency: base.USD
+    company_id: base.main_company
+
+-
+  I create a new partner Kate Mc Kay
+-
+  !record {model: res.partner, id: res_partner_mc_kay}:
+    name: "Mc Kay Kate"
+    property_account_receivable: account.a_recv
+    property_account_payable: account.a_pay
+-
+  I create the first invoice on 1st January  for 200 USD
+-
+  !record {model: account.invoice, id: account_invoice_jan_payment_rate}:
+    account_id: account.a_recv
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 200.0
+        quantity: 1.0
+        product_id: product.product_product_3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: res_partner_mc_kay
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_jan_payment_rate}
+-
+  I check that first invoice move is correct for debtor account (debit - credit == 150.0)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
+    assert invoice_id.move_id, "Move not created for open invoice"
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.debit - move_line.credit == 150.0), "Invoice move is not correct for debtors account"
+-
+  I create the second invoice on 1st February for 100 USD
+-
+  !record {model: account.invoice, id: account_invoice_feb_payment_rate}:
+    account_id: account.a_recv
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+    period_id: account.period_2
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 100.0
+        quantity: 1.0
+        product_id: product.product_product_3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: res_partner_mc_kay
+    reference_type: none
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_feb_payment_rate}
+-
+  I check that second invoice move is correct for debtor account (debit - credit == 80)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
+    assert invoice_id.move_id, "Move not created for open invoice"
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.debit - move_line.credit == 80), "Invoice move is not correct for debtors account"
+
+-
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'receipt'
+-
+  On the first March, I create the first voucher of payment with values 240 USD, journal USD, and specifying that $1 = 0.8€
+-
+  !record {model: account.voucher, id: account_voucher_1_case1_payment_rate, view: view_vendor_receipt_form}:
+    account_id: account.cash
+    amount: 240.0
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    name: 'Payment: Case 1 USD/USD payment rate'
+    partner_id: res_partner_mc_kay
+    period_id: account.period_3
+    date: !eval time.strftime("%Y-03-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    payment_rate: 0.8
+    payment_rate_currency_id: base.EUR
+
+-
+  I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
+-
+  !python {model: account.voucher}: |
+    vals = {}
+    voucher_id = self.browse(cr, uid, ref('account_voucher_1_case1_payment_rate'))
+    data = []
+    for item in voucher_id.line_cr_ids:
+        if item.amount_unreconciled == 200.00:
+            data += [(item.id, 180.0)]
+        else:
+            data += [(item.id, 70.0)]
+    for line_id, amount in data:
+        self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is -10.0
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    voucher_id = self.browse(cr, uid, voucher)
+    assert (voucher_id.writeoff_amount == -10.0), "Writeoff amount is not -10.0"
+-
+  I confirm the voucher
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    self.signal_proforma_voucher(cr, uid, [voucher])
+-
+  I check that the move of my first voucher is valid
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    voucher_id = self.browse(cr, uid, voucher)
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my debtor account is correct
+-
+  I check that the debtor account has 2 new lines with -180 and -70 as amount_currency columns and that their credit columns are respectively 144 and 56
+-
+  I check that my write-off is correct. 8 debit and 10 amount_currency
+-
+  !python {model: account.voucher}: |
+    voucher = ref('account_voucher_1_case1_payment_rate') 
+    voucher_id = self.browse(cr, uid, voucher)
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+    for move_line in move_line_obj.browse(cr, uid, move_lines):
+        if move_line.amount_currency == -180.00:
+            assert move_line.credit == 144.00, "Debtor account has wrong entry."
+        elif move_line.amount_currency == -70.00:
+            assert move_line.credit == 56.00, "Debtor account has wrong entry."
+        elif move_line.amount_currency == 10.00:
+            assert move_line.debit == 8.00, "Writeoff amount is wrong: Got a debit of %s (expected 8,00€)" % (move_line.debit)
+        elif move_line.amount_currency == 240.00:
+            assert move_line.debit == 192.00, "Bank entry is wrong."
+        else:
+            assert False, "Unrecognized journal entry"
+-
+  I check the residual amount of Invoice1, should be 20 in amount_currency and 6 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.amount_residual == 6.0) , "Residual amount is not correct for first Invoice"
+    assert (move_line.amount_residual_currency == 20.0) , "Residual amount in currency is not correct for first Invoice"
+-
+  I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.amount_residual == 24.0) , "Residual amount is not correct for second Invoice"
+    assert (move_line.amount_residual_currency == 30.0) , "Residual amount in currency is not correct for second Invoice"
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 02dd82f5c14..f523e312933 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -201,7 +201,7 @@
     move_line_obj = self.pool.get('account.move.line')
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
-    assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
+    assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice. Got %s USD (%s EUR)" %(move_line.amount_residual_currency, move_line.amount_residual)
 -
   I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
 -
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index a0ef13d96aa..90c36e371bf 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -161,7 +161,7 @@
 -
   I check that the debtor account has 1 new line with -298.78 as amount_currency columns and 149.39 of credit and currency is CAD.
 -
-  I check that my currency rate difference is correct. 0 in debit with no amount_currency
+  I check that my currency rate difference is correct. 0 in debit with 98.78 CAD as amount_currency
 -
   I check that my writeoff is correct. 11.05 credit and -13.26 amount_currency
 -
@@ -176,7 +176,8 @@
         elif move_line.amount_currency == -298.78:
             assert move_line.credit == 149.39, "Debtor account has wrong entry."
         elif move_line.debit == 0.00 and move_line.credit == 0.00:
-            assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
+            assert move_line.amount_currency == 98.78, "Incorrect Currency Difference, got %s as amount_currency (expected 98.78)." % (move_line.amount_currency)
+            assert move_line.currency_id.id == ref('base.CAD'), "Incorrect Currency Difference, got %s (expected 'CAD')" % (move_line.currency_id.name)
         elif move_line.credit == 10.61:
             assert move_line.amount_currency == -13.26, "Writeoff amount is wrong."
         else:
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 94f0c718980..8dce677fd9a 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -41,7 +41,7 @@
     currency: base.USD
     company_id: base.main_company
 -
-  I create an invoice 
+  On the first of January, I create an invoice of 1000€
 -
   !record {model: account.invoice, id: account_invoice_eur_usd}:
     account_id: account.a_recv
@@ -79,7 +79,7 @@
   !context
     'type': 'receipt'
 -
-  I create the voucher of payment with values 1350 USD, journal USD,
+  On the first of February, I create the voucher of payment with values 1350 USD, journal USD,
 -
   !record {model: account.voucher, id: account_voucher_eur_usd_case, view: view_vendor_receipt_form}:
     account_id: account.cash
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index de873c9195c..dea94d59f4e 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -11,7 +11,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Customer"/>
+                    <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -34,7 +34,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('bank','cash'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -46,6 +46,9 @@
                 </search>
             </field>
         </record>
+
+        <!-- TODO: merge the 3 voucher form views of this file into a single view -->
+        <!-- Low priority view... If we open a voucher from a m2o, for example. -->
         <record model="ir.ui.view" id="view_low_priority_payment_form">
             <field name="name">account.voucher.payment.low.priority.form</field>
             <field name="model">account.voucher</field>
@@ -107,7 +110,7 @@
                                 </group>
                                 <group string="Other Information" col="4">
                                     <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                    <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     <field name="number" colspan="4"/>
@@ -119,6 +122,7 @@
             </field>
         </record>
 
+        <!-- Supplier Payment -->
         <record model="ir.ui.view" id="view_vendor_payment_form">
             <field name="name">account.voucher.payment.form</field>
             <field name="model">account.voucher</field>
@@ -157,7 +161,7 @@
                     <notebook>
                         <page string="Payment Information">
                         	<label for="line_dr_ids"/>
-                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+                            <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -173,7 +177,7 @@
                                 </tree>
                             </field>
                             <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
-                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
+                            <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -193,12 +197,16 @@
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
                                 <group>
-                                    <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
-                                        <separator string="Currency Options" colspan="4"/>
+                                    <group col="2" attrs="{'invisible':[('is_multi_currency','=',False)]}">
+                                        <separator string="Currency Options" colspan="2"/>
                                         <field name="is_multi_currency" invisible="1"/>
-                                        <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
-                                        <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+					<label for="payment_rate" colspan="1"/>
+					<div>
+                                            <field name="payment_rate" required="1" class="oe_inline" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                            <field name="payment_rate_currency_id" class="oe_inline" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                        </div>
+                                        <field name="currency_help_label" colspan="2" nolabel="1" class="oe_grey"/>
+                                        <field name="paid_amount_in_company_currency" colspan="2" invisible="1"/>
                                     </group>
                                     <group col="2">
                                         <separator string="Payment Options" colspan="2"/>
@@ -282,6 +290,7 @@
         <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
 
+        <!-- Register Payment Form (old Pay Invoice wizard) -->
         <record model="ir.ui.view" id="view_vendor_receipt_dialog_form">
             <field name="name">account.voucher.receipt.dialog.form</field>
             <field name="model">account.voucher</field>
@@ -305,6 +314,7 @@
                                 on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
                                 string="Payment Method"/>
                         </group>
+                        
                         <group>
                             <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
                             <field name="period_id"/>
@@ -319,6 +329,21 @@
                             <field name="type" invisible="True"/>
                         </group>
                     </group>
+                    <group>
+                        <group>
+                                <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="payment_option" required="1"/>
+                                <field name="writeoff_acc_id"
+                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                        domain="[('type','=','other')]"/>
+                                <field name="comment"
+                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                <field name="analytic_id"
+                                        groups="analytic.group_analytic_accounting"/>
+                            </group>
+                            <group>
+                        </group>
+                    </group>
                     <notebook invisible="1">
                         <page string="Payment Information" groups="base.group_user">
                             <label for="line_cr_ids"/>
@@ -358,23 +383,12 @@
                                 <group>
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                    <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                                     <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
-                                <group>
-                                    <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <field name="payment_option" required="1"/>
-                                    <field name="writeoff_acc_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
-                                           domain="[('type','=','other')]"/>
-                                    <field name="comment"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                    <field name="analytic_id"
-                                           groups="analytic.group_analytic_accounting"/>
-                                </group>
                             </group>
                         </page>
                     </notebook>
@@ -387,6 +401,7 @@
         </record>
 
 
+        <!-- Customer Payment -->
         <record model="ir.ui.view" id="view_vendor_receipt_form">
             <field name="name">account.voucher.receipt.form</field>
             <field name="model">account.voucher</field>
@@ -467,10 +482,14 @@
                                 <group>
                                     <field name="narration" colspan="2" nolabel="1"/>
                                 </group>
-                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
-                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+				    <label for="payment_rate" colspan="1"/>
+				    <div>
+                                        <field name="payment_rate" required="1" class="oe_inline" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" class="oe_inline" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                    </div>
+                                    <field name="currency_help_label" colspan="2" nolabel="1" class="oe_grey"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
                                 <group>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 05b783dd339..dc732129803 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -10,7 +10,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -32,7 +32,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
                     <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
-                    <field name="partner_id" string="Customer"/>
+                    <field name="partner_id" string="Customer" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="journal_id" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
                     <field name="period_id"/>
                     <group expand="0" string="Group By...">
@@ -145,6 +145,13 @@
                             </field>
                         </page>
                     </notebook>
+                    <group col="4" invisible="1">
+                                    <field name="is_multi_currency" invisible="1"/>
+                                    <field name="currency_help_label" invisible="1"/>
+                                    <field name="payment_rate" invisible="1"/>
+                                    <field name="payment_rate_currency_id"  invisible="1"/>
+                                    <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                    </group>
                     </sheet>
                     <div class="oe_chatter">
                         <field name="message_follower_ids" widget="mail_followers"/>
@@ -237,6 +244,7 @@
                                 on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
                                 groups="account.group_account_user"/>
                             <field name="paid_amount_in_company_currency" invisible="1"/>
+                            <field name="currency_help_label" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index fce251df175..de5121a819b 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -123,6 +123,5 @@ class account_statement_from_invoice_lines(osv.osv_memory):
             }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_statement_from_invoice_lines()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 42651acb0c6..ce79c4d5ffb 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -157,7 +157,7 @@ class account_analytic_account(osv.osv):
         for account in self.browse(cr, uid, ids, context=context):
             if account.company_id:
                 if account.company_id.currency_id.id != value:
-                    raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."))
+                    raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really useful for consolidation purposes of several companies charts with different currencies, for example."))
         if value:
             return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
 
@@ -171,9 +171,9 @@ class account_analytic_account(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Account/Contract Name', size=128, required=True),
+        'name': fields.char('Account/Contract Name', size=128, required=True, track_visibility='onchange'),
         'complete_name': fields.function(_get_full_name, type='char', string='Full Name'),
-        'code': fields.char('Reference', select=True),
+        'code': fields.char('Reference', select=True, track_visibility='onchange'),
         'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
@@ -191,10 +191,10 @@ class account_analytic_account(osv.osv):
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Prepaid Service Units', help='Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
-        'user_id': fields.many2one('res.users', 'Project Manager'),
-        'manager_id': fields.many2one('res.users', 'Account Manager'),
+        'user_id': fields.many2one('res.users', 'Project Manager', track_visibility='onchange'),
+        'manager_id': fields.many2one('res.users', 'Account Manager', track_visibility='onchange'),
         'date_start': fields.date('Start Date'),
-        'date': fields.date('End Date', select=True),
+        'date': fields.date('End Date', select=True, track_visibility='onchange'),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'),('pending','To Renew'),('close','Closed'),('cancelled', 'Cancelled')], 'Status', required=True, track_visibility='onchange'),
         'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, #the currency_id field is readonly except if it's a view account and if there is no company
diff --git a/addons/analytic/i18n/lt.po b/addons/analytic/i18n/lt.po
new file mode 100644
index 00000000000..d9073313307
--- /dev/null
+++ b/addons/analytic/i18n/lt.po
@@ -0,0 +1,388 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "End Date"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid ""
+"Once the end date of the contract is\n"
+"                                        passed or the maximum number of "
+"service\n"
+"                                        units (e.g. support contract) is\n"
+"                                        reached, the account manager is "
+"notified \n"
+"                                        by email to renew the contract with "
+"the\n"
+"                                        customer."
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,manager_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: analytic
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "New"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "Status"
+msgstr ""
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:271
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "Renewal"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid ""
+"Sets the higher limit of time to work on the contract, based on the "
+"timesheet. (for instance, number of hours in a limited support contract.)"
+msgstr ""
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:160
+#, python-format
+msgid ""
+"If you set a company, the currency selected has to be the same as it's "
+"currency. \n"
+"You can remove the company belonging, and thus change the currency, only on "
+"analytic account of type 'view'. This can be really usefull for "
+"consolidation purposes of several companies charts with different "
+"currencies, for example."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: analytic
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,child_complete_ids:0
+msgid "Account Hierarchy"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "Contract Information"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,template_id:0
+#: selection:account.analytic.account,type:0
+msgid "Template of Contract"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Prepaid Service Units"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: analytic
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr ""
+
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Analytic View"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "To Renew"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Reference"
+msgstr ""
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:160
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: analytic
+#: model:res.groups,name:analytic.group_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+#: selection:account.analytic.account,type:0
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Type of Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml
index 70688275de2..bf103ca8988 100644
--- a/addons/analytic/security/analytic_security.xml
+++ b/addons/analytic/security/analytic_security.xml
@@ -4,14 +4,14 @@
 
     <record id="analytic_comp_rule" model="ir.rule">
         <field name="name">Analytic multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_account"/>
+        <field name="model_id" ref="model_account_analytic_account"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
      
     <record id="analytic_line_comp_rule" model="ir.rule">
         <field name="name">Analytic line multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_line"/>
+        <field name="model_id" ref="model_account_analytic_line"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 8b10381434d..a1bf43714ce 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -152,6 +152,5 @@ class account_analytic_account(osv.osv):
             'nodestroy': True,
         }
 
-account_analytic_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_hr_expense/i18n/nl_BE.po b/addons/analytic_contract_hr_expense/i18n/nl_BE.po
new file mode 100644
index 00000000000..4bc0cc559e5
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/nl_BE.po
@@ -0,0 +1,72 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-15 16:33+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "of bekijk"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Niets te factureren, aanmaken"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "onkosten"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytische rekening"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Te factureren onkosten van %s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
+#, python-format
+msgid "Expenses of %s"
+msgstr "Onkosten van %s"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Te verwachten te factureren onkosten"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Onkosten doorrekenen"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Factuur"
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 0573292c1f6..1adefb2d59d 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -104,7 +104,7 @@ class hr_analytic_timesheet(osv.osv):
                 a = r.product_id.categ_id.property_account_expense_categ.id
             if not a:
                 raise osv.except_osv(_('Error!'),
-                        _('There is no expense account define ' \
+                        _('There is no expense account defined ' \
                                 'for this product: "%s" (id:%d)') % \
                                 (r.product_id.name, r.product_id.id,))
             # Compute based on pricetype
@@ -133,7 +133,7 @@ class hr_analytic_timesheet(osv.osv):
                     a = r.product_id.categ_id.property_account_expense_categ.id
                 if not a:
                     raise osv.except_osv(_('Error!'),
-                            _('There is no expense account define ' \
+                            _('There is no expense account defined ' \
                                     'for this product: "%s" (id:%d)') % \
                                     (r.product_id.name, r.product_id.id,))
                 # Compute based on pricetype
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index de46e2e8d03..c82afde103f 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -86,11 +86,11 @@ class ir_model_fields_anonymization(osv.osv):
         if context.get('manual'):
             global_state = self._get_global_state(cr, uid, context=context)
             if global_state == 'anonymized':
-                raise osv.except_osv('Error !', "The database is currently anonymized, you cannot create, modify or delete fields.")
+                raise osv.except_osv('Error!', "The database is currently anonymized, you cannot create, modify or delete fields.")
             elif global_state == 'unstable':
                 msg = _("The database anonymization is currently in an unstable state. Some fields are anonymized," + \
                       " while some fields are not anonymized. You should try to solve this problem before trying to create, write or delete fields.")
-                raise osv.except_osv('Error !', msg)
+                raise osv.except_osv('Error!', msg)
 
         return True
 
@@ -357,7 +357,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             else:
                 msg = _("The database anonymization is currently in an unstable state. Some fields are anonymized," + \
                   " while some fields are not anonymized. You should try to solve this problem before trying to do anything else.")
-                raise osv.except_osv('Error !', msg)
+                raise osv.except_osv('Error!', msg)
 
             res['arch'] = etree.tostring(eview)
 
@@ -411,7 +411,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             model_name = field.model_id.model
             field_name = field.field_id.name
             field_type = field.field_id.ttype
-            table_name = self.pool.get(model_name)._table
+            table_name = self.pool[model_name]._table
 
             # get the current value
             sql = "select id, %s from %s" % (field_name, table_name)
@@ -521,11 +521,11 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         # check that all the defined fields are in the 'anonymized' state
         state = ir_model_fields_anonymization_model._get_global_state(cr, uid, context=context)
         if state == 'clear':
-            raise osv.except_osv_('Error !', "The database is not currently anonymized, you cannot reverse the anonymization.")
+            raise osv.except_osv_('Error!', "The database is not currently anonymized, you cannot reverse the anonymization.")
         elif state == 'unstable':
             msg = _("The database anonymization is currently in an unstable state. Some fields are anonymized," + \
                   " while some fields are not anonymized. You should try to solve this problem before trying to do anything.")
-            raise osv.except_osv('Error !', msg)
+            raise osv.except_osv('Error!', msg)
 
         wizards = self.browse(cr, uid, ids, context=context)
         for wizard in wizards:
@@ -543,7 +543,8 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             fixes = group(fixes, ('model_name', 'field_name'))
 
             for line in data:
-                table_name = self.pool.get(line['model_id'])._table if self.pool.get(line['model_id']) else None
+                queries = []
+                table_name = self.pool[line['model_id']]._table if line['model_id'] in self.pool else None
 
                 # check if custom sql exists:
                 key = (line['model_id'], line['field_id'])
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 811c5387697..159baf3a9e7 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -70,8 +70,7 @@ class audittrail_rule(osv.osv):
         obj_model = self.pool.get('ir.model.data')
         #start Loop
         for thisrule in self.browse(cr, uid, ids):
-            obj = self.pool.get(thisrule.object_id.model)
-            if not obj:
+            if thisrule.object_id.model not in self.pool:
                 raise osv.except_osv(
                         _('WARNING: audittrail is not part of the pool'),
                         _('Change audittrail depends -- Setting rule as DRAFT'))
@@ -131,7 +130,7 @@ class audittrail_log(osv.osv):
             model_object = resname.object_id
             res_id = resname.res_id
             if model_object and res_id:
-                model_pool = self.pool.get(model_object.model)
+                model_pool = self.pool[model_object.model]
                 res = model_pool.read(cr, uid, res_id, ['name'])
                 data[resname.id] = res['name']
             else:
@@ -190,7 +189,7 @@ def get_value_text(cr, uid, pool, resource_pool, method, field, value):
 
     field_obj = (resource_pool._all_columns.get(field)).column
     if field_obj._type in ('one2many','many2many'):
-        data = pool.get(field_obj._obj).name_get(cr, uid, value)
+        data = pool[field_obj._obj].name_get(cr, uid, value)
         #return the modifications on x2many fields as a list of names
         res = map(lambda x:x[1], data)
     elif field_obj._type == 'many2one':
@@ -212,7 +211,7 @@ def create_log_line(cr, uid, log_id, model, lines=None):
     if lines is None:
         lines = []
     pool = openerp.registry(cr.dbname)
-    obj_pool = pool.get(model.model)
+    obj_pool = pool[model.model]
     model_pool = pool.get('ir.model')
     field_pool = pool.get('ir.model.fields')
     log_line_pool = pool.get('audittrail.log.line')
@@ -251,7 +250,7 @@ def log_fct(cr, uid_orig, model, method, fct_src, *args, **kw):
     @return: Returns result as per method of Object proxy
     """
     pool = openerp.registry(cr.dbname)
-    resource_pool = pool.get(model)
+    resource_pool = pool[model]
     model_pool = pool.get('ir.model')
     model_ids = model_pool.search(cr, SUPERUSER_ID, [('model', '=', model)])
     model_id = model_ids and model_ids[0] or False
@@ -321,7 +320,7 @@ def get_data(cr, uid, pool, res_ids, model, method):
             }
     """
     data = {}
-    resource_pool = pool.get(model.model)
+    resource_pool = pool[model.model]
     # read all the fields of the given resources in super admin mode
     for resource in resource_pool.read(cr, SUPERUSER_ID, res_ids):
         values = {}
@@ -390,7 +389,7 @@ def prepare_audittrail_log_line(cr, uid, pool, model, resource_id, method, old_v
         key: []
     }
     # loop on all the fields
-    for field_name, field_definition in pool.get(model.model)._all_columns.items():
+    for field_name, field_definition in pool[model.model]._all_columns.items():
         if field_name in ('__last_update', 'id'):
             continue
         #if the field_list param is given, skip all the fields not in that list
@@ -457,7 +456,7 @@ def process_data(cr, uid, pool, res_ids, model, method, old_values=None, new_val
 
         # if at least one modification has been found
         for model_id, resource_id in lines:
-            name = pool.get(model.model).name_get(cr, uid, [resource_id])[0][1]
+            name = pool[model.model].name_get(cr, uid, [resource_id])[0][1]
             vals = {
                 'method': method,
                 'object_id': model_id,
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index d06da281933..4385970f8d9 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -61,6 +61,5 @@ class audittrail_view_log(osv.osv_memory):
         #End Loop
         return result
 
-audittrail_view_log()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_crypt/i18n/lt.po b/addons/auth_crypt/i18n/lt.po
new file mode 100644
index 00000000000..03f0bd5249f
--- /dev/null
+++ b/addons/auth_crypt/i18n/lt.po
@@ -0,0 +1,28 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Užšifruotas slaptažodis"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
diff --git a/addons/auth_crypt/i18n/nl_BE.po b/addons/auth_crypt/i18n/nl_BE.po
index b9477ece5dc..abb65c8700f 100644
--- a/addons/auth_crypt/i18n/nl_BE.po
+++ b/addons/auth_crypt/i18n/nl_BE.po
@@ -1,42 +1,28 @@
 # Dutch (Belgium) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-07-26 17:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-15 16:02+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Geëncrypteerd wachtwoord"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
 msgid "Users"
-msgstr ""
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "U kunt geen twee gebruikers met dezelfde login maken."
-
-#, python-format
-#~ msgid "Please specify the password !"
-#~ msgstr "Gelieve een wachtwoord op te geven"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "De gekozen firma behoort niet tot de toegelaten bedrijven voor deze "
-#~ "gebruiker."
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Fout"
+msgstr "Gebruikers"
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index e8778449da5..8e7128ca91e 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -227,7 +227,6 @@ class CompanyLDAP(osv.osv):
         'create_user': True,
     }
 
-CompanyLDAP()
 
 
 class res_company(osv.osv):
@@ -236,7 +235,6 @@ class res_company(osv.osv):
         'ldaps': fields.one2many(
             'res.company.ldap', 'company', 'LDAP Parameters'),
     }
-res_company()
 
 
 class users(osv.osv):
@@ -282,5 +280,4 @@ class users(osv.osv):
         cr.close()
         raise openerp.exceptions.AccessDenied()
         
-users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.eot b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.eot
old mode 100755
new mode 100644
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.svg b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.svg
old mode 100755
new mode 100644
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.ttf b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.ttf
old mode 100755
new mode 100644
diff --git a/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.woff b/addons/auth_oauth/static/lib/zocial/css/zocial-regular-webfont.woff
old mode 100755
new mode 100644
diff --git a/addons/auth_oauth_signup/i18n/lt.po b/addons/auth_oauth_signup/i18n/lt.po
new file mode 100644
index 00000000000..27fb83e6a4f
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/lt.po
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
diff --git a/addons/auth_oauth_signup/i18n/nl_BE.po b/addons/auth_oauth_signup/i18n/nl_BE.po
new file mode 100644
index 00000000000..04d5034d029
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/nl_BE.po
@@ -0,0 +1,23 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-15 16:01+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Gebruikers"
diff --git a/addons/auth_openid/i18n/ru.po b/addons/auth_openid/i18n/ru.po
index 6041300fe60..68b36626056 100644
--- a/addons/auth_openid/i18n/ru.po
+++ b/addons/auth_openid/i18n/ru.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-23 11:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-28 06:19+0000\n"
+"Last-Translator: Глория Хрусталёва <gloriya@hushmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-24 04:45+0000\n"
-"X-Generator: Launchpad (build 16540)\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: auth_openid
 #. openerp-web
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:24
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: auth_openid
 #. openerp-web
@@ -30,7 +30,7 @@ msgstr ""
 #: view:res.users:0
 #, python-format
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
 
 #. module: auth_openid
 #. openerp-web
@@ -46,14 +46,14 @@ msgstr ""
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
 #, python-format
 msgid "Google"
-msgstr ""
+msgstr "Google"
 
 #. module: auth_openid
 #. openerp-web
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:11
 #, python-format
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"
 
 #. module: auth_openid
 #: help:res.users,openid_email:0
@@ -82,7 +82,7 @@ msgstr ""
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:8
 #, python-format
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #. module: auth_openid
 #. openerp-web
@@ -94,4 +94,4 @@ msgstr ""
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py
index feea2d8d396..897dea07982 100644
--- a/addons/auth_openid/res_users.py
+++ b/addons/auth_openid/res_users.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
@@ -91,7 +90,6 @@ class res_users(osv.osv):
                     raise
                 self._uid_cache.setdefault(db, {})[uid] = passwd
 
-res_users()
 
 
 
diff --git a/addons/auth_openid/utils.py b/addons/auth_openid/utils.py
index 806198f99c2..0474e23fe4b 100644
--- a/addons/auth_openid/utils.py
+++ b/addons/auth_openid/utils.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
diff --git a/addons/auth_signup/i18n/lt.po b/addons/auth_signup/i18n/lt.po
new file mode 100644
index 00000000000..7ae419856e6
--- /dev/null
+++ b/addons/auth_signup/i18n/lt.po
@@ -0,0 +1,279 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#, python-format
+msgid "Confirm Password"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:265
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:28
+#, python-format
+msgid "Reset password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#, python-format
+msgid "Sign Up"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:269
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:108
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:108
+#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Sign up"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
diff --git a/addons/auth_signup/i18n/ru.po b/addons/auth_signup/i18n/ru.po
index bddc6cde1ba..639a1e9bc3c 100644
--- a/addons/auth_signup/i18n/ru.po
+++ b/addons/auth_signup/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 06:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-27 12:12+0000\n"
+"Last-Translator: Глория Хрусталёва <gloriya@hushmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -25,25 +25,25 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
-msgstr ""
+msgstr "Разрешить регистрацию внешним пользователям"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
 #, python-format
 msgid "Confirm Password"
-msgstr ""
+msgstr "Подтвердите пароль"
 
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
 msgid "If unchecked, only invited users may sign up."
 msgstr ""
-"Если отмечено, только приглашенные пользователи могут зарегистрироваться"
+"Если не отмечено, только приглашенные пользователи могут зарегистрироваться"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:265
@@ -57,17 +57,17 @@ msgstr "Невозможно отправить письмо: у пользов
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:28
 #, python-format
 msgid "Reset password"
-msgstr ""
+msgstr "Сброс пароля"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
-msgstr ""
+msgstr "Шаблон новых пользователей, созданных в процессе регистрации"
 
 #. module: auth_signup
 #: model:email.template,subject:auth_signup.reset_password_email
 msgid "Password reset"
-msgstr ""
+msgstr "Сброс пароля"
 
 #. module: auth_signup
 #. openerp-web
@@ -88,12 +88,12 @@ msgstr ""
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
 #, python-format
 msgid "Sign Up"
-msgstr ""
+msgstr "Регистрация"
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:258
@@ -104,7 +104,7 @@ msgstr ""
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.reset_password_email
@@ -118,18 +118,27 @@ msgid ""
 "\n"
 "<p>Note: If you do not expect this, you can safely ignore this email.</p>"
 msgstr ""
+"\n"
+"<p>Был запрошен сброс пароля для аккаунта OpenERP  связанного с этим адресом "
+"эл.почты</p>\n"
+"\n"
+"<p>Вы можете сменить пароль, проследовав по <a "
+"href=\"${object.signup_url}\">ссылке</a>.</p>\n"
+"\n"
+"<p>Примечание: если вы не запрашивали сброс пароля, просто проигнорируйте "
+"данное письмо</p>"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:111
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "Пожалуйста, введите имя"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: auth_signup
 #: field:res.partner,signup_url:0
@@ -146,7 +155,7 @@ msgstr "Пожалуйста, введите имя пользователя."
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
-msgstr ""
+msgstr "Активен"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:269
@@ -155,39 +164,41 @@ msgid ""
 "Cannot send email: no outgoing email server configured.\n"
 "You can configure it under Settings/General Settings."
 msgstr ""
+"Невозможно отправить email: не настроены сервера исходящей почты.\n"
+"Вы можете настроить их в меню Настройки/Общие настройки"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "Пожалуйста, введите имя пользователя или адрес эл. почты."
 
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Resetting Password"
-msgstr ""
+msgstr "Переустановка пароля"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
 #, python-format
 msgid "Username (Email)"
-msgstr ""
+msgstr "Имя пользователя (Email)"
 
 #. module: auth_signup
 #: field:res.partner,signup_expiration:0
@@ -198,13 +209,15 @@ msgstr ""
 #: help:base.config.settings,auth_signup_reset_password:0
 msgid "This allows users to trigger a password reset from the Login page."
 msgstr ""
+"Это позволяет пользователям запросить сброс пароля со страницы входа в "
+"систему."
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Log in"
-msgstr ""
+msgstr "Вход"
 
 #. module: auth_signup
 #: field:res.partner,signup_valid:0
@@ -222,7 +235,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Вход"
 
 #. module: auth_signup
 #. openerp-web
@@ -236,7 +249,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:120
 #, python-format
 msgid "Passwords do not match; please retype them."
-msgstr ""
+msgstr "Пароли не совпадают; пожалуйста, введите их заново."
 
 #. module: auth_signup
 #. openerp-web
@@ -244,7 +257,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:167
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "Не выбрана база данных!"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -254,14 +267,14 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
 msgid "Enable password reset from Login page"
-msgstr ""
+msgstr "Включить сброс пароля со страницы входа"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
 #, python-format
 msgid "Back to Login"
-msgstr ""
+msgstr "Вернуться к странице входа"
 
 #. module: auth_signup
 #. openerp-web
@@ -273,7 +286,7 @@ msgstr ""
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Партнер"
 
 #. module: auth_signup
 #: field:res.partner,signup_token:0
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 333dd1be2dc..aa8d9f952c1 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-04 20:16+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-04-16 04:33+0000\n"
+"Last-Translator: Key <key.diagram@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -73,7 +73,7 @@ msgstr "重置密码"
 #: code:addons/auth_signup/static/src/js/auth_signup.js:117
 #, python-format
 msgid "Please enter a password and confirm it."
-msgstr ""
+msgstr "请输入密码并确认。"
 
 #. module: auth_signup
 #: view:res.users:0
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index b5383e41775..891837f8813 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -23,6 +23,7 @@ import random
 from urllib import urlencode
 from urlparse import urljoin
 
+from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import osv, fields
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval
@@ -55,19 +56,22 @@ class res_partner(osv.Model):
     def _get_signup_url_for_action(self, cr, uid, ids, action='login', view_type=None, menu_id=None, res_id=None, model=None, context=None):
         """ generate a signup url for the given partner ids and action, possibly overriding
             the url state components (menu_id, id, view_type) """
+        if context is None:
+            context= {}
         res = dict.fromkeys(ids, False)
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         for partner in self.browse(cr, uid, ids, context):
             # when required, make sure the partner has a valid signup token
-            if context and context.get('signup_valid') and not partner.user_ids:
+            if context.get('signup_valid') and not partner.user_ids:
                 self.signup_prepare(cr, uid, [partner.id], context=context)
                 partner.refresh()
 
             # the parameters to encode for the query and fragment part of url
             query = {'db': cr.dbname}
-            fragment = {'action': action, 'type': partner.signup_type}
+            signup_type = context.get('signup_force_type_in_url', partner.signup_type or '')
+            fragment = {'action': action, 'type': signup_type}
 
-            if partner.signup_token:
+            if partner.signup_token and signup_type:
                 fragment['token'] = partner.signup_token
             elif partner.user_ids:
                 fragment['db'] = cr.dbname
@@ -103,6 +107,9 @@ class res_partner(osv.Model):
     def action_signup_prepare(self, cr, uid, ids, context=None):
         return self.signup_prepare(cr, uid, ids, context=context)
 
+    def signup_cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'signup_token': False, 'signup_type': False, 'signup_expiration': False}, context=context)
+
     def signup_prepare(self, cr, uid, ids, signup_type="signup", expiration=False, context=None):
         """ generate a new token for the partners with the given validity, if necessary
             :param expiration: the expiration datetime of the token (string, optional)
@@ -200,6 +207,9 @@ class res_users(osv.Model):
                     'partner_id': partner.id,
                     'email': values.get('email') or values.get('login'),
                 })
+                if partner.company_id:
+                    values['company_id'] = partner.company_id.id
+                    values['company_ids'] = [(6, 0, [partner.company_id.id])]
                 self._signup_create_user(cr, uid, values, context=context)
         else:
             # no token, sign up an external user
@@ -256,25 +266,26 @@ class res_users(osv.Model):
                 pass
         if not bool(template):
             template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_signup', 'reset_password_email')
-        mail_obj = self.pool.get('mail.mail')
         assert template._name == 'email.template'
 
         for user in self.browse(cr, uid, ids, context):
             if not user.email:
                 raise osv.except_osv(_("Cannot send email: user has no email address."), user.name)
-            mail_id = self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, True, context=context)
-            mail_state = mail_obj.read(cr, uid, mail_id, ['state'], context=context)
-
-            if mail_state and mail_state['state'] == 'exception':
-                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Cannot send email: no outgoing email server configured.\nYou can configure it under %(menu:base_setup.menu_general_configuration)s."), context)
-            else:
-                return True
+            try:
+                self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, force_send=True, raise_exception=True, context=context)
+            except Exception:
+                raise
 
     def create(self, cr, uid, values, context=None):
+        if context is None:
+            context = {}
         # overridden to automatically invite user to sign up
         user_id = super(res_users, self).create(cr, uid, values, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        if context and context.get('reset_password') and user.email:
-            ctx = dict(context, create_user=True)
-            self.action_reset_password(cr, uid, [user.id], context=ctx)
+        if user.email and not context.get('no_reset_password'):
+            context.update({'create_user': True})
+            try:
+                self.action_reset_password(cr, uid, [user.id], context=context)
+            except MailDeliveryException:
+                self.pool.get('res.partner').signup_cancel(cr, uid, [user.partner_id.id], context=context)
         return user_id
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 28f66eb101d..60c419db737 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -31,9 +31,11 @@
                 <!-- add Reset Password button -->
                 <xpath expr="//div[@class='oe_right oe_button_box']//button" position="replace">
                         <button string="Send Reset Password Instructions"
+                                class="oe_link"
                                 type="object" name="action_reset_password"
                                 attrs="{'invisible': [('state', '!=', 'active')]}"/>
                         <button string="Send an Invitation Email"
+                                class="oe_link"
                                 type="object" name="action_reset_password" context="{'create_user': 1}"
                                 attrs="{'invisible': [('state', '!=', 'new')]}"/>
                 </xpath>
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index bbaf907c625..b825d683099 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -7,7 +7,7 @@ openerp.auth_signup = function(instance) {
             var self = this;
             this.signup_enabled = false;
             this.reset_password_enabled = false;
-            return this._super().then(function() {
+            return this._super().always(function() {
 
                 // Switches the login box to the select mode whith mode == [default|signup|reset]
                 self.on('change:login_mode', self, function() {
@@ -57,14 +57,14 @@ openerp.auth_signup = function(instance) {
                         self.signup_enabled = result.signup;
                         self.reset_password_enabled = result.reset_password;
                         if (!self.signup_enabled || self.$("form input[name=login]").val()){
-                            self.set('login_mode', 'default');
+                            self.set('login_mode', self.params.type || 'default');
                         } else {
                             self.set('login_mode', 'signup');
                         }
                     });
                 } else {
                     // TODO: support multiple database mode
-                    self.set('login_mode', 'default');
+                    self.set('login_mode', self.params.type || 'default');
                 }
             });
         },
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 62c808ed556..3497255fa76 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -50,6 +50,7 @@ class base_action_rule(osv.osv):
 
     _name = 'base.action.rule'
     _description = 'Action Rules'
+    _order = 'sequence'
 
     _columns = {
         'name':  fields.char('Rule Name', size=64, required=True),
@@ -61,7 +62,11 @@ class base_action_rule(osv.osv):
             help="When unchecked, the rule is hidden and will not be executed."),
         'sequence': fields.integer('Sequence',
             help="Gives the sequence order when displaying a list of rules."),
+        'kind': fields.selection(
+            [('on_create', 'On Creation'), ('on_write', 'On Update'), ('on_time', 'Based on Timed Condition')],
+            string='When to Run'),
         'trg_date_id': fields.many2one('ir.model.fields', string='Trigger Date',
+            help="When should the condition be triggered. If present, will be checked by the scheduler. If empty, will be checked at creation and update.",
             domain="[('model_id', '=', model_id), ('ttype', 'in', ('date', 'datetime'))]"),
         'trg_date_range': fields.integer('Delay after trigger date',
             help="Delay after the trigger date." \
@@ -78,10 +83,10 @@ class base_action_rule(osv.osv):
             ondelete='restrict',
             domain="[('model_id', '=', model_id.model)]",
             help="If present, this condition must be satisfied before the update of the record."),
-        'filter_id': fields.many2one('ir.filters', string='After Update Filter',
+        'filter_id': fields.many2one('ir.filters', string='Filter',
             ondelete='restrict',
             domain="[('model_id', '=', model_id.model)]",
-            help="If present, this condition must be satisfied after the update of the record."),
+            help="If present, this condition must be satisfied before executing the action rule."),
         'last_run': fields.datetime('Last Run', readonly=1),
     }
 
@@ -90,13 +95,21 @@ class base_action_rule(osv.osv):
         'trg_date_range_type': 'day',
     }
 
-    _order = 'sequence'
+    def onchange_kind(self, cr, uid, ids, kind, context=None):
+        clear_fields = []
+        if kind == 'on_create':
+            clear_fields = ['filter_pre_id', 'trg_date_id', 'trg_date_range', 'trg_date_range_type']
+        elif kind == 'on_write':
+            clear_fields = ['trg_date_id', 'trg_date_range', 'trg_date_range_type']
+        elif kind == 'on_time':
+            clear_fields = ['filter_pre_id']
+        return {'value': dict.fromkeys(clear_fields, False)}
 
     def _filter(self, cr, uid, action, action_filter, record_ids, context=None):
         """ filter the list record_ids that satisfy the action filter """
         if record_ids and action_filter:
             assert action.model == action_filter.model_id, "Filter model different from action rule model"
-            model = self.pool.get(action_filter.model_id)
+            model = self.pool[action_filter.model_id]
             domain = [('id', 'in', record_ids)] + eval(action_filter.domain)
             ctx = dict(context or {})
             ctx.update(eval(action_filter.context))
@@ -105,14 +118,7 @@ class base_action_rule(osv.osv):
 
     def _process(self, cr, uid, action, record_ids, context=None):
         """ process the given action on the records """
-        # execute server actions
-        model = self.pool.get(action.model_id.model)
-        if action.server_action_ids:
-            server_action_ids = map(int, action.server_action_ids)
-            for record in model.browse(cr, uid, record_ids, context):
-                action_server_obj = self.pool.get('ir.actions.server')
-                ctx = dict(context, active_model=model._name, active_ids=[record.id], active_id=record.id)
-                action_server_obj.run(cr, uid, server_action_ids, context=ctx)
+        model = self.pool[action.model_id.model]
 
         # modify records
         values = {}
@@ -127,13 +133,21 @@ class base_action_rule(osv.osv):
             follower_ids = map(int, action.act_followers)
             model.message_subscribe(cr, uid, record_ids, follower_ids, context=context)
 
+        # execute server actions
+        if action.server_action_ids:
+            server_action_ids = map(int, action.server_action_ids)
+            for record in model.browse(cr, uid, record_ids, context):
+                action_server_obj = self.pool.get('ir.actions.server')
+                ctx = dict(context, active_model=model._name, active_ids=[record.id], active_id=record.id)
+                action_server_obj.run(cr, uid, server_action_ids, context=ctx)
+
         return True
 
     def _wrap_create(self, old_create, model):
         """ Return a wrapper around `old_create` calling both `old_create` and
             `_process`, in that order.
         """
-        def wrapper(cr, uid, vals, context=None):
+        def create(cr, uid, vals, context=None):
             # avoid loops or cascading actions
             if context and context.get('action'):
                 return old_create(cr, uid, vals, context=context)
@@ -141,8 +155,8 @@ class base_action_rule(osv.osv):
             context = dict(context or {}, action=True)
             new_id = old_create(cr, uid, vals, context=context)
 
-            # as it is a new record, we do not consider the actions that have a prefilter
-            action_dom = [('model', '=', model), ('trg_date_id', '=', False), ('filter_pre_id', '=', False)]
+            # retrieve the action rules to run on creation
+            action_dom = [('model', '=', model), ('kind', '=', 'on_create')]
             action_ids = self.search(cr, uid, action_dom, context=context)
 
             # check postconditions, and execute actions on the records that satisfy them
@@ -151,13 +165,13 @@ class base_action_rule(osv.osv):
                     self._process(cr, uid, action, [new_id], context=context)
             return new_id
 
-        return wrapper
+        return create
 
     def _wrap_write(self, old_write, model):
         """ Return a wrapper around `old_write` calling both `old_write` and
             `_process`, in that order.
         """
-        def wrapper(cr, uid, ids, vals, context=None):
+        def write(cr, uid, ids, vals, context=None):
             # avoid loops or cascading actions
             if context and context.get('action'):
                 return old_write(cr, uid, ids, vals, context=context)
@@ -165,8 +179,8 @@ class base_action_rule(osv.osv):
             context = dict(context or {}, action=True)
             ids = [ids] if isinstance(ids, (int, long, str)) else ids
 
-            # retrieve the action rules to possibly execute
-            action_dom = [('model', '=', model), ('trg_date_id', '=', False)]
+            # retrieve the action rules to run on update
+            action_dom = [('model', '=', model), ('kind', '=', 'on_write')]
             action_ids = self.search(cr, uid, action_dom, context=context)
             actions = self.browse(cr, uid, action_ids, context=context)
 
@@ -185,7 +199,7 @@ class base_action_rule(osv.osv):
                     self._process(cr, uid, action, post_ids, context=context)
             return True
 
-        return wrapper
+        return write
 
     def _register_hook(self, cr, ids=None):
         """ Wrap the methods `create` and `write` of the models specified by
@@ -195,7 +209,7 @@ class base_action_rule(osv.osv):
             ids = self.search(cr, SUPERUSER_ID, [])
         for action_rule in self.browse(cr, SUPERUSER_ID, ids):
             model = action_rule.model_id.model
-            model_obj = self.pool.get(model)
+            model_obj = self.pool[model]
             if not hasattr(model_obj, 'base_action_ruled'):
                 model_obj.create = self._wrap_create(model_obj.create, model)
                 model_obj.write = self._wrap_write(model_obj.write, model)
@@ -224,15 +238,15 @@ class base_action_rule(osv.osv):
     def _check(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
         """ This Function is called by scheduler. """
         context = context or {}
-        # retrieve all the action rules that have a trg_date_id and no precondition
-        action_dom = [('trg_date_id', '!=', False), ('filter_pre_id', '=', False)]
+        # retrieve all the action rules to run based on a timed condition
+        action_dom = [('kind', '=', 'on_time')]
         action_ids = self.search(cr, uid, action_dom, context=context)
         for action in self.browse(cr, uid, action_ids, context=context):
             now = datetime.now()
             last_run = get_datetime(action.last_run) if action.last_run else False
 
             # retrieve all the records that satisfy the action's condition
-            model = self.pool.get(action.model_id.model)
+            model = self.pool[action.model_id.model]
             domain = []
             ctx = dict(context)
             if action.filter_id:
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 5eaaf08dad4..c2262adde39 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -26,24 +26,32 @@
                         <notebook>
                             <page string="Conditions">
                                 <group>
-                                    <group name="filter" string="Filter Condition">
-                                        <field name="filter_pre_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
-                                        <field name="filter_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
-                                    </group>
-                                    <group name="timing" string="Timer">
-                                        <field name="trg_date_id"/>
-                                        <label for="trg_date_range" string="Delay After Trigger Date" attrs="{'invisible': [('trg_date_id','=',False)]}"/>
-                                        <div attrs="{'invisible': [('trg_date_id','=',False)]}">
-                                            <field name="trg_date_range" class="oe_inline"/>
-                                            <field name="trg_date_range_type" class="oe_inline" attrs="{'required': [('trg_date_id','!=',False)]}"/>
-                                        </div>
-                                    </group>
+                                    <field name="kind" required="1"
+                                        on_change="onchange_kind(kind)"/>
+                                    <field name="filter_pre_id"
+                                        domain="[('model_id','=',model), ('user_id', '=', False)]"
+                                        context="{'default_model_id': model}"
+                                        attrs="{'invisible': [('kind', '!=', 'on_write')]}"/>
+                                    <field name="filter_id"
+                                        domain="[('model_id','=',model), ('user_id', '=', False)]"
+                                        context="{'default_model_id': model}"/>
+                                    <field name="trg_date_id"
+                                        attrs="{'invisible': [('kind', '!=', 'on_time')], 'required': [('kind', '=', 'on_time')]}"/>
+                                    <label for="trg_date_range" string="Delay After Trigger Date"
+                                        attrs="{'invisible': [('trg_date_id','=',False)]}"/>
+                                    <div attrs="{'invisible': [('trg_date_id','=',False)]}">
+                                        <field name="trg_date_range" class="oe_inline"/>
+                                        <field name="trg_date_range_type" class="oe_inline" attrs="{'required': [('trg_date_id','!=',False)]}"/>
+                                    </div>
                                 </group>
-                                <p class="oe_grey">
-                                    <b>Select a filter or a timer as condition.</b><br/> An action rule is checked when you create or modify the "Related Document Model". The precondition filter is checked right before the modification while the postcondition filter is checked after the modification. A precondition filter will therefore not work during a creation.<br/>
-                                    <b>To create a new filter:</b><br/>
-                                    - Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Creation Date "is equal to" 01/01/2012)<br/>
-                                    - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Create the 01/01/2012) and add the option "Share with all users"<br/>
+                                <p>
+                                    Select when the action must be run, and add filters and/or timing conditions.
+                                    <br/>
+                                    In order to create a new filter:
+                                    <ul>
+                                        <li>Go to your "Related Document Model" page and set the filter parameters in the "Search" view (Example of filter based on Leads/Opportunities: Creation Date "is equal to" 01/01/2012)</li>
+                                        <li>In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Create the 01/01/2012) and add the option "Share with all users"</li>
+                                    </ul>
                                     The filter must therefore be available in this page.
                                 </p>
                             </page>
@@ -76,6 +84,7 @@
                 <tree string="Action Rule">
                     <field name="sequence"/>
                     <field name="name"/>
+                    <field name="kind"/>
                     <field name="filter_id"/>
                 </tree>
             </field>
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index c8673c26815..3ca5b1eab04 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 18:17+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2013-05-31 10:23+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-01 05:16+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
@@ -58,7 +58,7 @@ msgstr "Добавить подписчиков"
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible"
-msgstr ""
+msgstr "Указать ответственного"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
 msgid "base.action.rule.lead.test"
-msgstr ""
+msgstr "base.action.rule.lead.test"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
@@ -142,7 +142,7 @@ msgstr "Часы"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "To create a new filter:"
-msgstr ""
+msgstr "Для создания нового фильтра:"
 
 #. module: base_action_rule
 #: field:base.action.rule,active:0
@@ -167,7 +167,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Filter Condition"
-msgstr ""
+msgstr "Условие фильтра"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -216,7 +216,7 @@ msgstr "Тип задержки"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server actions to run"
-msgstr ""
+msgstr "Действия сервера для запуска"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -246,7 +246,7 @@ msgstr "Минуты"
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: base_action_rule
 #: help:base.action.rule,filter_pre_id:0
@@ -310,7 +310,7 @@ msgstr "Действия сервера"
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Тема"
 
 #~ msgid "Set State to"
 #~ msgstr "Уснатовить состояние в"
diff --git a/addons/base_action_rule/tests/base_action_rule_test.py b/addons/base_action_rule/tests/base_action_rule_test.py
index 36c928a84e3..54c72ba0607 100644
--- a/addons/base_action_rule/tests/base_action_rule_test.py
+++ b/addons/base_action_rule/tests/base_action_rule_test.py
@@ -19,8 +19,8 @@ class base_action_rule_test(common.TransactionCase):
             'name': "Lead is in done state",
             'is_default': False,
             'model_id': 'base.action.rule.lead.test',
-            'domain' : "[('state','=','done')]",
-            }, context=context)
+            'domain': "[('state','=','done')]",
+        }, context=context)
 
     def create_filter_draft(self, cr, uid, context=None):
         filter_pool = self.registry('ir.filters')
@@ -40,16 +40,16 @@ class base_action_rule_test(common.TransactionCase):
             'user_id': self.admin,
             }, context=context)
 
-    def create_rule(self, cr, uid, filter_id=False, filter_pre_id=False, context=None):
+    def create_rule(self, cr, uid, kind, filter_id=False, filter_pre_id=False, context=None):
         """
             The "Rule 1" says that when a lead goes to the 'draft' state, the responsible for that lead changes to user "demo"
         """
         return self.base_action_rule.create(cr,uid,{
-            'name' : "Rule 1",
+            'name': "Rule 1",
             'model_id': self.registry('ir.model').search(cr, uid, [('model','=','base.action.rule.lead.test')], context=context)[0],
-            'active' : 1,
-            'filter_pre_id' : filter_pre_id,
-            'filter_id' : filter_id,
+            'kind': kind,
+            'filter_pre_id': filter_pre_id,
+            'filter_id': filter_id,
             'act_user_id': self.demo,
             }, context=context)
 
@@ -64,7 +64,7 @@ class base_action_rule_test(common.TransactionCase):
         """
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
-        self.create_rule(cr, uid, filter_pre_id=filter_draft)
+        self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft)
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
@@ -73,11 +73,11 @@ class base_action_rule_test(common.TransactionCase):
 
     def test_01_check_to_state_draft_post(self):
         """
-        Check that a new record (with state = draft) changes its responsible when there is a postcondition filter which check that the state is draft.
+        Check that a new record changes its responsible when there is a postcondition filter which check that the state is draft.
         """
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
-        self.create_rule(cr, uid, filter_id=filter_draft)
+        self.create_rule(cr, uid, 'on_create')
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
@@ -95,7 +95,7 @@ class base_action_rule_test(common.TransactionCase):
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
         filter_done = self.create_filter_done(cr, uid)
-        self.create_rule(cr, uid, filter_pre_id=filter_draft, filter_id=filter_done)
+        self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft, filter_id=filter_done)
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
@@ -133,7 +133,7 @@ class base_action_rule_test(common.TransactionCase):
         cr, uid = self.cr, self.uid
         filter_draft = self.create_filter_draft(cr, uid)
         filter_done = self.create_filter_done(cr, uid)
-        self.create_rule(cr, uid, filter_pre_id=filter_draft, filter_id=filter_done)
+        self.create_rule(cr, uid, 'on_write', filter_pre_id=filter_draft, filter_id=filter_done)
         new_lead_id = self.create_lead_test_1(cr, uid)
         new_lead = self.model.browse(cr, uid, new_lead_id)
         self.assertEquals(new_lead.state, 'draft')
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index ca75c9e20fc..896349ec5e6 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -591,7 +591,7 @@ property or property parameter."),
 
         for vals in self.browse(cr, uid, ids, context=context):
             if vals.ref and vals.ref.user_id:
-                mod_obj = self.pool.get(vals.ref._name)
+                mod_obj = self.pool[vals.ref._name]
                 res=mod_obj.read(cr,uid,[vals.ref.id],['duration','class'],context)
                 defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id,'duration':res[0]['duration'],'class':res[0]['class']}
                 mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
@@ -632,7 +632,6 @@ property or property parameter."),
         res = super(calendar_attendee, self).create(cr, uid, vals, context=context)
         return res
 
-calendar_attendee()
 
 class res_alarm(osv.osv):
     """Resource Alarm """
@@ -684,7 +683,7 @@ true, it will allow you to hide the event alarm information without removing it.
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
 
-        model_obj = self.pool.get(model)
+        model_obj = self.pool[model]
         for data in model_obj.browse(cr, uid, ids, context=context):
 
             basic_alarm = data.alarm_id
@@ -754,7 +753,7 @@ true, it will allow you to hide the event alarm information without removing it.
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
-        model_obj = self.pool.get(model)
+        model_obj = self.pool[model]
         for data in model_obj.browse(cr, uid, ids, context=context):
             alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', data.id)])
             if alarm_ids:
@@ -763,7 +762,6 @@ true, it will allow you to hide the event alarm information without removing it.
                             where id=%%s' % model_obj._table,(data.id,))
         return True
 
-res_alarm()
 
 class calendar_alarm(osv.osv):
     _name = 'calendar.alarm'
@@ -853,13 +851,15 @@ class calendar_alarm(osv.osv):
         for alarm in self.browse(cr, uid, alarm_ids, context=context):
             next_trigger_date = None
             update_vals = {}
-            model_obj = self.pool.get(alarm.model_id.model)
+            model_obj = self.pool[alarm.model_id.model]
             res_obj = model_obj.browse(cr, uid, alarm.res_id, context=context)
             re_dates = []
 
             if hasattr(res_obj, 'rrule') and res_obj.rrule:
                 event_date = datetime.strptime(res_obj.date, '%Y-%m-%d %H:%M:%S')
-                recurrent_dates = get_recurrent_dates(res_obj.rrule, res_obj.exdate, event_date, res_obj.exrule)
+                #exdate is a string and we need a list
+                exdate = res_obj.exdate and res_obj.exdate.split(',') or []
+                recurrent_dates = get_recurrent_dates(res_obj.rrule, exdate, event_date, res_obj.exrule)
 
                 trigger_interval = alarm.trigger_interval
                 if trigger_interval == 'days':
@@ -916,7 +916,6 @@ From:
             self.write(cr, uid, [alarm.id], update_vals)
         return True
 
-calendar_alarm()
 
 
 class calendar_event(osv.osv):
@@ -1608,7 +1607,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         """
         return self.write(cr, uid, ids, {'state': 'confirmed'}, context)
 
-calendar_event()
 
 class calendar_todo(osv.osv):
     """ Calendar Task """
@@ -1657,7 +1655,6 @@ class calendar_todo(osv.osv):
     __attribute__ = {}
 
 
-calendar_todo()
 
 
 class ir_values(osv.osv):
@@ -1702,7 +1699,6 @@ class ir_values(osv.osv):
         return super(ir_values, self).get(cr, uid, key, key2, new_model, \
                          meta, context, res_id_req, without_user, key2_req)
 
-ir_values()
 
 class ir_model(osv.osv):
 
@@ -1728,7 +1724,6 @@ class ir_model(osv.osv):
                 val['id'] = base_calendar_id2real_id(val['id'])
         return isinstance(ids, (str, int, long)) and data[0] or data
 
-ir_model()
 
 original_exp_report = openerp.service.report.exp_report
 
diff --git a/addons/base_calendar/base_calendar_data.xml b/addons/base_calendar/base_calendar_data.xml
index 727a0703db2..64aa7ba59b6 100644
--- a/addons/base_calendar/base_calendar_data.xml
+++ b/addons/base_calendar/base_calendar_data.xml
@@ -126,7 +126,7 @@
             <field name="name">Run Event Reminder</field>
             <field eval="True" name="active" />
             <field name="user_id" ref="base.user_root" />
-            <field name="interval_number">1</field>
+            <field name="interval_number">5</field>
             <field name="interval_type">minutes</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 6010f5ccfca..aa476002abc 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -135,7 +135,7 @@ class mail_message(osv.osv):
 
     def _find_allowed_model_wise(self, cr, uid, doc_model, doc_dict, context=None):
         if doc_model == 'crm.meeting':
-            for virtual_id in self.pool.get(doc_model).get_recurrent_ids(cr, uid, doc_dict.keys(), [], context=context):
+            for virtual_id in self.pool[doc_model].get_recurrent_ids(cr, uid, doc_dict.keys(), [], context=context):
                 doc_dict.setdefault(virtual_id, doc_dict[get_real_ids(virtual_id)])
         return super(mail_message, self)._find_allowed_model_wise(cr, uid, doc_model, doc_dict, context=context)
 
diff --git a/addons/base_calendar/i18n/es_MX.po b/addons/base_calendar/i18n/es_MX.po
index fcb00c6d478..9a2fe449d37 100644
--- a/addons/base_calendar/i18n/es_MX.po
+++ b/addons/base_calendar/i18n/es_MX.po
@@ -1,929 +1,879 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 01:17+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 15:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "El evento comienza"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Hourly"
-msgstr "Cada hora"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Required to Join"
-msgstr "Requerido para unirse"
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
 #: help:calendar.todo,exdate:0
+#: help:crm.meeting,exdate:0
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
-"Esta propiedad define la lista de excepciones de fecha/hora para un evento "
-"de calendario recurrente."
 
 #. module: base_calendar
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-"La compañía seleccionada no está en las compañías permitidas para este "
-"usuario"
-
-#. module: base_calendar
-#: field:calendar.event.edit.all,name:0
-msgid "Title"
-msgstr "Título"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
-msgid "Monthly"
-msgstr "Mensual"
+#: selection:crm.meeting,rrule_type:0
+msgid "Week(s)"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invited User"
-msgstr "Usuario invitado"
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+#: field:crm.meeting,we:0
+msgid "Wed"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation"
-msgstr "Invitación"
+#: selection:calendar.attendee,cutype:0
+msgid "Unknown"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,recurrency:0
 #: help:calendar.todo,recurrency:0
+#: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr "Reunión periódica"
+msgstr ""
+
+#. module: base_calendar
+#: model:crm.meeting.type,name:base_calendar.categ_meet5
+msgid "Feedback Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
 msgid "Alarms"
-msgstr "Alarmas"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "Domingo"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,role:0
 msgid "Role"
-msgstr "Rol"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Invitation details"
-msgstr "Detalles de la invitación"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr "Cuarto"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,show_as:0
-#: field:calendar.todo,show_as:0
-msgid "Show as"
-msgstr "Mostrar como"
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "Users"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,day:0
-#: selection:base.calendar.set.exrule,select1:0
 #: field:calendar.event,day:0
 #: selection:calendar.event,select1:0
 #: field:calendar.todo,day:0
 #: selection:calendar.todo,select1:0
+#: field:crm.meeting,day:0
+#: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "Día del mes"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
+#: selection:crm.meeting,class:0
 msgid "Public"
-msgstr "Público"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid " "
-msgstr " "
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "March"
-msgstr "Marzo"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:414
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+#: field:crm.meeting,message_unread:0
+msgid "Unread Messages"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "Viernes"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
 #: field:calendar.todo,allday:0
+#: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr "Todo el día"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,select1:0
-#: field:calendar.event,select1:0
-#: field:calendar.todo,select1:0
-msgid "Option"
-msgstr "Opción"
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+#: field:crm.meeting,vtimezone:0
+msgid "Timezone"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
-#: selection:res.users,availability:0
+#: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr "Libre"
+msgstr ""
+
+#. module: base_calendar
+#: help:crm.meeting,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr "Indica si es requerida la confirmación de una respuesta."
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.adjunto"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
 msgid "The users that the original request was delegated to"
-msgstr "Los usuarios a los que les fue delegado la petición original"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr "Ref. evento"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,we:0
-#: field:calendar.event,we:0
-#: field:calendar.todo,we:0
-msgid "Wed"
-msgstr "Mié"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Show Time as"
-msgstr "Mostrar hora como"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,tu:0
 #: field:calendar.event,tu:0
 #: field:calendar.todo,tu:0
+#: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "Mar"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Yearly"
-msgstr "Anualmente"
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
+msgid "Third"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "El evento finaliza"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr "Última"
+msgstr ""
 
 #. module: base_calendar
-#: help:calendar.attendee,state:0
-msgid "Status of the attendee's participation"
-msgstr "Estado de la participación de los asistentes"
+#: help:crm.meeting,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr "Sala"
+#: field:crm.meeting,message_ids:0
+msgid "Messages"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Days"
-msgstr "Días"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
-msgid "Invitation Detail"
-msgstr "Detalle de la invitación"
+msgid "To"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1355
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#: code:addons/base_calendar/base_calendar.py:1260
 #, python-format
 msgid "Error!"
-msgstr "¡Error!"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Chair Person"
-msgstr "Presidente"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "My Meetings"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr "Procedimiento"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Cancelled"
-msgstr "Cancelada"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
-msgstr "Minutos"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Display"
-msgstr "Mostrar"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event.edit.all:0
-msgid "Edit all Occurrences"
-msgstr "Editar todas las ocurrencias"
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation type"
-msgstr "Tipo de invitación"
+#: view:crm.meeting:0
+msgid "Mail To"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Secondly"
-msgstr "En segundo lugar"
+#: field:crm.meeting,name:0
+msgid "Meeting Subject"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
-msgid "Event Date"
-msgstr "Fecha evento"
+msgid "End of Recurrence"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: base_calendar
-#: help:base_calendar.invite.attendee,email:0
-msgid "Provide external email address who will receive this invitation."
 msgstr ""
-"Proporcione las direcciones de correo externas de quienes recibiran esta "
-"invitacion."
 
 #. module: base_calendar
-#: model:ir.module.module,description:base_calendar.module_meta_information
-msgid ""
-"Full featured calendar system that supports:\n"
-"    - Calendar of events\n"
-"    - Alerts (create requests)\n"
-"    - Recurring events\n"
-"    - Invitations to people"
+#: view:calendar.event:0
+msgid "Recurrency Option"
 msgstr ""
-"Completo sistema de calendario que soporta:\n"
-"    - Calendario de eventos\n"
-"    - Alertas (crea peticiones)\n"
-"    - Eventos recursivos\n"
-"    - Invitación de personas"
 
 #. module: base_calendar
-#: help:calendar.attendee,cutype:0
-msgid "Specify the type of Invitation"
-msgstr "Especifique el tipo de invitación"
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Years"
-msgstr "Años"
+#: view:crm.meeting:0
+#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
+msgid "Meetings"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
+msgid "Recurrent ID date"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "Fecha del final del evento"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr "Participación opcional"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,date_deadline:0
-#: field:calendar.todo,date_deadline:0
-msgid "Deadline"
-msgstr "Fecha límite"
+#: help:crm.meeting,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:385
-#: code:addons/base_calendar/base_calendar.py:1088
-#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:441
+#: code:addons/base_calendar/base_calendar.py:1013
+#: code:addons/base_calendar/base_calendar.py:1015
+#: code:addons/base_calendar/base_calendar.py:1460
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,active:0
 #: help:calendar.todo,active:0
+#: help:crm.meeting,active:0
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
-"Si el campo activo se establece a verdadero, se omitirá la alarma del "
-"evento, sin embargo no se eliminará."
 
 #. module: base_calendar
-#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
-msgid "Basic Calendar Functionality"
-msgstr "Funcionalidad básica del calendario"
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:crm.meeting,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
 #: field:calendar.event,organizer_id:0
 #: field:calendar.todo,organizer:0
 #: field:calendar.todo,organizer_id:0
+#: field:crm.meeting,organizer:0
+#: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr "Organizador"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
+#: field:crm.meeting,user_id:0
 msgid "Responsible"
-msgstr "Responsable"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: model:res.request.link,name:base_calendar.request_link_meeting
+#: model:res.request.link,name:base_calendar.request_link_event
 msgid "Event"
-msgstr "Evento"
-
-#. module: base_calendar
-#: help:calendar.event,edit_all:0
-#: help:calendar.todo,edit_all:0
-msgid "Edit all Occurrences  of recurrent Meeting."
-msgstr "Editar todas las ocurrencias de la reunión recurrente."
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "Before"
-msgstr "Antes de"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
+#: field:crm.meeting,date_open:0
+#: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
-msgid "Edit all events"
-msgstr "Editar todos los eventos"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,attendee_ids:0
 #: field:calendar.event,attendee_ids:0
+#: field:calendar.event,partner_ids:0
 #: field:calendar.todo,attendee_ids:0
+#: field:calendar.todo,partner_ids:0
+#: field:crm.meeting,attendee_ids:0
+#: field:crm.meeting,partner_ids:0
 msgid "Attendees"
-msgstr "Asistentes"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_todo
 msgid "Calendar Task"
-msgstr "Calendario de tareas"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,su:0
 #: field:calendar.event,su:0
 #: field:calendar.todo,su:0
+#: field:crm.meeting,su:0
 msgid "Sun"
-msgstr "Dom"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,cutype:0
 msgid "Invite Type"
-msgstr "Tipo de invitación"
-
-#. module: base_calendar
-#: help:calendar.attendee,partner_id:0
-msgid "Partner related to contact"
-msgstr "Partner relacionado con el contacto"
+msgstr ""
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
-msgstr "Detalles del recordatorio"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,parent_ids:0
 msgid "Delegrated From"
-msgstr "Delegado desde"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,select1:0
 #: selection:calendar.event,select1:0
 #: selection:calendar.todo,select1:0
+#: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr "Día del mes"
-
-#. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,location:0
-#: field:calendar.event.edit.all,location:0
-#: field:calendar.todo,location:0
-msgid "Location"
-msgstr "Lugar"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,send_mail:0
-msgid "Send mail?"
-msgstr "¿Enviar email?"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,email:0
-#: selection:calendar.alarm,action:0
-#: field:calendar.attendee,email:0
-msgid "Email"
-msgstr "Correo electrónico"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Event Detail"
-msgstr "Detalles del evento"
-
-#. module: base_calendar
-#: selection:calendar.alarm,state:0
-msgid "Run"
-msgstr "Ejecutar"
-
-#. module: base_calendar
-#: field:calendar.event,exdate:0
-#: field:calendar.todo,exdate:0
-msgid "Exception Date/Times"
-msgstr "Fecha/horas excepción"
-
-#. module: base_calendar
-#: selection:calendar.event,class:0
-#: selection:calendar.todo,class:0
-msgid "Confidential"
-msgstr "Confidencial"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,end_date:0
-#: field:calendar.event,end_date:0
-#: field:calendar.todo,end_date:0
-msgid "Repeat Until"
-msgstr "Repetir hasta"
-
-#. module: base_calendar
-#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
-msgid ""
-"Create specific calendar alarms that may be assigned to calendar events or "
-"meetings."
 msgstr ""
-"Crear alarmas específicas que puedan ser asignadas a eventos de calendario o "
-"reuniones."
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "Visibility"
-msgstr "Visibilidad"
+#: field:crm.meeting,message_follower_ids:0
+msgid "Followers"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.attendee,rsvp:0
-msgid "Required Reply?"
-msgstr "¿Respuesta requerida?"
-
-#. module: base_calendar
-#: field:calendar.event,base_calendar_url:0
-#: field:calendar.todo,base_calendar_url:0
-msgid "Caldav URL"
-msgstr "URL de caldav"
-
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "Select range to Exclude"
-msgstr "Elija el rango a excluir"
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-msgid "Recurrent ID"
-msgstr "ID recurrente"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
-#: selection:calendar.event,month_list:0
-#: selection:calendar.todo,month_list:0
-msgid "July"
-msgstr "Julio"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: selection:calendar.attendee,state:0
-msgid "Accepted"
-msgstr "Aceptada"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,th:0
-#: field:calendar.event,th:0
-#: field:calendar.todo,th:0
-msgid "Thu"
-msgstr "Jue"
-
-#. module: base_calendar
-#: field:calendar.attendee,child_ids:0
-msgid "Delegrated To"
-msgstr "Delegada en"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Required Reply"
-msgstr "Respuesta requerida"
-
-#. module: base_calendar
-#: selection:calendar.event,end_type:0
-#: selection:calendar.todo,end_type:0
-msgid "Forever"
-msgstr "Siempre"
+#: field:calendar.event,location:0
+#: field:calendar.todo,location:0
+#: field:crm.meeting,location:0
+msgid "Location"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr "Participación  requerida"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Cancel"
-msgstr "_Cancelar"
+#: view:calendar.event:0
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+#: field:crm.meeting,show_as:0
+msgid "Show Time as"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1015
+#, python-format
+msgid "Count cannot be negative or 0."
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+#: model:ir.model,name:base_calendar.model_crm_meeting
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+#: field:crm.meeting,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+#: field:crm.meeting,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Meeting Details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/crm_meeting.py:102
+#, python-format
+msgid "The following contacts have no email address :"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Year(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting.type:0
+#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting_type
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_type
+msgid "Meeting Types"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
 msgid "Created"
-msgstr "Creada"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
-msgid "Private"
-msgstr "Privada"
+#: selection:crm.meeting,class:0
+msgid "Public for Employees"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Daily"
-msgstr "Diariamente"
+#: view:crm.meeting:0
+msgid "hours"
+msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:385
-#, python-format
-msgid "Can not Duplicate"
-msgstr "No se puede duplicar"
-
-#. module: base_calendar
-#: field:calendar.event,class:0
-#: field:calendar.todo,class:0
-msgid "Mark as"
-msgstr "Marcar como"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: field:calendar.attendee,partner_address_id:0
-msgid "Contact"
-msgstr "Contacto"
-
-#. module: base_calendar
-#: help:calendar.event,rrule_type:0
-#: help:calendar.todo,rrule_type:0
-msgid "Let the event automatically repeat at that interval"
-msgstr "Permite que el evento se repita automáticamente en ese intervalo"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,partner_id:0
-#: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+msgid "Contact"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: selection:base_calendar.invite.attendee,type:0
-msgid "Partner Contacts"
-msgstr "Contactos de la empresa"
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Ok"
-msgstr "_Aceptar"
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+#: field:crm.meeting,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Options"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "First"
-msgstr "Primera"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Privacy"
-msgstr "Privacidad"
-
-#. module: base_calendar
-#: field:calendar.event,vtimezone:0
-#: field:calendar.todo,vtimezone:0
-msgid "Timezone"
-msgstr "Zona horaria"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Subject"
-msgstr "Asunto"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "September"
-msgstr "Septiembre"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "December"
-msgstr "Diciembre"
+msgstr ""
 
 #. module: base_calendar
-#: help:base_calendar.invite.attendee,send_mail:0
-msgid "Check this if you want to send an Email to Invited Person"
-msgstr "Marque aquí si quiere enviar un correo a la persona invitada"
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,categ_ids:0
+msgid "Tags"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr "Disponibilidad"
-
-#. module: base_calendar
-#: view:calendar.event.edit.all:0
-msgid "_Save"
-msgstr "_Guardar"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr "Individual"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,count:0
 #: help:calendar.todo,count:0
+#: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr "Repetir x veces"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr "Dueño"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Delegation Info"
-msgstr "Información delegación"
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+#: help:crm.meeting,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event.edit.all,date:0
-msgid "Start Date"
-msgstr "Fecha inicio"
+#: model:ir.ui.menu,name:base_calendar.mail_menu_calendar
+msgid "Calendar"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr "Nombre común"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr "Rechazada"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "My Role"
-msgstr "Mi rol"
+#: code:addons/base_calendar/base_calendar.py:1460
+#, python-format
+msgid "Group by date is not supported, use the calendar view instead."
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-msgid "My Events"
-msgstr "Mis eventos"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Decline"
-msgstr "Rechazar"
-
-#. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Weeks"
-msgstr "Semanas"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr "Grupo"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,edit_all:0
-#: field:calendar.todo,edit_all:0
-msgid "Edit All"
-msgstr "Editar todo"
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+#: selection:crm.meeting,class:0
+msgid "Private"
+msgstr ""
 
 #. module: base_calendar
-#: field:base_calendar.invite.attendee,contact_ids:0
-msgid "Contacts"
-msgstr "Contactos"
+#: view:calendar.event:0
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+#: field:crm.meeting,class:0
+msgid "Privacy"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr "Información sobre la alarma básica"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,fr:0
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
+#: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr "Vie"
+msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-#: selection:res.alarm,trigger_interval:0
-msgid "Hours"
-msgstr "Horas"
-
-#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1090
-#, python-format
-msgid "Count can not be Negative"
-msgstr "La cuenta no puede ser negativa"
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr "Miembro"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
+#: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "Ubicación del evento"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
+#: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr "Regla recurrente"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr "Adjunto"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation From"
-msgstr "Invitación desde"
+#: field:crm.meeting,date_closed:0
+msgid "Closed"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-msgid "End of Recurrency"
-msgstr "Fin de recurrencia"
+msgid "From"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: field:calendar.event.edit.all,alarm_id:0
+#: field:calendar.event,alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:crm.meeting,alarm_id:0
 msgid "Reminder"
-msgstr "Recordatorio"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
-msgid "Set Exrule"
-msgstr "Establecer Exregla"
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+#: selection:crm.meeting,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: base_calendar
+#: model:crm.meeting.type,name:base_calendar.categ_meet2
+msgid "Internal Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr "Eventos"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
-#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
-msgid "Invite Attendees"
-msgstr "Invitar asistentes"
+#: field:calendar.alarm,state:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+#: field:crm.meeting,state:0
+msgid "Status"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr "Email del invitado"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,repeat:0
-#: field:calendar.event,count:0
-#: field:calendar.todo,count:0
-#: field:res.alarm,repeat:0
-msgid "Repeat"
-msgstr "Repetir"
+#: model:crm.meeting.type,name:base_calendar.categ_meet1
+msgid "Customer Meeting"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -931,186 +881,193 @@ msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
 msgstr ""
-"La referencia a la URI que apunta a la información del directorio "
-"correspondiente al participante."
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "August"
-msgstr "Agosto"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr "Lunes"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
-#: selection:calendar.event,byday:0
-#: selection:calendar.todo,byday:0
-msgid "Third"
-msgstr "Tercero"
+#: model:crm.meeting.type,name:base_calendar.categ_meet4
+msgid "Open Discussion"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Models"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "June"
-msgstr "Junio"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
-msgstr "Alarma básica"
-
-#. module: base_calendar
-#: view:base.calendar.set.exrule:0
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
-msgid "The"
-msgstr "El"
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: view:crm.meeting:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,write_date:0
+msgid "Write Date"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr "Delegado desde"
+msgstr ""
+
+#. module: base_calendar
+#: field:crm.meeting,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr "Usuario"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
+#: field:crm.meeting,date:0
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Start Date"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "November"
-msgstr "Noviembre"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr "Indicar los grupos a los que pertenece el asistente"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-msgid "Data"
-msgstr "Datos"
-
-#. module: base_calendar
-#: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr "Lun"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,count:0
-msgid "Count"
-msgstr "Total"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "No Repeat"
-msgstr "No repetir"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "October"
-msgstr "Octubre"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
 #: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+#: view:crm.meeting:0
 msgid "Uncertain"
-msgstr "Incierto"
+msgstr ""
 
 #. module: base_calendar
-#: field:calendar.attendee,language:0
-msgid "Language"
-msgstr "Idioma"
+#: constraint:calendar.event:0
+#: constraint:calendar.todo:0
+#: constraint:crm.meeting:0
+msgid "Error ! End date cannot be set before start date."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr "Disparadores"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "January"
-msgstr "Enero"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr "Relacionado con"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,interval:0
 #: field:calendar.alarm,trigger_interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr "Intervalo"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr "Miércoles"
-
-#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1088
-#, python-format
-msgid "Interval can not be Negative"
-msgstr "El intervalo no puede ser negativo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
+#: field:crm.meeting,message_summary:0
 msgid "Summary"
-msgstr "Resumen"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
 #: field:calendar.event,active:0
 #: field:calendar.todo,active:0
+#: field:crm.meeting,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:399
+#, python-format
+msgid "You cannot duplicate a calendar attendee."
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr "Elija el día del mes en que se repetirá la reunión"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr "Acción"
-
-#. module: base_calendar
-#: help:base_calendar.invite.attendee,type:0
-msgid "Select whom you want to Invite"
-msgstr "Seleccione a quien quiere invitar"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,duration:0
@@ -1119,52 +1076,38 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
-"Duración' y 'Repetir' son ambos opcionales, pero si uno está activo también "
-"debe estarlo el otro"
-
-#. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
-msgid "Calendar Edit all event"
-msgstr "Editar todos los eventos del calendario"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
 msgid "Participation role for the calendar user"
-msgstr "Rol de participación para el usuario del calendario."
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr "Delegado a"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr "Define la acción a invocar cuando salte la alarma"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "Starting at"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
+#: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr "Fecha de fin"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr "Buscar eventos"
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Recurrency Option"
-msgstr "Opción de recurrencia"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Weekly"
-msgstr "Semanal"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1173,87 +1116,70 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
-"Si el campo activo es verdadero, le permitirá ocultar la notificación de "
-"aviso del evento sin eliminarlo."
 
 #. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-msgid "Recurrent ID date"
-msgstr "ID fecha recurrente"
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+#: field:crm.meeting,end_type:0
+msgid "Recurrence Termination"
+msgstr ""
 
 #. module: base_calendar
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
-
-#. module: base_calendar
-#: field:calendar.alarm,state:0
-#: view:calendar.attendee:0
-#: field:calendar.attendee,state:0
-#: view:calendar.event:0
-#: field:calendar.event,state:0
-#: field:calendar.todo,state:0
-msgid "State"
-msgstr "Estado"
+#: view:crm.meeting:0
+msgid "Until"
+msgstr ""
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr "Detalles del recordatorio"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "To Review"
-msgstr "A revisar"
+#: model:crm.meeting.type,name:base_calendar.categ_meet3
+msgid "Off-site Meeting"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,freq:0
-#: field:calendar.event,freq:0
-#: field:calendar.todo,freq:0
-msgid "Frequency"
-msgstr "Frecuencia"
+#: view:crm.meeting:0
+msgid "Day of Month"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr "Hecho"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
 #: help:calendar.todo,interval:0
+#: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Repetir cada (días/semana/mes/año)"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: field:base_calendar.invite.attendee,user_ids:0
-msgid "Users"
-msgstr "Usuarios"
+#: view:crm.meeting:0
+msgid "All Day?"
+msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "of"
-msgstr "de"
-
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
-#: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_res_users
-msgid "res.users"
-msgstr "res.usuarios"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Tuesday"
-msgstr "Martes"
+#: model:ir.actions.act_window,help:base_calendar.action_crm_meeting
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to schedule a new meeting.\n"
+"          </p><p>\n"
+"            The calendar is shared between employees and fully integrated "
+"with\n"
+"            other applications such as the employee holidays or the "
+"business\n"
+"            opportunities.\n"
+"          </p>\n"
+"        "
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1262,129 +1188,103 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
-"Facilita una descripción más completa del componente del calendario que la "
-"facilitada por la propiedad \"RESUMEN\""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr "Usuario responsable"
+msgstr ""
 
 #. module: base_calendar
+#: view:crm.meeting:0
+msgid "Select Weekdays"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1519
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
-#: selection:res.users,availability:0
+#: selection:crm.meeting,show_as:0
+#, python-format
 msgid "Busy"
-msgstr "Ocupado"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr "Evento de calendario"
-
-#. module: base_calendar
-#: selection:calendar.attendee,state:0
-#: selection:calendar.event,state:0
-#: selection:calendar.todo,state:0
-msgid "Tentative"
-msgstr "Provisional"
-
-#. module: base_calendar
-#: field:calendar.event,interval:0
-#: field:calendar.todo,interval:0
-msgid "Repeat every"
-msgstr "Repetir cada"
-
-#. module: base_calendar
-#: selection:calendar.event,end_type:0
-#: selection:calendar.todo,end_type:0
-msgid "Fix amout of times"
-msgstr "Cantidad fija de veces"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,recurrency:0
 #: field:calendar.todo,recurrency:0
+#: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr "Recurrente"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
+#: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr "Recurrencia"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
-#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
-msgid "Event Invitations"
-msgstr "Invitaciones al evento"
-
-#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr "Jueves"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
+#: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr "Regla de excepción"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
 msgid ""
 "To specify the language for text values in aproperty or property parameter."
 msgstr ""
-"Para indicar el idioma de los valores de texto en una propiedad o parámetro "
-"de propiedad."
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr "Detalles"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
 #: help:calendar.todo,exrule:0
+#: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
-"Define una regla o patrón de repetición de tiempo a excluir de la regla "
-"recurrente."
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
+#: field:crm.meeting,month_list:0
 msgid "Month"
-msgstr "Mes"
-
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr "Invitar personas"
-
-#. module: base_calendar
-#: help:calendar.event,rrule:0
-#: help:calendar.todo,rrule:0
-msgid ""
-"Defines a rule or repeating pattern for recurring events\n"
-"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
-"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
-"Define una regla o patrón repetitivo para eventos recurrentes.\n"
-"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
-"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+#: selection:crm.meeting,rrule_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirmed Events"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
 msgid "URI Reference"
-msgstr "Referencia URI"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,description:0
@@ -1393,110 +1293,115 @@ msgstr "Referencia URI"
 #: field:calendar.event,name:0
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
+#: field:crm.meeting,description:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "May"
-msgstr "Mayo"
-
-#. module: base_calendar
-#: field:base_calendar.invite.attendee,type:0
-#: view:calendar.attendee:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Search Invitations"
-msgstr "Buscar invitaciones"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr "Después de"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr "Parar"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr "ir.valores"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_model
-msgid "Objects"
-msgstr "Objetos"
+#: view:crm.meeting:0
+msgid "Search Meetings"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_crm_meeting_type
+msgid "Meeting Type"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr "Delegada"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
+#: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr "Sáb"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "Choose day where repeat the meeting"
-msgstr "Eligir día en el que repetir la cita"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to setup a new alarm type.\n"
+"              </p><p>\n"
+"                You can define a customized type of calendar alarm that may "
+"be\n"
+"                assigned to calendar events or meetings.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,freq:0
-msgid "Minutely"
-msgstr "Cada minuto"
+#: selection:crm.meeting,state:0
+msgid "Unconfirmed"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
 msgstr ""
-"Indique el usuario que está actuando en nombre del usuario del calendario."
 
 #. module: base_calendar
 #: view:calendar.event:0
-#: field:calendar.event.edit.all,date_deadline:0
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+#: field:crm.meeting,date_deadline:0
 msgid "End Date"
-msgstr "Fecha final"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "February"
-msgstr "Febrero"
-
-#. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Months"
-msgstr "Meses"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr "Recurso"
+msgstr ""
 
 #. module: base_calendar
+#: field:crm.meeting.type,name:0
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_alarm
-msgid "Event alarm information"
-msgstr "Información del aviso del evento"
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+#: field:crm.meeting,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1504,154 +1409,162 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
-"Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
-"o contiene el texto a mostrar"
 
 #. module: base_calendar
-#: field:calendar.event,alarm_id:0
-#: field:calendar.event,base_calendar_alarm_id:0
-#: field:calendar.todo,alarm_id:0
-#: field:calendar.todo,base_calendar_alarm_id:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: base_calendar
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
-#, python-format
-msgid "Please Apply Recurrency before applying Exception Rule."
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+#: field:crm.meeting,base_calendar_alarm_id:0
+msgid "Alarm"
 msgstr ""
-"Por favor, aplique la repetición antes de aplicar la excepción de la regla"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr "Enviado por usuario"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
+#: selection:crm.meeting,month_list:0
 msgid "April"
-msgstr "Abril"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/crm_meeting.py:106
+#, python-format
+msgid "Email addresses not found"
+msgstr ""
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Recurrency period"
-msgstr "Periodo de recurrencia"
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
+#: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr "Día de la semana"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1013
+#, python-format
+msgid "Interval cannot be negative."
+msgstr ""
 
 #. module: base_calendar
-#: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
+#: field:crm.meeting,byday:0
 msgid "By day"
-msgstr "Por día"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:441
+#, python-format
+msgid "First you have to specify the date of the invitation."
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr "Modelo"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr "Audio"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
+#: field:crm.meeting,id:0
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr "Con propósito informativo"
+msgstr ""
 
 #. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-msgid "Invite"
-msgstr "Invitar"
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+#: field:crm.meeting,select1:0
+msgid "Option"
+msgstr ""
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr "Información asistentes"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr "ID del registro"
+msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr "Necesita acción"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr "Enviado por"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
+#: field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Secuencia"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
+#: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "Internal User"
-msgstr "Usuario interno"
-
-#. module: base_calendar
-#: view:calendar.attendee:0
 #: view:calendar.event:0
+#: view:crm.meeting:0
 msgid "Accept"
-msgstr "Aceptar"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
+#: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr "Sábado"
+msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation To"
-msgstr "Invitación a"
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+#: field:crm.meeting,interval:0
+msgid "Repeat Every"
+msgstr ""
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr "Segundo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
-#: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr "Libre/Ocupado"
-
-#. module: base_calendar
-#: field:calendar.event,end_type:0
-#: field:calendar.todo,end_type:0
-msgid "Way to end reccurency"
-msgstr "Forma de terminar recurrencia"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1659,20 +1572,16 @@ msgstr "Forma de terminar recurrencia"
 #: field:calendar.event,duration:0
 #: field:calendar.todo,date:0
 #: field:calendar.todo,duration:0
+#: field:crm.meeting,duration:0
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr "Duración"
-
-#. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
-msgstr "Email externo"
+msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr "Fecha activación"
+msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1684,19 +1593,10 @@ msgid ""
 "                    * Points to a procedure resource, which is invoked when  "
 "                    the alarm is triggered for procedure."
 msgstr ""
-"* Apunta a un recurso de sonido, que se escucha cuando la alarma se activa "
-"por audio.\n"
-"* El archivo que está intentando ser enviado como adjunto en el correo "
-"electrónico.\n"
-"* Apunta a un recurso de procedimiento, que se invoca cuando la alarma se "
-"activa por procedimiento."
 
 #. module: base_calendar
-#: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
+#: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr "Quinto"
-
-#~ msgid "Set Exclude range"
-#~ msgstr "Fijar el rango de exclusión"
+msgstr ""
diff --git a/addons/base_crypt/i18n/nl_BE.po b/addons/base_crypt/i18n/nl_BE.po
index 7ad3faa1ef5..d77a3f14b47 100644
--- a/addons/base_crypt/i18n/nl_BE.po
+++ b/addons/base_crypt/i18n/nl_BE.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-07-26 17:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-04-15 16:02+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:49+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "U kunt geen twee gebruikers met dezelfde login maken."
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index 0872af2d0f3..d50ca33ff15 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -181,6 +181,5 @@ class res_partner_bank(osv.osv):
         (_check_bank, '\nPlease define BIC/Swift code on bank for bank type IBAN Account to make valid payments', ['bic'])
     ]
 
-res_partner_bank()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_import/static/lib/select2/README.md b/addons/base_import/static/lib/select2/README.md
old mode 100755
new mode 100644
diff --git a/addons/base_import/static/lib/select2/select2.css b/addons/base_import/static/lib/select2/select2.css
old mode 100755
new mode 100644
diff --git a/addons/base_import/static/lib/select2/select2.js b/addons/base_import/static/lib/select2/select2.js
old mode 100755
new mode 100644
diff --git a/addons/base_import/static/lib/select2/spinner.gif b/addons/base_import/static/lib/select2/spinner.gif
old mode 100755
new mode 100644
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index cdfc7112d09..bc7959a17df 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -20,12 +20,13 @@
 ##############################################################################
 
 import base64
+from StringIO import StringIO
+
+from openerp.modules.module import get_module_resource
 import openerp.modules.registry
 from openerp.osv import osv
 from openerp_sxw2rml import sxw2rml
-from StringIO import StringIO
-from openerp import addons
- 
+
 
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
@@ -36,9 +37,9 @@ class report_xml(osv.osv):
         '''
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
+            fp = open(get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
         if file_type=='odt':
-            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
+            fp = open(get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
         return  {'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))}
 
     def upload_report(self, cr, uid, report_id, file_sxw, file_type, context=None):
@@ -47,9 +48,9 @@ class report_xml(osv.osv):
         '''
         sxwval = StringIO(base64.decodestring(file_sxw))
         if file_type=='sxw':
-            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
+            fp = open(get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_oo2rml.xsl'),'rb')
         if file_type=='odt':
-            fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
+            fp = open(get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
         report = self.pool['ir.actions.report.xml'].write(cr, uid, [report_id], {
             'report_sxw_content': base64.decodestring(file_sxw), 
             'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), 
@@ -75,7 +76,6 @@ class report_xml(osv.osv):
             'report_rml_content': rml_data and base64.encodestring(rml_data) or False
         }
 
-report_xml()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 657eae8fd63..99898f5a703 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -20,7 +20,7 @@
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" invisible="1"/>
-                            <field name="plugin_file" filename="name"/>
+                            <field name="plugin_file" filename="name" widget="url"/>
                             <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>
                         </group>
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
index bfda6e7a30f..7fddc27f037 100644
--- a/addons/base_report_designer/installer.py
+++ b/addons/base_report_designer/installer.py
@@ -23,7 +23,6 @@ from openerp.osv import fields
 from openerp.osv import osv
 import base64
 from openerp.tools.translate import _
-from openerp import addons
 
 class base_report_designer_installer(osv.osv_memory):
     _name = 'base_report_designer.installer'
@@ -31,13 +30,13 @@ class base_report_designer_installer(osv.osv_memory):
 
     def default_get(self, cr, uid, fields, context=None):
         data = super(base_report_designer_installer, self).default_get(cr, uid, fields, context=context)
-        plugin_file = open(addons.get_module_resource('base_report_designer','plugin', 'openerp_report_designer.zip'),'rb')
-        data['plugin_file'] = base64.encodestring(plugin_file.read())
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        data['plugin_file'] = base_url + '/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip'
         return data
 
     _columns = {
         'name':fields.char('File name', size=34),
-        'plugin_file':fields.binary('OpenObject Report Designer Plug-in', readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
+        'plugin_file':fields.char('OpenObject Report Designer Plug-in', size=256, readonly=True, help="OpenObject Report Designer plug-in file. Save as this file and install this plug-in in OpenOffice."),
         'description':fields.text('Description', readonly=True)
     }
 
@@ -58,6 +57,5 @@ class base_report_designer_installer(osv.osv_memory):
             4. if your connection success, A message appears like 'You can start creating your report in current document.'.
         """
     }
-base_report_designer_installer()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl b/addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl
index 50ffb3d81be..9f9e5050d69 100644
--- a/addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl
+++ b/addons/base_report_designer/openerp_sxw2rml/normalized_odt2rml.xsl
@@ -414,7 +414,7 @@
               <xsl:value-of select="$size" />
             </xsl:attribute>
           </xsl:if>
-          <seq id="{../../@text:style-name}"/>.</bullet>
+          <seq id="{../../@text:style-name}"/></bullet>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:if>
diff --git a/addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl b/addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl
index 66ef0b5b53c..ae68ae1ed1b 100644
--- a/addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl
+++ b/addons/base_report_designer/openerp_sxw2rml/normalized_oo2rml.xsl
@@ -414,7 +414,7 @@
               <xsl:value-of select="$size" />
             </xsl:attribute>
           </xsl:if>
-          <seq id="{../../@text:style-name}"/>.</bullet>
+          <seq id="{../../@text:style-name}"/></bullet>
 
       </xsl:otherwise>
     </xsl:choose>
diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
old mode 100644
new mode 100755
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
index 43b452b82e2..9fb6cd11219 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 from com.sun.star.task import XJobExecutor
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index ba69174ffc6..2dce1750e34 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import os
 import uno
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index b85a9d9bb06..e0b66780e8b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
@@ -72,7 +49,7 @@ class Change( unohelper.Base, XJobExecutor ):
             'XML-RPC': 'http://',
             'XML-RPC secure': 'https://',
             'NET-RPC': 'socket://',
-        }  
+        }
         host=port=protocol=''
         if docinfo.getUserFieldValue(0):
             m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$',  docinfo.getUserFieldValue(0) or '')
@@ -80,7 +57,7 @@ class Change( unohelper.Base, XJobExecutor ):
             port = m.group(3)
             protocol = m.group(1)
         if  protocol:
-            for (key, value) in self.protocol.iteritems(): 
+            for (key, value) in self.protocol.iteritems():
                 if value==protocol:
                     protocol=key
                     break
@@ -102,7 +79,7 @@ class Change( unohelper.Base, XJobExecutor ):
         self.win.addButton( 'btnNext', -2, -5, 30, 15, 'Next', actionListenerProc = self.btnNext_clicked )
 
         self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
-       
+
         for i in self.protocol.keys():
             self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
         self.win.doModalDialog( "lstProtocol",  protocol)
@@ -110,27 +87,27 @@ class Change( unohelper.Base, XJobExecutor ):
     def btnNext_clicked(self, oActionEvent):
         global url
         aVal=''
-        #aVal= Fetature used 
+        #aVal= Fetature used
         try:
             url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
             self.sock=RPCSession(url)
             desktop=getDesktop()
             doc = desktop.getCurrentComponent()
-            docinfo=doc.getDocumentInfo()        
+            docinfo=doc.getDocumentInfo()
             docinfo.setUserFieldValue(0,url)
             res=self.sock.listdb()
             self.win.endExecute()
             ServerParameter(aVal,url)
         except :
-            import traceback,sys 
+            import traceback,sys
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
-            self.logobj.log_write('ServerParameter', LOG_ERROR, info)     
+            self.logobj.log_write('ServerParameter', LOG_ERROR, info)
             ErrorDialog("Connection to server is fail. Please check your Server Parameter.", "", "Error!")
             self.win.endExecute()
-                 
+
     def btnCancel_clicked(self,oActionEvent):
         self.win.endExecute()
-        
+
 
 if __name__<>"package" and __name__=="__main__":
     Change(None)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index c1fa8b22a85..17cc25687b1 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import unohelper
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index ffa88a8cd06..b8abcb1dc6c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import unohelper
@@ -81,7 +57,7 @@ class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
 if __name__<>"package":
     ConvertFieldsToBraces(None)
 else:
-    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),) 
+    g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index d2605ce73e4..a12becdc68c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import os
 import uno
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index 9e3b175b67b..896a5954c7d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index 90f85e57a0d..8ed4d2c25e8 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -1,50 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
-
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
index 85059d7712c..11c74555447 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 if __name__<>"package":
     from ServerParameter import *
     from lib.gui import *
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
index bc7d439c76d..ef1d3548a6e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index 138c68b690e..3c6316d9fdb 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index f5e0972d2dd..b6edaecdc44 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index 7e83910a427..dbd0a51d66d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
@@ -201,7 +177,7 @@ class SendtoServer(unohelper.Base, XJobExecutor):
             if self.win.getListBoxSelectedItem("lstResourceType")=='OpenOffice':
                 params['report_type']=file_type
             self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'write', int(docinfo.getUserFieldValue(2)), params)
-            
+
             # Call upload_report as the *last* step, as it will call register_all() and cause the report service
             # to be loaded - which requires all the data to be correct in the database
             self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'upload_report', int(docinfo.getUserFieldValue(2)),base64.encodestring(data),file_type,{})
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index c399634bfe5..b09b02699b0 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import uno
 import string
 import unohelper
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
index 05f81a5c5b2..132882e0932 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import uno
 import string
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
index 0ccd1c9d011..d7f93351fac 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/__init__.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import Expression
 import lib
 import Fields
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
index 4740c61b178..897f9abd00c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/compile_all.py
@@ -1,49 +1,26 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
+
 import compileall
 
 compileall.compile_dir('package')
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
index 8511bb8343d..cf82d0e1a76 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/actions.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
index cb86f5f429a..f44404eaa16 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
index 1d10f0f6a4c..52af0821790 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
index d75469ca658..92b5ab750ca 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/gui.py
@@ -1,47 +1,23 @@
 ##########################################################################
 #
-# Portions of this file are under the following copyright and license:
+# Copyright (c) 2003-2004 Danny Brewer   d29583@groovegarden.com
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library is distributed in the hope that it will be useful, 
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-# 
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
+# See:  http://www.gnu.org/licenses/lgpl.html
 #
 ##############################################################################
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
index 60edbc71d96..f8d90c30d75 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -1,49 +1,25 @@
-##########################################################################
+#########################################################################
 #
-# Portions of this file are under the following copyright and license:
+#  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
+#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License, or (at your option) any later version.
 #
-#   Copyright (c) 2003-2004 Danny Brewer
-#   d29583@groovegarden.com
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
 #
-#   This library is free software; you can redistribute it and/or
-#   modify it under the terms of the GNU Lesser General Public
-#   License as published by the Free Software Foundation; either
-#   version 2.1 of the License, or (at your option) any later version.
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-#   This library is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#   Lesser General Public License for more details.
+#  See:  http://www.gnu.org/licenses/lgpl.html
 #
-#   You should have received a copy of the GNU Lesser General Public
-#   License along with this library; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#   See:  http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-#    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#############################################################################
 
 import re
 import uno
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip
similarity index 100%
rename from addons/base_report_designer/plugin/openerp_report_designer.zip
rename to addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 838f591a2f4..e8ed45e7ce1 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -54,7 +54,6 @@ class base_report_sxw(osv.osv_memory):
             'target': 'new',
         }
 
-base_report_sxw()
 
 class base_report_file_sxw(osv.osv_memory):
     """Base Report File sxw """
@@ -116,7 +115,6 @@ class base_report_file_sxw(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'target': 'new',
         }
-base_report_file_sxw()
 
 class base_report_rml_save(osv.osv_memory):
     """Base Report file Save"""
@@ -146,6 +144,5 @@ class base_report_rml_save(osv.osv_memory):
          'file_rml':fields.binary('Save As'),
          }
 
-base_report_rml_save()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index f22fd2c8adc..518ada07a5c 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-01 11:22+0000\n"
+"PO-Revision-Date: 2013-04-26 16:24+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Emails Integration"
-msgstr ""
+msgstr "E-mailintegratie"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -29,18 +29,19 @@ msgstr "Gast"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactpersonen"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Gebruik externe verificatieproviders. Meld aan met Google, Facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -54,11 +55,19 @@ msgid ""
 "OpenERP using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"OpenERP maakt het mogelijk om automatisch leads (of andere documenten)\n"
+"                             aan te maken op basis van inkomende e-mails. U "
+"kunt automatisch e-mails synchroniseren met OpenERP\n"
+"                            met behulp van reguliere POP / IMAP-accounts, "
+"via een direct e-mailintegratiescript voor uw\n"
+"                            e-mailserver, of door zelf uw e-mails naar "
+"OpenERP te sturen met behulp van specifieke\n"
+"                            plug-ins voor uw favoriete e-mailprogramma."
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
 msgid "SALE"
-msgstr ""
+msgstr "VERKOOP"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -68,24 +77,24 @@ msgstr "Lid"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Portaaltoegang"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "Verificatie"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Offertes en verkooporders"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "Algemeen"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -95,12 +104,12 @@ msgstr "Donor"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "Relatiebeheer"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -110,32 +119,32 @@ msgstr "Patiënt"
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Gebruikers mogen gegevens importeren uit csv-bestanden"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "Meerdere bedrijven beheren"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
-msgstr ""
+msgstr "Op e-mailclient"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "--db-filter=YOUR_DATABAE"
-msgstr ""
+msgstr "--db-filter=UW_DATABASE"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Haal contactpersonen op uit LinkedIn"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
 msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Activeer de Thunderbirdplug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -145,22 +154,22 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "Klantenopties"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "Verkoopopties"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
 msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Activeer de Outlookplug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -179,7 +188,7 @@ msgstr "Huurder"
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Gelijk welk scherm van OpenERP delen of insluiten"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -192,6 +201,8 @@ msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Als u een nieuwe contactpersoon maakt (persoon of bedrijf), kunt u alle "
+"gegevens van LinkedIn laden (foto, adres, enz.)"
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -200,6 +211,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Werken in omgevingen met meerdere bedrijven, met de nodige "
+"toegangsbeveiliging tussen de bedrijven.\n"
+"                Hiermee installeert u de module multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -208,6 +222,9 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Het openbare portaal is alleen toegankelijk als u zich in een enkele "
+"databasemodus bevindt. U kunt\n"
+"                                    de OpenERP-server starten met de optie"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -215,11 +232,13 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"U vindt meer opties bij de bedrijfsgegevens: adres voor de kop- en "
+"voettekst, teksten voor achterstallige betalingen, enz."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -238,6 +257,12 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Wanneer u een document naar een klant stuurt,\n"
+"                                    (offerte, factuur), kan uw klant\n"
+"                                    aanmelden en zijn documenten bekijken,\n"
+"                                    uw bedrijfsnieuws lezen, zijn projecten "
+"controleren,\n"
+"                                    enz."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -253,6 +278,8 @@ msgstr "Cliënt"
 #: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
+"Activeer het openbare deel van OpenERP; OpenERP wordt hiermee een openbare "
+"website."
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -265,6 +292,13 @@ msgid ""
 "                Partner from the selected emails.\n"
 "                This installs the module plugin_thunderbird."
 msgstr ""
+"Met de plug-in kunt u e-mails met bijlagen koppelen aan de geselecteerde\n"
+"                OpenERP-objecten. U kunt een relatie of een lead kiezen en\n"
+"                de gekozen e-mail koppelen als een .eml-bestand als bijlage\n"
+"                aan het geselecteerde record. U kunt documenten aanmaken "
+"voor CRM-lead\n"
+"                en relaties vanuit de geselecteerde e-mails. Hiermee "
+"installeert u de module plugin_thunderbird."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -280,7 +314,7 @@ msgstr "Gebruik een andere benaming voor Klant"
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Verkoop instellen"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -293,16 +327,23 @@ msgid ""
 "                email into an OpenERP mail message with attachments.\n"
 "                This installs the module plugin_outlook."
 msgstr ""
+"Met de Outlookplug-in kunt u een object selecteren dat u wilt toevoegen\n"
+"                aan uw e-mail en de bijlagen van MS Outlook. U kunt een "
+"relatie \n"
+"                of een lead kiezen en de geselecteerde e-mail archiveren in "
+"een\n"
+"                OpenERP-mailbericht met bijlagen.\n"
+"                Hiermee installeert u de module plugin_outlook."
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Opties"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer portal"
-msgstr ""
+msgstr "Klantenportaal activeren"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -311,36 +352,37 @@ msgid ""
 "                                    Once activated, the login page will be "
 "replaced by the public website."
 msgstr ""
+"Na activering zal de aanmeldpagina worden vervangen door de openbare website."
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Sta het delen van documenten toe"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+msgstr "(bedrijfsnieuws, vacatures, contactformulier, enz.)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Openbare portaal activeren"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Uitgaande e-mailservers instellen"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Integratie sociale netwerken"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Geef uw klanten toegang tot hun documenten."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -352,7 +394,7 @@ msgstr "Afbreken"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Toepassen"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -363,12 +405,12 @@ msgstr "Kies uw terminologie"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Uw bedrijfsgegevens instellen"
 
 #~ msgid "Logo"
 #~ msgstr "Logo"
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index bfc0807f019..93f65355baa 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 10:09+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2013-05-27 12:19+0000\n"
+"Last-Translator: leksei <lirgus@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:12+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -41,6 +41,8 @@ msgstr "base.config.settings"
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Использовать внешние сервисы аутентификации, например, вход через google, "
+"facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -68,7 +70,7 @@ msgstr "Участник"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Доступ к порталу"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -192,6 +194,9 @@ msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Когда вы создаете новый контакт (человека или компанию), у вас есть "
+"возможность загрузить из LinkedIn всю информацию о нем (адреса, фотографии и "
+"т.д.)"
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -200,6 +205,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Работать в режиме Мульти-компании, с соответствующими правами доступа между "
+"компаниями.\n"
+"                Будет установлен модуль multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -208,6 +216,9 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Публичный портал доступен только при использовании одной базы данных. Вы "
+"можете\n"
+"                                    запустить сервер OpenERP с этой опцией"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -215,6 +226,8 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"Больше опций вы можете найти в настройках компании: адреса для "
+"верхнего/нижнего колонтитула, тексты для просроченных платежей и т.д."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
@@ -238,6 +251,14 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Когда вы отправляете заказчику документы\n"
+"                                    (прайсы, счета), для их получения он "
+"сможет\n"
+"                                    войти на портал, где так же сможет "
+"прочитать\n"
+"                                    новости вашей компании, узнать "
+"обновления по\n"
+"                                    его проектам и т.д."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -252,7 +273,7 @@ msgstr "Клиент"
 #. module: base_setup
 #: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "Включая публичную часть, openerp становится общедоступным сайтом."
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -274,13 +295,13 @@ msgstr "Контрагент"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Использовать другое слово вместо \"Заказчик\""
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Настройки продаж"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -297,12 +318,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Настройки"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer portal"
-msgstr ""
+msgstr "Включить клиентский портал"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -315,32 +336,32 @@ msgstr ""
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Разрешить совместный доступ к документам"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+msgstr "(новости компании, вакансии, форма обратной связи т.д.)"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Включить публичный портал"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Настроить сервер(а) исходящей почты"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Интеграция с социальными сетями"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Разрешить заказчикам доступ к своим документам"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -352,23 +373,23 @@ msgstr "Отмена"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Применить"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Определить терминологию"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Настроить информацию о компании"
 
 #~ msgid "City"
 #~ msgstr "Город"
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 9e026184c9d..8c48f5d7a6b 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -31,7 +31,7 @@
                     <group>
                         <label for="id" string="Email"/>
                         <div name="email">
-                            <div>
+                            <div name="email.outgoing_server">
                                 <button type="action"
                                     name="%(base.action_ir_mail_server_list)d"
                                     string="Configure outgoing email servers" class="oe_link"/>
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index b856bbd74ad..3fe59ecbd21 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -104,7 +104,7 @@ class base_state(object):
                 if parent_id.change_responsible and parent_id.user_id:
                     data['user_id'] = parent_id.user_id.id
             else:
-                raise osv.except_osv(_('Error !'), _('You can not escalate, you are already at the top level regarding your sales-team category.'))
+                raise osv.except_osv(_('Error!'), _('You can not escalate, you are already at the top level regarding your sales-team category.'))
             self.write(cr, uid, [case.id], data, context=context)
             case.case_escalate_send_note(parent_id, context=context)
         return True
diff --git a/addons/base_status/i18n/lt.po b/addons/base_status/i18n/lt.po
new file mode 100644
index 00000000000..cdaf9b0db37
--- /dev/null
+++ b/addons/base_status/i18n/lt.po
@@ -0,0 +1,76 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:166
+#, python-format
+msgid "%s has been <b>opened</b>."
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:199
+#, python-format
+msgid "%s has been <b>renewed</b>."
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:193
+#, python-format
+msgid "%s is now <b>pending</b>."
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been <b>canceled</b>."
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:181
+#, python-format
+msgid "%s has been <b>closed</b>."
+msgstr ""
diff --git a/addons/base_status/i18n/nl_BE.po b/addons/base_status/i18n/nl_BE.po
new file mode 100644
index 00000000000..6a3c2d83fc7
--- /dev/null
+++ b/addons/base_status/i18n/nl_BE.po
@@ -0,0 +1,80 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-15 16:40+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Fout"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:166
+#, python-format
+msgid "%s has been <b>opened</b>."
+msgstr "%s is <b>geopend</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:199
+#, python-format
+msgid "%s has been <b>renewed</b>."
+msgstr "%s is <b>vernieuwd</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid "Error!"
+msgstr "Fout"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"U kunt niet escaleren; u heeft het hoogste niveau in de verkoopteams al "
+"bereikt."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:193
+#, python-format
+msgid "%s is now <b>pending</b>."
+msgstr "%s is <b>wachtend</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been <b>canceled</b>."
+msgstr "%s is <b>geannuleerd</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:210
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"U bent al op het hoogste niveau van uw verkoopteam.\n"
+"U kunt dus niet verder escaleren."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:181
+#, python-format
+msgid "%s has been <b>closed</b>."
+msgstr "%s is <b>gesloten</b>."
diff --git a/addons/base_status/i18n/ru.po b/addons/base_status/i18n/ru.po
index 546f2772af3..2dab7ceaf31 100644
--- a/addons/base_status/i18n/ru.po
+++ b/addons/base_status/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 10:04+0000\n"
+"PO-Revision-Date: 2013-06-05 07:16+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:107
@@ -27,13 +27,13 @@ msgstr "Ошибка !"
 #: code:addons/base_status/base_state.py:166
 #, python-format
 msgid "%s has been <b>opened</b>."
-msgstr ""
+msgstr "%s было <b>открыто</b>."
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:199
 #, python-format
 msgid "%s has been <b>renewed</b>."
-msgstr ""
+msgstr "%s было <b>обновлено</b>."
 
 #. module: base_status
 #: code:addons/base_status/base_stage.py:210
@@ -55,13 +55,13 @@ msgstr ""
 #: code:addons/base_status/base_state.py:193
 #, python-format
 msgid "%s is now <b>pending</b>."
-msgstr ""
+msgstr "%s сейчас <b>в ожидании</b>."
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:187
 #, python-format
 msgid "%s has been <b>canceled</b>."
-msgstr ""
+msgstr "%s было <b>отменено</b>."
 
 #. module: base_status
 #: code:addons/base_status/base_stage.py:210
@@ -70,9 +70,11 @@ msgid ""
 "You are already at the top level of your sales-team category.\n"
 "Therefore you cannot escalate furthermore."
 msgstr ""
+"Вы уже на высшем уровне категории вашей команды продаж.\n"
+"Поэтому вы не можете обострить."
 
 #. module: base_status
 #: code:addons/base_status/base_state.py:181
 #, python-format
 msgid "%s has been <b>closed</b>."
-msgstr ""
+msgstr "%s было <b>закрыто</b>."
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 616333e3b47..52db18b7307 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -83,6 +83,8 @@ class res_partner(osv.osv):
         Check the VAT number depending of the country.
         http://sima-pc.com/nif.php
         '''
+        if not ustr(country_code).encode('utf-8').isalpha():
+            return False
         check_func_name = 'check_vat_' + country_code
         check_func = getattr(self, check_func_name, None) or \
                         getattr(vatnumber, check_func_name, None)
@@ -134,6 +136,9 @@ class res_partner(osv.osv):
         'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement.")
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['vat_subjected']
+
     def _construct_constraint_msg(self, cr, uid, ids, context=None):
         def default_vat_check(cn, vn):
             # by default, a VAT number is valid if:
@@ -243,6 +248,5 @@ class res_partner(osv.osv):
             return False
         return check == int(vat[8])
 
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index 39966dc58ef..a2fe05c5705 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/i18n/nl_BE.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-01 11:23+0000\n"
+"PO-Revision-Date: 2013-04-15 16:03+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:10+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "Check Validity"
-msgstr ""
+msgstr "Geldigheid controleren"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:147
@@ -45,7 +45,7 @@ msgstr "Bedrijven"
 #: code:addons/base_vat/base_vat.py:111
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fout"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/claim_from_delivery/i18n/nl_BE.po b/addons/claim_from_delivery/i18n/nl_BE.po
index a8793109b5f..38aab39e523 100644
--- a/addons/claim_from_delivery/i18n/nl_BE.po
+++ b/addons/claim_from_delivery/i18n/nl_BE.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-01 11:24+0000\n"
+"PO-Revision-Date: 2013-04-15 16:38+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:41+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
 msgid "Claims"
-msgstr ""
+msgstr "Klachten"
 
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Leveringsorder"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim From Delivery"
-msgstr ""
+msgstr "Klachten van levering"
 
 #~ msgid "Claim"
 #~ msgstr "Klacht"
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
index 253e824d1e2..ffcf8fc2781 100644
--- a/addons/claim_from_delivery/i18n/ru.po
+++ b/addons/claim_from_delivery/i18n/ru.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-30 06:47+0000\n"
+"PO-Revision-Date: 2013-06-05 07:11+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:41+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
 msgid "Claims"
-msgstr ""
+msgstr "Рекламации"
 
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Заказ доставки"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim From Delivery"
-msgstr ""
+msgstr "Рекламация по доставке"
 
 #~ msgid "Claim from delivery"
 #~ msgstr "Претензия из доставки"
diff --git a/addons/contacts/i18n/lt.po b/addons/contacts/i18n/lt.po
new file mode 100644
index 00000000000..f785a308009
--- /dev/null
+++ b/addons/contacts/i18n/lt.po
@@ -0,0 +1,45 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Spauskite, kad sukurtumėte kontaktą adresų knygoje.\n"
+"</p><p>\n"
+"OpenERP pagalba galima stebėti visus veiksmus susijusius su\n"
+"kontaktu; bendravimas, pardavimų galimybių istorija,\n"
+"dokumentai, ir t.t.\n"
+"</p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Kontaktai"
diff --git a/addons/contacts/i18n/nl_BE.po b/addons/contacts/i18n/nl_BE.po
new file mode 100644
index 00000000000..78fdb540ad6
--- /dev/null
+++ b/addons/contacts/i18n/nl_BE.po
@@ -0,0 +1,46 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-15 16:01+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Klik hier om een contactpersoon toe te voegen aan het "
+"adresboek.\n"
+"          </p><p>\n"
+"            Met OpenERP kunt u eenvoudig alle activiteiten registreren met "
+"betrekking tot \n"
+"            een klant, discussies, opportuniteiten, documenten, enz. \n"
+"          </p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Contactpersonen"
diff --git a/addons/contacts/i18n/th.po b/addons/contacts/i18n/th.po
new file mode 100644
index 00000000000..a75ecac2237
--- /dev/null
+++ b/addons/contacts/i18n/th.po
@@ -0,0 +1,37 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-15 07:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr ""
diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index d78fb09eae7..4e3a704d5f3 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -28,6 +28,7 @@ import report
 import wizard
 import res_partner
 import res_config
+import base_partner_merge
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 64bad21ede1..e7ab7df27ea 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -95,6 +95,9 @@ Dashboard for CRM will include:
         'board_crm_view.xml',
 
         'res_config_view.xml',
+        'base_partner_merge_view.xml',
+
+        'crm_case_section_view.xml',
     ],
     'demo': [
         'crm_demo.xml',
@@ -114,9 +117,27 @@ Dashboard for CRM will include:
         'test/crm_lead_copy.yml',
         'test/crm_lead_unlink.yml',
     ],
+    'css': [
+        'static/src/css/crm.css'
+    ],
+    'js': [
+        'static/lib/sparkline/jquery.sparkline.js',
+        'static/src/js/crm_case_section.js',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
-    'images': ['images/crm_dashboard.png', 'images/customers.png','images/leads.png','images/opportunities_kanban.png','images/opportunities_form.png','images/opportunities_calendar.png','images/opportunities_graph.png','images/logged_calls.png','images/scheduled_calls.png','images/stages.png'],
+    'images': [
+        'images/crm_dashboard.png',
+        'images/customers.png',
+        'images/leads.png',
+        'images/opportunities_kanban.png',
+        'images/opportunities_form.png',
+        'images/opportunities_calendar.png',
+        'images/opportunities_graph.png',
+        'images/logged_calls.png',
+        'images/scheduled_calls.png',
+        'images/stages.png',
+    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/base_partner_merge.py b/addons/crm/base_partner_merge.py
new file mode 100644
index 00000000000..42e1ab7c7ec
--- /dev/null
+++ b/addons/crm/base_partner_merge.py
@@ -0,0 +1,769 @@
+#!/usr/bin/env python
+from __future__ import absolute_import
+from email.utils import parseaddr
+import functools
+import htmlentitydefs
+import itertools
+import logging
+import operator
+import re
+from ast import literal_eval
+from openerp.tools import mute_logger
+
+# Validation Library https://pypi.python.org/pypi/validate_email/1.1
+from .validate_email import validate_email
+
+import openerp
+from openerp.osv import osv, orm
+from openerp.osv import fields
+from openerp.osv.orm import browse_record
+from openerp.tools.translate import _
+
+pattern = re.compile("&(\w+?);")
+
+_logger = logging.getLogger('base.partner.merge')
+
+
+# http://www.php2python.com/wiki/function.html-entity-decode/
+def html_entity_decode_char(m, defs=htmlentitydefs.entitydefs):
+    try:
+        return defs[m.group(1)]
+    except KeyError:
+        return m.group(0)
+
+
+def html_entity_decode(string):
+    return pattern.sub(html_entity_decode_char, string)
+
+
+def sanitize_email(email):
+    assert isinstance(email, basestring) and email
+
+    result = re.subn(r';|/|:', ',',
+                     html_entity_decode(email or ''))[0].split(',')
+
+    emails = [parseaddr(email)[1]
+              for item in result
+              for email in item.split()]
+
+    return [email.lower()
+            for email in emails
+            if validate_email(email)]
+
+
+def is_integer_list(ids):
+    return all(isinstance(i, (int, long)) for i in ids)
+
+
+class ResPartner(osv.Model):
+    _inherit = 'res.partner'
+
+    _columns = {
+        'id': fields.integer('Id', readonly=True),
+        'create_date': fields.datetime('Create Date', readonly=True),
+    }
+
+class MergePartnerLine(osv.TransientModel):
+    _name = 'base.partner.merge.line'
+
+    _columns = {
+        'wizard_id': fields.many2one('base.partner.merge.automatic.wizard',
+                                     'Wizard'),
+        'min_id': fields.integer('MinID'),
+        'aggr_ids': fields.char('Ids', required=True),
+    }
+
+    _order = 'min_id asc'
+
+
+class MergePartnerAutomatic(osv.TransientModel):
+    """
+        The idea behind this wizard is to create a list of potential partners to
+        merge. We use two objects, the first one is the wizard for the end-user.
+        And the second will contain the partner list to merge.
+    """
+    _name = 'base.partner.merge.automatic.wizard'
+
+    _columns = {
+        # Group by
+        'group_by_email': fields.boolean('Email'),
+        'group_by_name': fields.boolean('Name'),
+        'group_by_is_company': fields.boolean('Is Company'),
+        'group_by_vat': fields.boolean('VAT'),
+        'group_by_parent_id': fields.boolean('Parent Company'),
+
+        'state': fields.selection([('option', 'Option'),
+                                   ('selection', 'Selection'),
+                                   ('finished', 'Finished')],
+                                  'State',
+                                  readonly=True,
+                                  required=True),
+        'number_group': fields.integer("Group of Contacts", readonly=True),
+        'current_line_id': fields.many2one('base.partner.merge.line', 'Current Line'),
+        'line_ids': fields.one2many('base.partner.merge.line', 'wizard_id', 'Lines'),
+        'partner_ids': fields.many2many('res.partner', string='Contacts'),
+        'dst_partner_id': fields.many2one('res.partner', string='Destination Contact'),
+
+        'exclude_contact': fields.boolean('A user associated to the contact'),
+        'exclude_journal_item': fields.boolean('Journal Items associated to the contact'),
+        'maximum_group': fields.integer("Maximum of Group of Contacts"),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(MergePartnerAutomatic, self).default_get(cr, uid, fields, context)
+        if context.get('active_model') == 'res.partner' and context.get('active_ids'):
+            partner_ids = context['active_ids']
+            res['state'] = 'selection'
+            res['partner_ids'] = partner_ids
+            res['dst_partner_id'] = self._get_ordered_partner(cr, uid, partner_ids, context=context)[-1].id
+        return res
+
+    _defaults = {
+        'state': 'option'
+    }
+
+    def get_fk_on(self, cr, table):
+        q = """  SELECT cl1.relname as table,
+                        att1.attname as column
+                   FROM pg_constraint as con, pg_class as cl1, pg_class as cl2,
+                        pg_attribute as att1, pg_attribute as att2
+                  WHERE con.conrelid = cl1.oid
+                    AND con.confrelid = cl2.oid
+                    AND array_lower(con.conkey, 1) = 1
+                    AND con.conkey[1] = att1.attnum
+                    AND att1.attrelid = cl1.oid
+                    AND cl2.relname = %s
+                    AND att2.attname = 'id'
+                    AND array_lower(con.confkey, 1) = 1
+                    AND con.confkey[1] = att2.attnum
+                    AND att2.attrelid = cl2.oid
+                    AND con.contype = 'f'
+        """
+        return cr.execute(q, (table,))
+
+    def _update_foreign_keys(self, cr, uid, src_partners, dst_partner, context=None):
+        _logger.debug('_update_foreign_keys for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
+
+        # find the many2one relation to a partner
+        proxy = self.pool.get('res.partner')
+        self.get_fk_on(cr, 'res_partner')
+
+        # ignore two tables
+
+        for table, column in cr.fetchall():
+            if 'base_partner_merge_' in table:
+                continue
+            partner_ids = tuple(map(int, src_partners))
+
+            query = "SELECT column_name FROM information_schema.columns WHERE table_name LIKE '%s'" % (table)
+            cr.execute(query, ())
+            columns = []
+            for data in cr.fetchall():
+                if data[0] != column:
+                    columns.append(data[0])
+
+            query_dic = {
+                'table': table,
+                'column': column,
+                'value': columns[0],
+            }
+            if len(columns) <= 1:
+                # unique key treated
+                query = """
+                    UPDATE "%(table)s" as ___tu
+                    SET %(column)s = %%s
+                    WHERE
+                        %(column)s = %%s AND
+                        NOT EXISTS (
+                            SELECT 1
+                            FROM "%(table)s" as ___tw
+                            WHERE
+                                %(column)s = %%s AND
+                                ___tu.%(value)s = ___tw.%(value)s
+                        )""" % query_dic
+                for partner_id in partner_ids:
+                    cr.execute(query, (dst_partner.id, partner_id, dst_partner.id))
+            else:
+                cr.execute("SAVEPOINT recursive_partner_savepoint")
+                try:
+                    query = 'UPDATE "%(table)s" SET %(column)s = %%s WHERE %(column)s IN %%s' % query_dic
+                    cr.execute(query, (dst_partner.id, partner_ids,))
+
+                    if column == proxy._parent_name and table == 'res_partner':
+                        query = """
+                            WITH RECURSIVE cycle(id, parent_id) AS (
+                                    SELECT id, parent_id FROM res_partner
+                                UNION
+                                    SELECT  cycle.id, res_partner.parent_id
+                                    FROM    res_partner, cycle
+                                    WHERE   res_partner.id = cycle.parent_id AND
+                                            cycle.id != cycle.parent_id
+                            )
+                            SELECT id FROM cycle WHERE id = parent_id AND id = %s
+                        """
+                        cr.execute(query, (dst_partner.id,))
+                        if cr.fetchall():
+                            cr.execute("ROLLBACK TO SAVEPOINT recursive_partner_savepoint")
+                finally:
+                    cr.execute("RELEASE SAVEPOINT recursive_partner_savepoint")
+
+    def _update_reference_fields(self, cr, uid, src_partners, dst_partner, context=None):
+        _logger.debug('_update_reference_fields for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
+
+        def update_records(model, src, field_model='model', field_id='res_id', context=None):
+            proxy = self.pool.get(model)
+            if proxy is None:
+                return
+            domain = [(field_model, '=', 'res.partner'), (field_id, '=', src.id)]
+            ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
+            return proxy.write(cr, openerp.SUPERUSER_ID, ids, {field_id: dst_partner.id}, context=context)
+
+        update_records = functools.partial(update_records, context=context)
+
+        for partner in src_partners:
+            update_records('base.calendar', src=partner, field_model='model_id.model')
+            update_records('ir.attachment', src=partner, field_model='res_model')
+            update_records('mail.followers', src=partner, field_model='res_model')
+            update_records('mail.message', src=partner)
+            update_records('marketing.campaign.workitem', src=partner, field_model='object_id.model')
+            update_records('ir.model.data', src=partner)
+
+        proxy = self.pool['ir.model.fields']
+        domain = [('ttype', '=', 'reference')]
+        record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
+
+        for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context):
+            proxy_model = self.pool[record.model]
+
+            field_type = proxy_model._columns.get(record.name).__class__._type
+
+            if field_type == 'function':
+                continue
+
+            for partner in src_partners:
+                domain = [
+                    (record.name, '=', 'res.partner,%d' % partner.id)
+                ]
+                model_ids = proxy_model.search(cr, openerp.SUPERUSER_ID, domain, context=context)
+                values = {
+                    record.name: 'res.partner,%d' % dst_partner.id,
+                }
+                proxy_model.write(cr, openerp.SUPERUSER_ID, model_ids, values, context=context)
+
+    def _update_values(self, cr, uid, src_partners, dst_partner, context=None):
+        _logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
+
+        columns = dst_partner._columns
+        def write_serializer(column, item):
+            if isinstance(item, browse_record):
+                return item.id
+            else:
+                return item
+
+        values = dict()
+        for column, field in columns.iteritems():
+            if field._type not in ('many2many', 'one2many') and not isinstance(field, fields.function):
+                for item in itertools.chain(src_partners, [dst_partner]):
+                    if item[column]:
+                        values[column] = write_serializer(column, item[column])
+
+        values.pop('id', None)
+        parent_id = values.pop('parent_id', None)
+        dst_partner.write(values)
+        if parent_id and parent_id != dst_partner.id:
+            try:
+                dst_partner.write({'parent_id': parent_id})
+            except (osv.except_osv, orm.except_orm):
+                _logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id)
+
+    @mute_logger('openerp.osv.expression', 'openerp.osv.orm')
+    def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None):
+        proxy = self.pool.get('res.partner')
+
+        partner_ids = proxy.exists(cr, uid, list(partner_ids), context=context)
+        if len(partner_ids) < 2:
+            return
+
+        if len(partner_ids) > 3:
+            raise osv.except_osv(_('Error'), _("For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."))
+
+        if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1:
+            raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails."))
+
+        if dst_partner and dst_partner.id in partner_ids:
+            src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context)
+        else:
+            ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context)
+            dst_partner = ordered_partners[-1]
+            src_partners = ordered_partners[:-1]
+        _logger.info("dst_partner: %s", dst_partner.id)
+
+        if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \
+                self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context):
+            raise osv.except_osv(_('Error'), _("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."))
+
+        call_it = lambda function: function(cr, uid, src_partners, dst_partner,
+                                            context=context)
+
+        call_it(self._update_foreign_keys)
+        call_it(self._update_reference_fields)
+        call_it(self._update_values)
+
+        _logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id)
+        dst_partner.message_post(body='%s %s'%(_("Merged with the following partners:"), ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id) for p in src_partners)))
+        
+        for partner in src_partners:
+            partner.unlink()
+
+    def clean_emails(self, cr, uid, context=None):
+        """
+        Clean the email address of the partner, if there is an email field with
+        a mimum of two addresses, the system will create a new partner, with the
+        information of the previous one and will copy the new cleaned email into
+        the email field.
+        """
+        if context is None:
+            context = {}
+
+        proxy_model = self.pool['ir.model.fields']
+        field_ids = proxy_model.search(cr, uid, [('model', '=', 'res.partner'),
+                                                 ('ttype', 'like', '%2many')],
+                                       context=context)
+        fields = proxy_model.read(cr, uid, field_ids, context=context)
+        reset_fields = dict((field['name'], []) for field in fields)
+
+        proxy_partner = self.pool['res.partner']
+        context['active_test'] = False
+        ids = proxy_partner.search(cr, uid, [], context=context)
+
+        fields = ['name', 'var' 'partner_id' 'is_company', 'email']
+        partners = proxy_partner.read(cr, uid, ids, fields, context=context)
+
+        partners.sort(key=operator.itemgetter('id'))
+        partners_len = len(partners)
+
+        _logger.info('partner_len: %r', partners_len)
+
+        for idx, partner in enumerate(partners):
+            if not partner['email']:
+                continue
+
+            percent = (idx / float(partners_len)) * 100.0
+            _logger.info('idx: %r', idx)
+            _logger.info('percent: %r', percent)
+            try:
+                emails = sanitize_email(partner['email'])
+                head, tail = emails[:1], emails[1:]
+                email = head[0] if head else False
+
+                proxy_partner.write(cr, uid, [partner['id']],
+                                    {'email': email}, context=context)
+
+                for email in tail:
+                    values = dict(reset_fields, email=email)
+                    proxy_partner.copy(cr, uid, partner['id'], values,
+                                       context=context)
+
+            except Exception:
+                _logger.exception("There is a problem with this partner: %r", partner)
+                raise
+        return True
+
+    def close_cb(self, cr, uid, ids, context=None):
+        return {'type': 'ir.actions.act_window_close'}
+
+    def _generate_query(self, fields, maximum_group=100):
+        group_fields = ', '.join(fields)
+
+        filters = []
+        for field in fields:
+            if field in ['email', 'name']:
+                filters.append((field, 'IS NOT', 'NULL'))
+
+        criteria = ' AND '.join('%s %s %s' % (field, operator, value)
+                                for field, operator, value in filters)
+
+        text = [
+            "SELECT min(id), array_agg(id)",
+            "FROM res_partner",
+        ]
+
+        if criteria:
+            text.append('WHERE %s' % criteria)
+
+        text.extend([
+            "GROUP BY %s" % group_fields,
+            "HAVING COUNT(*) >= 2",
+            "ORDER BY min(id)",
+        ])
+
+        if maximum_group:
+            text.extend([
+                "LIMIT %s" % maximum_group,
+            ])
+
+        return ' '.join(text)
+
+    def _compute_selected_groupby(self, this):
+        group_by_str = 'group_by_'
+        group_by_len = len(group_by_str)
+
+        fields = [
+            key[group_by_len:]
+            for key in self._columns.keys()
+            if key.startswith(group_by_str)
+        ]
+
+        groups = [
+            field
+            for field in fields
+            if getattr(this, '%s%s' % (group_by_str, field), False)
+        ]
+
+        if not groups:
+            raise osv.except_osv(_('Error'),
+                                 _("You have to specify a filter for your selection"))
+
+        return groups
+
+    def next_cb(self, cr, uid, ids, context=None):
+        """
+        Don't compute any thing
+        """
+        context = dict(context or {}, active_test=False)
+        this = self.browse(cr, uid, ids[0], context=context)
+        if this.current_line_id:
+            this.current_line_id.unlink()
+        return self._next_screen(cr, uid, this, context)
+
+    def _get_ordered_partner(self, cr, uid, partner_ids, context=None):
+        partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context)
+        ordered_partners = sorted(sorted(partners,
+                            key=operator.attrgetter('create_date'), reverse=True),
+                                key=operator.attrgetter('active'), reverse=True)
+        return ordered_partners
+
+    def _next_screen(self, cr, uid, this, context=None):
+        this.refresh()
+        values = {}
+        if this.line_ids:
+            # in this case, we try to find the next record.
+            current_line = this.line_ids[0]
+            current_partner_ids = literal_eval(current_line.aggr_ids)
+            values.update({
+                'current_line_id': current_line.id,
+                'partner_ids': [(6, 0, current_partner_ids)],
+                'dst_partner_id': self._get_ordered_partner(cr, uid, current_partner_ids, context)[-1].id,
+                'state': 'selection',
+            })
+        else:
+            values.update({
+                'current_line_id': False,
+                'partner_ids': [],
+                'state': 'finished',
+            })
+
+        this.write(values)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': this._name,
+            'res_id': this.id,
+            'view_mode': 'form',
+            'target': 'new',
+        }
+
+    def _model_is_installed(self, cr, uid, model, context=None):
+        proxy = self.pool.get('ir.model')
+        domain = [('model', '=', model)]
+        return proxy.search_count(cr, uid, domain, context=context) > 0
+
+    def _partner_use_in(self, cr, uid, aggr_ids, models, context=None):
+        """
+        Check if there is no occurence of this group of partner in the selected
+        model
+        """
+        for model, field in models.iteritems():
+            proxy = self.pool.get(model)
+            domain = [(field, 'in', aggr_ids)]
+            if proxy.search_count(cr, uid, domain, context=context):
+                return True
+        return False
+
+    def compute_models(self, cr, uid, ids, context=None):
+        """
+        Compute the different models needed by the system if you want to exclude
+        some partners.
+        """
+        assert is_integer_list(ids)
+
+        this = self.browse(cr, uid, ids[0], context=context)
+
+        models = {}
+        if this.exclude_contact:
+            models['res.users'] = 'partner_id'
+
+        if self._model_is_installed(cr, uid, 'account.move.line', context=context) and this.exclude_journal_item:
+            models['account.move.line'] = 'partner_id'
+
+        return models
+
+    def _process_query(self, cr, uid, ids, query, context=None):
+        """
+        Execute the select request and write the result in this wizard
+        """
+        proxy = self.pool.get('base.partner.merge.line')
+        this = self.browse(cr, uid, ids[0], context=context)
+        models = self.compute_models(cr, uid, ids, context=context)
+        cr.execute(query)
+
+        counter = 0
+        for min_id, aggr_ids in cr.fetchall():
+            if models and self._partner_use_in(cr, uid, aggr_ids, models, context=context):
+                continue
+            values = {
+                'wizard_id': this.id,
+                'min_id': min_id,
+                'aggr_ids': aggr_ids,
+            }
+
+            proxy.create(cr, uid, values, context=context)
+            counter += 1
+
+        values = {
+            'state': 'selection',
+            'number_group': counter,
+        }
+
+        this.write(values)
+
+        _logger.info("counter: %s", counter)
+
+    def start_process_cb(self, cr, uid, ids, context=None):
+        """
+        Start the process.
+        * Compute the selected groups (with duplication)
+        * If the user has selected the 'exclude_XXX' fields, avoid the partners.
+        """
+        assert is_integer_list(ids)
+
+        context = dict(context or {}, active_test=False)
+        this = self.browse(cr, uid, ids[0], context=context)
+        groups = self._compute_selected_groupby(this)
+        query = self._generate_query(groups, this.maximum_group)
+        self._process_query(cr, uid, ids, query, context=context)
+
+        return self._next_screen(cr, uid, this, context)
+
+    def automatic_process_cb(self, cr, uid, ids, context=None):
+        assert is_integer_list(ids)
+        this = self.browse(cr, uid, ids[0], context=context)
+        this.start_process_cb()
+        this.refresh()
+
+        for line in this.line_ids:
+            partner_ids = literal_eval(line.aggr_ids)
+            self._merge(cr, uid, partner_ids, context=context)
+            line.unlink()
+            cr.commit()
+
+        this.write({'state': 'finished'})
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': this._name,
+            'res_id': this.id,
+            'view_mode': 'form',
+            'target': 'new',
+        }
+
+    def parent_migration_process_cb(self, cr, uid, ids, context=None):
+        assert is_integer_list(ids)
+
+        context = dict(context or {}, active_test=False)
+        this = self.browse(cr, uid, ids[0], context=context)
+
+        query = """
+            SELECT
+                min(p1.id),
+                array_agg(DISTINCT p1.id)
+            FROM
+                res_partner as p1
+            INNER join
+                res_partner as p2
+            ON
+                p1.email = p2.email AND
+                p1.name = p2.name AND
+                (p1.parent_id = p2.id OR p1.id = p2.parent_id)
+            WHERE
+                p2.id IS NOT NULL
+            GROUP BY
+                p1.email,
+                p1.name,
+                CASE WHEN p1.parent_id = p2.id THEN p2.id
+                    ELSE p1.id
+                END
+            HAVING COUNT(*) >= 2
+            ORDER BY
+                min(p1.id)
+        """
+
+        self._process_query(cr, uid, ids, query, context=context)
+
+        for line in this.line_ids:
+            partner_ids = literal_eval(line.aggr_ids)
+            self._merge(cr, uid, partner_ids, context=context)
+            line.unlink()
+            cr.commit()
+
+        this.write({'state': 'finished'})
+
+        cr.execute("""
+            UPDATE
+                res_partner
+            SET
+                is_company = NULL,
+                parent_id = NULL
+            WHERE
+                parent_id = id
+        """)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': this._name,
+            'res_id': this.id,
+            'view_mode': 'form',
+            'target': 'new',
+        }
+
+    def update_all_process_cb(self, cr, uid, ids, context=None):
+        assert is_integer_list(ids)
+
+        # WITH RECURSIVE cycle(id, parent_id) AS (
+        #     SELECT id, parent_id FROM res_partner
+        #   UNION
+        #     SELECT  cycle.id, res_partner.parent_id
+        #     FROM    res_partner, cycle
+        #     WHERE   res_partner.id = cycle.parent_id AND
+        #             cycle.id != cycle.parent_id
+        # )
+        # UPDATE  res_partner
+        # SET     parent_id = NULL
+        # WHERE   id in (SELECT id FROM cycle WHERE id = parent_id);
+
+        this = self.browse(cr, uid, ids[0], context=context)
+
+        self.parent_migration_process_cb(cr, uid, ids, context=None)
+
+        list_merge = [
+            {'group_by_vat': True, 'group_by_email': True, 'group_by_name': True},
+            # {'group_by_name': True, 'group_by_is_company': True, 'group_by_parent_id': True},
+            # {'group_by_email': True, 'group_by_is_company': True, 'group_by_parent_id': True},
+            # {'group_by_name': True, 'group_by_vat': True, 'group_by_is_company': True, 'exclude_journal_item': True},
+            # {'group_by_email': True, 'group_by_vat': True, 'group_by_is_company': True, 'exclude_journal_item': True},
+            # {'group_by_email': True, 'group_by_is_company': True, 'exclude_contact': True, 'exclude_journal_item': True},
+            # {'group_by_name': True, 'group_by_is_company': True, 'exclude_contact': True, 'exclude_journal_item': True}
+        ]
+
+        for merge_value in list_merge:
+            id = self.create(cr, uid, merge_value, context=context)
+            self.automatic_process_cb(cr, uid, [id], context=context)
+
+        cr.execute("""
+            UPDATE
+                res_partner
+            SET
+                is_company = NULL
+            WHERE
+                parent_id IS NOT NULL AND
+                is_company IS NOT NULL
+        """)
+
+        # cr.execute("""
+        #     UPDATE
+        #         res_partner as p1
+        #     SET
+        #         is_company = NULL,
+        #         parent_id = (
+        #             SELECT  p2.id
+        #             FROM    res_partner as p2
+        #             WHERE   p2.email = p1.email AND
+        #                     p2.parent_id != p2.id
+        #             LIMIT 1
+        #         )
+        #     WHERE
+        #         p1.parent_id = p1.id
+        # """)
+
+        return self._next_screen(cr, uid, this, context)
+
+    def merge_cb(self, cr, uid, ids, context=None):
+        assert is_integer_list(ids)
+
+        context = dict(context or {}, active_test=False)
+        this = self.browse(cr, uid, ids[0], context=context)
+
+        partner_ids = set(map(int, this.partner_ids))
+        if not partner_ids:
+            this.write({'state': 'finished'})
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': this._name,
+                'res_id': this.id,
+                'view_mode': 'form',
+                'target': 'new',
+            }
+
+        self._merge(cr, uid, partner_ids, this.dst_partner_id, context=context)
+
+        if this.current_line_id:
+            this.current_line_id.unlink()
+
+        return self._next_screen(cr, uid, this, context)
+
+    def auto_set_parent_id(self, cr, uid, ids, context=None):
+        assert is_integer_list(ids)
+
+        # select partner who have one least invoice
+        partner_treated = ['@gmail.com']
+        cr.execute("""  SELECT p.id, p.email
+                        FROM res_partner as p 
+                        LEFT JOIN account_invoice as a 
+                        ON p.id = a.partner_id AND a.state in ('open','paid')
+                        WHERE p.grade_id is NOT NULL
+                        GROUP BY p.id
+                        ORDER BY COUNT(a.id) DESC
+                """)
+        re_email = re.compile(r".*@")
+        for id, email in cr.fetchall():
+            # check email domain
+            email = re_email.sub("@", email or "")
+            if not email or email in partner_treated:
+                continue
+            partner_treated.append(email)
+
+            # don't update the partners if they are more of one who have invoice
+            cr.execute("""  SELECT *
+                            FROM res_partner as p
+                            WHERE p.id != %s AND p.email LIKE '%%%s' AND
+                                EXISTS (SELECT * FROM account_invoice as a WHERE p.id = a.partner_id AND a.state in ('open','paid'))
+                    """ % (id, email))
+
+            if len(cr.fetchall()) > 1:
+                _logger.info("%s MORE OF ONE COMPANY", email)
+                continue
+
+            # to display changed values
+            cr.execute("""  SELECT id,email
+                            FROM res_partner
+                            WHERE parent_id != %s AND id != %s AND email LIKE '%%%s'
+                    """ % (id, id, email))
+            _logger.info("%r", cr.fetchall())
+
+            # upgrade
+            cr.execute("""  UPDATE res_partner
+                            SET parent_id = %s
+                            WHERE id != %s AND email LIKE '%%%s'
+                    """ % (id, id, email))
+        return False
diff --git a/addons/crm/base_partner_merge_view.xml b/addons/crm/base_partner_merge_view.xml
new file mode 100644
index 00000000000..8ce0b5fd99f
--- /dev/null
+++ b/addons/crm/base_partner_merge_view.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- the sequence of the configuration sub menu is 30 -->
+        <menuitem id='root_menu' name='Tools' parent='base.menu_base_partner' sequence="25"/>
+
+        <record model="ir.actions.act_window" id="base_partner_merge_automatic_act">
+            <field name="name">Deduplicate Contacts</field>
+            <field name="res_model">base.partner.merge.automatic.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+            <field name="context">{'active_test': False}</field>
+        </record>
+
+        <menuitem id='partner_merge_automatic_menu'
+            action='base_partner_merge_automatic_act'
+            groups='base.group_system'
+            parent='root_menu' />
+
+        <record model='ir.ui.view' id='base_partner_merge_automatic_wizard_form'>
+            <field name='name'>base.partner.merge.automatic.wizard.form</field>
+            <field name='model'>base.partner.merge.automatic.wizard</field>
+            <field name='arch' type='xml'>
+                <form string='Automatic Merge Wizard' version='7.0'>
+                    <header>
+                        <button name='merge_cb' string='Merge Selection'
+                            class='oe_highlight'
+                            type='object'
+                            attrs="{'invisible': [('state', 'in', ('option', 'finished' ))]}"
+                            />
+                        <button name='next_cb' string='Skip these contacts'
+                            type='object'  class='oe_link'
+                            attrs="{'invisible': [('state', '!=', 'selection')]}" />
+                        <button name='start_process_cb'
+                            string='Merge with Manual Check'
+                            type='object'  class='oe_highlight'
+                            attrs="{'invisible': [('state', '!=', 'option')]}" />
+                        <button name='automatic_process_cb'
+                            string='Merge Automatically'
+                            type='object' class='oe_highlight'
+                            confirm="Are you sure to execute the automatic merge of your contacts ?"
+                            attrs="{'invisible': [('state', '!=', 'option')]}" />
+                        <button name='update_all_process_cb'
+                            string='Merge Automatically all process'
+                            type='object'
+                            confirm="Are you sure to execute the list of automatic merges of your contacts ?"
+                            attrs="{'invisible': [('state', '!=', 'option')]}" />
+                        <span class="or_cancel" attrs="{'invisible': [('state', '=', 'finished')]} ">or
+                            <button name="close_cb" special="nosave" string="Cancel" type="object" class="oe_link oe_inline"/>
+                        </span>
+                        <span class="or_cancel" attrs="{'invisible': [('state', '!=', 'finished')]} ">
+                            <button name="close_cb" special="nosave"
+                                string="Close"
+                                type="object"
+                                class="oe_link oe_inline"/>
+                        </span>
+                    </header>
+                    <sheet>
+                        <group attrs="{'invisible': [('state', '!=', 'finished')]}" col="1">
+                            <h2>There is no more contacts to merge for this request...</h2>
+                            <button name="%(base_partner_merge_automatic_act)d" string="Deduplicate the other Contacts" class="oe_highlight"
+                            type="action"/>
+                        </group>
+                        <p class="oe_grey" attrs="{'invisible': [('state', '!=', ('option'))]}">
+                            Select the list of fields used to search for
+                            duplicated records. If you select several fields,
+                            OpenERP will propose you to merge only those having
+                            all these fields in common. (not one of the fields).
+                        </p>
+                        <group attrs="{'invisible': ['|', ('state', 'not in', ('selection', 'finished')), ('number_group', '=', 0)]}">
+                            <field name="state" invisible="1" />
+                            <field name="number_group"/>
+                        </group>
+                        <group string="Search duplicates based on duplicated data in"
+                            attrs="{'invisible': [('state', 'not in', ('option',))]}">
+                            <field name='group_by_email' />
+                            <field name='group_by_name' />
+                            <field name='group_by_is_company' />
+                            <field name='group_by_vat' />
+                            <field name='group_by_parent_id' />
+                        </group>
+                        <group string="Exclude contacts having"
+                            attrs="{'invisible': [('state', 'not in', ('option',))]}">
+                            <field name='exclude_contact' />
+                            <field name='exclude_journal_item' />
+                        </group>
+                        <separator string="Options" attrs="{'invisible': [('state', 'not in', ('option',))]}"/>
+                        <group attrs="{'invisible': [('state', 'not in', ('option','finished'))]}">
+                            <field name='maximum_group' attrs="{'readonly': [('state', 'in', ('finished'))]}"/>
+                        </group>
+                        <separator string="Merge the following contacts"
+                            attrs="{'invisible': [('state', 'in', ('option', 'finished'))]}"/>
+                        <group attrs="{'invisible': [('state', 'in', ('option', 'finished'))]}" col="1">
+                            <p class="oe_grey">
+                                The selected contacts will be merged together. All
+                                documents linking to one of these contacts will be
+                                redirected to the aggregated contact. You can remove
+                                contacts from this list to avoid merging them.
+                            </p>
+                            <field name="dst_partner_id" domain="[('id', 'in', partner_ids and partner_ids[0] and partner_ids[0][2] or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
+                            <field name="partner_ids" nolabel="1">
+                                <tree string="Partners">
+                                    <field name="id" />
+                                    <field name="display_name" />
+                                    <field name="email" />
+                                    <field name="is_company" />
+                                    <field name="vat" />
+                                    <field name="country_id" />
+                                </tree>
+                            </field>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        
+        <act_window id="action_partner_merge" res_model="base.partner.merge.automatic.wizard" src_model="res.partner"
+            target="new" multi="True" key2="client_action_multi" view_mode="form" name="Automatic Merge"/>
+
+    </data>
+
+</openerp>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index df6d5e12b66..4c9a60634a5 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -19,13 +19,12 @@
 #
 ##############################################################################
 
-import base64
-import time
-from lxml import etree
+from datetime import date, datetime
+from dateutil import relativedelta
+
+from openerp import tools
 from openerp.osv import fields
 from openerp.osv import osv
-from openerp import tools
-from openerp.tools.translate import _
 
 MAX_LEVEL = 15
 AVAILABLE_STATES = [
@@ -98,6 +97,7 @@ class crm_case_stage(osv.osv):
         'case_default': True,
     }
 
+
 class crm_case_section(osv.osv):
     """ Model for sales teams. """
     _name = "crm.case.section"
@@ -105,9 +105,56 @@ class crm_case_section(osv.osv):
     _inherit = "mail.thread"
     _description = "Sales Teams"
     _order = "complete_name"
+    # number of periods for lead/opportunities/... tracking in salesteam kanban dashboard/kanban view
+    _period_number = 5
 
     def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
-        return  dict(self.name_get(cr, uid, ids, context=context))
+        return dict(self.name_get(cr, uid, ids, context=context))
+
+    def __get_bar_values(self, cr, uid, obj, domain, read_fields, value_field, groupby_field, context=None):
+        """ Generic method to generate data for bar chart values using SparklineBarWidget.
+            This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
+
+            :param obj: the target model (i.e. crm_lead)
+            :param domain: the domain applied to the read_group
+            :param list read_fields: the list of fields to read in the read_group
+            :param str value_field: the field used to compute the value of the bar slice
+            :param str groupby_field: the fields used to group
+
+            :return list section_result: a list of dicts: [
+                                                {   'value': (int) bar_column_value,
+                                                    'tootip': (str) bar_column_tooltip,
+                                                }
+                                            ]
+        """
+        month_begin = date.today().replace(day=1)
+        section_result = [{
+                            'value': 0,
+                            'tooltip': (month_begin + relativedelta.relativedelta(months=-i)).strftime('%B'),
+                            } for i in range(self._period_number - 1, -1, -1)]
+        group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        for group in group_obj:
+            group_begin_date = datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATE_FORMAT)
+            month_delta = relativedelta.relativedelta(month_begin, group_begin_date)
+            section_result[self._period_number - (month_delta.months + 1)] = {'value': group.get(value_field, 0), 'tooltip': group_begin_date.strftime('%B')}
+        return section_result
+
+    def _get_opportunities_data(self, cr, uid, ids, field_name, arg, context=None):
+        """ Get opportunities-related data for salesteam kanban view
+            monthly_open_leads: number of open lead during the last months
+            monthly_planned_revenue: planned revenu of opportunities during the last months
+        """
+        obj = self.pool.get('crm.lead')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            res[id] = dict()
+            lead_domain = [('type', '=', 'lead'), ('section_id', '=', id), ('create_date', '>=', groupby_begin)]
+            res[id]['monthly_open_leads'] = self.__get_bar_values(cr, uid, obj, lead_domain, ['create_date'], 'create_date_count', 'create_date', context=context)
+            opp_domain = [('type', '=', 'opportunity'), ('section_id', '=', id), ('create_date', '>=', groupby_begin)]
+            res[id]['monthly_planned_revenue'] = self.__get_bar_values(cr, uid, obj, opp_domain, ['planned_revenue', 'create_date'], 'planned_revenue', 'create_date', context=context)
+        return res
 
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
@@ -117,27 +164,37 @@ class crm_case_section(osv.osv):
                         "true, it will allow you to hide the sales team without removing it."),
         'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."),
         'user_id': fields.many2one('res.users', 'Team Leader'),
-        'member_ids':fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
+        'member_ids': fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"),
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
         'resource_calendar_id': fields.many2one('resource.calendar', "Working Time", help="Used to compute open days"),
         'note': fields.text('Description'),
-        'working_hours': fields.float('Working Hours', digits=(16,2 )),
+        'working_hours': fields.float('Working Hours', digits=(16, 2)),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
                                     help="The email address associated with this team. New emails received will automatically "
                                          "create new leads assigned to the team."),
+        'color': fields.integer('Color Index'),
+        'use_leads': fields.boolean('Leads',
+            help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
+
+        'monthly_open_leads': fields.function(_get_opportunities_data,
+            type="string", readonly=True, multi='_get_opportunities_data',
+            string='Open Leads per Month'),
+        'monthly_planned_revenue': fields.function(_get_opportunities_data,
+            type="string", readonly=True, multi='_get_opportunities_data',
+            string='Planned Revenue per Month')
     }
 
     def _get_stage_common(self, cr, uid, context):
-        ids = self.pool.get('crm.case.stage').search(cr, uid, [('case_default','=',1)], context=context)
+        ids = self.pool.get('crm.case.stage').search(cr, uid, [('case_default', '=', 1)], context=context)
         return ids
 
     _defaults = {
         'active': 1,
         'stage_ids': _get_stage_common,
-        'alias_domain': False, # always hide alias during creation
+        'use_leads': True,
     }
 
     _sql_constraints = [
@@ -150,7 +207,7 @@ class crm_case_section(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
         """Overrides orm name_get method"""
-        if not isinstance(ids, list) :
+        if not isinstance(ids, list):
             ids = [ids]
         res = []
         if not ids:
@@ -167,20 +224,20 @@ class crm_case_section(osv.osv):
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
-            vals.pop('alias_name', None) # prevent errors during copy()
+            alias_name = vals.pop('alias_name', None) or vals.get('name')  # prevent errors during copy()
             alias_id = mail_alias.create_unique_alias(cr, uid,
-                    {'alias_name': vals['name']},
+                    {'alias_name': alias_name},
                     model_name="crm.lead",
                     context=context)
             vals['alias_id'] = alias_id
         res = super(crm_case_section, self).create(cr, uid, vals, context)
-        mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type':'lead'}}, context)
+        mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type': 'lead'}}, context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the sales team.
         mail_alias = self.pool.get('mail.alias')
-        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id ]
+        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
         res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
@@ -230,4 +287,5 @@ class crm_payment_mode(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index bf1f7d4082f..7204f666db5 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -26,6 +26,7 @@ Description: [[object.description]]
             <field name="name">Set Auto Reminder on leads which are not open since 5 days.</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="sequence">1</field>
+            <field name="kind">on_time</field>
             <field name="filter_id" ref="filter_draft_lead"/>
             <field name="trg_date_id" ref="field_crm_lead_create_date"/>
             <field name="trg_date_range">5</field>
@@ -54,12 +55,10 @@ object.write({'section_id': sales_team.id})
             <field name="name">Set Auto Followers on leads which are urgent and come from USA.</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="sequence">2</field>
+            <field name="kind">on_create</field>
             <field name="filter_id" ref="filter_usa_lead"/>
-            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
             <field name="act_user_id" ref="base.user_root"/>
-            <field name="trg_date_id" ref="field_crm_lead_create_date"/>
-            <field name="trg_date_range">0</field>
-            <field name="trg_date_range_type">minutes</field>
+            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
             <field name="server_action_ids" eval="[(6,0,[ref('action_set_team_sales_department')])]"/>
         </record>
     </data>
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
new file mode 100644
index 00000000000..be5611c03c4
--- /dev/null
+++ b/addons/crm/crm_case_section_view.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+  <data>
+
+        <!-- CRM lead search by Salesteams -->
+
+        <record model="ir.actions.act_window" id="crm_case_form_view_salesteams_lead">
+            <field name="name">Leads</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
+            <field name="view_id" ref="crm_case_tree_view_leads"/>
+            <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'search_default_open': 1,
+                    'default_section_id': active_id,
+                    'default_type': 'lead',
+                    'stage_type': 'lead',
+                }
+            </field>
+            <field name="help" type="html">
+                <p>
+                    Use leads if you need a qualification step before creating an
+                    opportunity or a customer. It can be a business card you received,
+                    a contact form filled in your website, or a file of unqualified
+                    prospects you import, etc.
+                </p><p>
+                    Once qualified, the lead can be converted into a business
+                    opportunity and/or a new customer in your address book.
+                </p>
+            </field>
+        </record>
+
+        <!-- CRM opportunity search by Salesteams -->
+
+        <record model="ir.actions.act_window" id="crm_case_form_view_salesteams_opportunity">
+            <field name="name">Opportunities</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_mode">kanban,tree,graph,form,calendar</field>
+            <field name="domain">[('type','=','opportunity')]</field>
+            <field name="view_id" ref="crm.crm_case_kanban_view_leads"/>
+            <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'search_default_assigned_to_me': 1,
+                    'default_section_id': active_id,
+                    'stage_type': 'opportunity',
+                    'default_type': 'opportunity',
+                    'default_user_id': uid,
+                }
+            </field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a new opportunity.
+                </p><p>
+                    OpenERP helps you keep track of your sales pipeline to follow
+                    up potential sales and better forecast your future revenues.
+                </p><p>
+                    You will be able to plan meetings and phone calls from
+                    opportunities, convert them into quotations, attach related
+                    documents, track all discussions, and much more.
+                </p>
+            </field>
+        </record>
+
+        <!-- Case Sections Salesteams kanban view -->
+
+        <record model="ir.ui.view" id="crm_case_section_salesteams_view_kanban">
+            <field name="name">crm.case.section.kanban</field>
+            <field name="model">crm.case.section</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" class="oe_background_grey">
+                    <field name="use_leads"/>
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="member_ids"/>
+                    <field name="note"/>
+                    <field name="alias_id"/>
+                    <field name="color"/>
+                    <field name="monthly_open_leads"/>
+                    <field name="monthly_planned_revenue"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_kanban_crm_salesteams">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_sale_manager">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li t-if="widget.view.is_action_enabled('edit')"><a type="edit">Sales Teams Settings</a></li>
+                                        <li t-if="widget.view.is_action_enabled('delete')"><a type="delete">Delete</a></li>
+                                        <li t-if="widget.view.is_action_enabled('edit')"><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h4 class="oe_center"><field name="name"/></h4>
+                                    <div class="oe_kanban_alias oe_center" t-if="record.use_leads.raw_value and record.alias_id.value">
+                                        <small><span class="oe_e" style="float: none;">%%</span><t t-raw="record.alias_id.raw_value[1]"/></small>
+                                    </div>
+                                    <div class="oe_items_list">
+                                        <div class="oe_salesteams_leads" t-if="record.use_leads.raw_value">
+                                            <a name="%(crm_case_form_view_salesteams_lead)d" type="action">Leads</a>
+                                            <a name="%(action_report_crm_lead)d" type="action" class="oe_sparkline_bar_link"><field name="monthly_open_leads" widget="sparkline_bar">Open Leads per Month<br/>Click to see a detailed analysis of leads.</field></a>
+                                        </div>
+                                        <div class="oe_salesteams_opportunities">
+                                            <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">Opportunities</a>
+                                            <a name="%(action_report_crm_opportunity)d" type="action"><field name="monthly_planned_revenue" widget="sparkline_bar">Planned Revenue per Month<br/>Click to see a detailed analysis of opportunities.</field></a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <!-- Case Sections Search view -->
+
+        <record id="crm_case_section_salesteams_search" model="ir.ui.view">
+            <field name="name">Case Sections - Search</field>
+            <field name="model">crm.case.section</field>
+            <field name="arch" type="xml">
+                <search string="Salesteams Search">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="user_id"/>
+                    <field name="note"/>
+                    <field name="code"/>
+                    <filter name="personal" string="My Salesteams" domain="['|', ('member_ids', '=', uid), ('user_id', '=', uid)]"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Team Leader" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Parent Sales Teams" domain="[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!-- Case Sections Action -->
+
+        <record id="crm_case_section_salesteams_act" model="ir.actions.act_window">
+            <field name="name">Sales Teams</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{'search_default_personal': True}</field>
+            <field name="view_id" ref="crm_case_section_salesteams_view_kanban"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to define a new sales team.
+                </p><p>
+                    Use sales team to organize your different salespersons or
+                    departments into separate teams. Each team will work in
+                    its own list of opportunities.
+                </p>
+            </field>
+        </record>
+
+        <!-- Case Sections Form View -->
+
+        <record id="crm_case_section_view_form" model="ir.ui.view">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="arch" type="xml">
+                <form string="Sales Team" version="7.0">
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only" string="Sales team"/>
+                            <h1>
+                                <field name="name" string="Salesteam"/>
+                            </h1>
+                            <div name="group_alias"
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                <label for="alias_id" string="Email Alias"/>
+                                <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                                <span name="edit_alias" class="oe_edit_only">
+                                    <field name="alias_name" class="oe_inline"
+                                            attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>
+                                    @
+                                    <field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </span>
+                            </div>
+                            <div name="options_active">
+                                <field name="use_leads" class="oe_inline"/><label for="use_leads"/>
+                            </div>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="user_id"/>
+                                <field name="code"/>
+                            </group>
+                            <group>
+                                <field name="parent_id"/>
+                                <field name="change_responsible"/>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Team Members">
+                                <field name="member_ids" widget="many2many_kanban">
+                                    <kanban quick_create="false" create="true">
+                                        <field name="name"/>
+                                        <templates>
+                                            <t t-name="kanban-box">
+                                                <div style="position: relative">
+                                                    <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
+                                                    <div class="oe_module_vignette">
+                                                        <div class="oe_module_desc">
+                                                            <field name="name"/>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </t>
+                                        </templates>
+                                    </kanban>
+                                </field>
+                            </page>
+                            <page string="Stages">
+                                <separator string="Select Stages for this Sales Team"/>
+                                <field name="stage_ids"/>
+                            </page>
+                            <page string="Notes">
+                                <field name="note"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" help="Follow this salesteam to automatically track the events associated to users of this team."/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- Case Sections Tree View -->
+
+        <record id="crm_case_section_view_tree" model="ir.ui.view">
+            <field name="name">crm.case.section.tree</field>
+            <field name="model">crm.case.section</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree string="Sales Team">
+                    <field name="name"/>
+                    <field name="code"/>
+                    <field name="user_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- Case Sections Action -->
+
+        <record model="ir.actions.act_window.view" id="action_crm_tag_kanban_view_salesteams_oppor11">
+            <field name="sequence" eval="0"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_id" ref="crm_case_kanban_view_leads"/>
+            <field name="act_window_id" ref="crm_case_form_view_salesteams_opportunity"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_salesteams_oppor11">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="crm_case_tree_view_oppor"/>
+            <field name="act_window_id" ref="crm_case_form_view_salesteams_opportunity"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_salesteams_oppor11">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_case_form_view_oppor"/>
+            <field name="act_window_id" ref="crm_case_form_view_salesteams_opportunity"/>
+        </record>
+
+        <record id="crm_case_section_act_tree" model="ir.actions.act_window">
+            <field name="name">Cases by Sales Team</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="view_type">tree</field>
+            <field name="view_id" ref="crm_case_section_view_tree"/>
+        </record>
+
+        <record id="crm_case_section_act" model="ir.actions.act_window">
+            <field name="name">Sales Teams</field>
+            <field name="res_model">crm.case.section</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_case_section_view_tree"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to define a new sales team.
+                </p><p>
+                    Use sales team to organize your different salespersons or
+                    departments into separate teams. Each team will work in
+                    its own list of opportunities.
+                </p>
+            </field>
+        </record>
+
+        <menuitem id="crm.menu_crm_case_section_act"
+            action="crm_case_section_salesteams_act"
+            sequence="1"
+            parent="base.menu_sales"
+            groups="base.group_multi_salesteams"/>
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 3db7a457dfd..1f1bd74391a 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -27,8 +27,11 @@
         </record>
 
         <record model="crm.case.section" id="section_sales_department">
-            <field name="name">Sales Department</field>
-            <field name="code">Sales</field>
+            <field name="name">Direct Sales</field>
+            <field name="code">DM</field>
+            <field name="use_leads">True</field>
+            <field name="alias_name">info</field>
+            <field name="member_ids" eval="[(4, ref('base.user_root'))]"/>
         </record>
 
         <!-- Payment Mode -->
@@ -64,12 +67,6 @@
 <p>To manage quotations and sale orders, install the "Sales Management" application.</p>]]></field>
         </record>
 
-        <record model="mail.alias" id="default_sales_alias">
-            <field name="alias_name">sales</field>
-            <field name="alias_model_id" ref="model_crm_lead"/>
-            <field name="alias_user_id" ref="base.user_root"/>
-            <field name="alias_defaults">{'type':'lead'}</field>
-        </record>
     </data>
 
 </openerp>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 203193dc3bc..2858250e86a 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -7,27 +7,13 @@
         </record>
 
         <record model="crm.case.section" id="crm_case_section_1">
-            <field name="name">Sales Marketing Department</field>
-            <field name="code">SMD</field>
-            <field name="parent_id" ref="crm.section_sales_department"/>
+            <field name="name">Indirect Sales</field>
+            <field name="code">IM</field>
         </record>
 
         <record model="crm.case.section" id="crm_case_section_2">
-            <field name="name">Support Department</field>
+            <field name="name">Marketing</field>
             <field name="code">SPD</field>
-            <field name="parent_id" ref="crm.section_sales_department"/>
-        </record>
-
-        <record model="crm.case.section" id="crm_case_section_3">
-            <field name="name">Direct Marketing</field>
-            <field name="code">DM</field>
-            <field name="parent_id" ref="crm.section_sales_department"/>
-        </record>
-
-        <record model="crm.case.section" id="crm_case_section_4">
-            <field name="name">Online Support</field>
-            <field name="code">OS</field>
-            <field name="parent_id" ref="crm.crm_case_section_2"/>
         </record>
 
         <record model="crm.segmentation" id="crm_segmentation0">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 3f676329765..b8673e73927 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,8 +23,9 @@ from openerp.addons.base_status.base_stage import base_stage
 import crm
 from datetime import datetime
 from operator import itemgetter
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import time
+from openerp import SUPERUSER_ID
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
@@ -76,15 +77,22 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     _track = {
         'state': {
-            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
+            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
             'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
             'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
         },
         'stage_id': {
-            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'cancel', 'done'],
+            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'cancel', 'done'],
         },
     }
 
+    def get_empty_list_help(self, cr, uid, help, context=None):
+        if context.get('default_type') == 'lead':
+            context['empty_list_help_model'] = 'crm.case.section'
+            context['empty_list_help_id'] = context.get('default_section_id')
+        context['empty_list_help_document_name'] = _("leads")
+        return super(crm_lead, self).get_empty_list_help(cr, uid, help, context=context)
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
@@ -95,7 +103,9 @@ class crm_lead(base_stage, format_address, osv.osv):
             if vals.get('type'):
                 ctx['default_type'] = vals['type']
             vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
-        return super(crm_lead, self).create(cr, uid, vals, context=context)
+        # context: no_log, because subtype already handle this
+        create_context = dict(context, mail_create_nolog=True)
+        return super(crm_lead, self).create(cr, uid, vals, context=create_context)
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
@@ -267,7 +277,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange',
-                        domain="['&', '&', ('fold', '=', False), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
+                        domain="['&', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -356,6 +366,16 @@ class crm_lead(base_stage, format_address, osv.osv):
             }
         return {'value' : values}
 
+    def on_change_user(self, cr, uid, ids, user_id, context=None):
+        """ When changing the user, also set a section_id or restrict section id
+            to the ones user_id is member of. """
+        section_id = self._get_default_section_id(cr, uid, context=context) or False
+        if user_id and not section_id:
+            section_ids = self.pool.get('crm.case.section').search(cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context)
+            if section_ids:
+                section_id = section_ids[0]
+        return {'value': {'section_id': section_id}}
+
     def _check(self, cr, uid, ids=False, context=None):
         """ Override of the base.stage method.
             Function called by the scheduler to process cases for date actions
@@ -660,8 +680,9 @@ class crm_lead(base_stage, format_address, osv.osv):
                 merged_data['stage_id'] = section_stage_ids and section_stage_ids[0] or False
         # Write merged data into first opportunity
         self.write(cr, uid, [highest.id], merged_data, context=context)
-        # Delete tail opportunities
-        self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
+        # Delete tail opportunities 
+        # We use the SUPERUSER to avoid access rights issues because as the user had the rights to see the records it should be safe to do so
+        self.unlink(cr, SUPERUSER_ID, [x.id for x in tail_opportunities], context=context)
 
         return highest.id
 
@@ -963,15 +984,28 @@ class crm_lead(base_stage, format_address, osv.osv):
     def message_get_reply_to(self, cr, uid, ids, context=None):
         """ Override to get the reply_to of the parent project. """
         return [lead.section_id.message_get_reply_to()[0] if lead.section_id else False
-                    for lead in self.browse(cr, uid, ids, context=context)]
+                    for lead in self.browse(cr, SUPERUSER_ID, ids, context=context)]
+
+    def _get_formview_action(self, cr, uid, id, context=None):
+        action = super(crm_lead, self)._get_formview_action(cr, uid, id, context=context)
+        obj = self.browse(cr, uid, id, context=context)
+        if obj.type == 'opportunity':
+            model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+            action.update({
+                'views': [(view_id, 'form')],
+                })
+        return action
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
         recipients = super(crm_lead, self).message_get_suggested_recipients(cr, uid, ids, context=context)
-        for lead in self.browse(cr, uid, ids, context=context):
-            if lead.partner_id:
-                self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
-            elif lead.email_from:
-                self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+        try:
+            for lead in self.browse(cr, uid, ids, context=context):
+                if lead.partner_id:
+                    self._message_add_suggested_recipient(cr, uid, recipients, lead, partner=lead.partner_id, reason=_('Customer'))
+                elif lead.email_from:
+                    self._message_add_suggested_recipient(cr, uid, recipients, lead, email=lead.email_from, reason=_('Customer Email'))
+        except (osv.except_osv, orm.except_orm):  # no read access rights -> just ignore suggested recipients because this imply modifying followers
+            pass
         return recipients
 
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
@@ -1036,6 +1070,14 @@ class crm_lead(base_stage, format_address, osv.osv):
         message = _("%s a call for %s.%s") % (prefix, phonecall.date, suffix)
         return self.message_post(cr, uid, ids, body=message, context=context)
 
+    def log_meeting(self, cr, uid, ids, meeting_subject, meeting_date, duration, context=None):
+        if not duration:
+            duration = _('unknown')
+        else:
+            duration = str(duration)
+        message = _("Meeting scheduled at '%s'<br> Subject: %s <br> Duration: %s hour(s)") % (meeting_date, meeting_subject, duration)
+        return self.message_post(cr, uid, ids, body=message, context=context)
+
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:
             country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index e410cbe3d85..0979a94eb3f 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -54,6 +54,7 @@
         </record>
         <record model="crm.case.stage" id="stage_lead6">
             <field name="name">Won</field>
+            <field eval="True" name="fold"/>
             <field eval="1" name="case_default"/>
             <field name="state">done</field>
             <field eval="100" name="probability"/>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 21d60ad2961..e7e6beae33e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -20,7 +20,7 @@
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
@@ -44,7 +44,7 @@ Can you send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
@@ -63,7 +63,7 @@ Can you send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead2"/>
             <field eval="1" name="active"/>
@@ -82,7 +82,7 @@ Can you send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead7"/>
             <field eval="1" name="active"/>
@@ -133,7 +133,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
@@ -152,7 +152,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
             <field name="priority">5</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead7"/>
             <field eval="1" name="active"/>
@@ -197,6 +197,9 @@ Contact: +1 813 494 5005</field>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
+        <record id="crm_case_9" model="crm.lead">
+            <field name="create_date" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
 
         <record id="crm_case_10" model="crm.lead">
             <field name="type">lead</field>
@@ -211,7 +214,7 @@ Contact: +1 813 494 5005</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">2</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
@@ -235,7 +238,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
@@ -291,7 +294,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-25')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
@@ -317,7 +320,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
@@ -326,7 +329,7 @@ Andrew</field>
         <record id="crm_case_15" model="crm.lead">
             <field name="type">opportunity</field>
             <field name="name">Plan to buy RedHat servers</field>
-            <field eval="35000" name="planned_revenue"/>
+            <field eval="25000" name="planned_revenue"/>
             <field eval="30.0" name="probability"/>
             <field name="street">69 rue de Chimay</field>
             <field name="country_id" ref="base.be"/>
@@ -339,10 +342,11 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
-            <field name="section_id" ref="crm_case_section_3"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead4"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_16" model="crm.lead">
@@ -367,6 +371,7 @@ Andrew</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_17" model="crm.lead">
@@ -388,10 +393,11 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-3')" name="date_action"/>
             <field name="title_action">Send price list regarding our interventions</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_18" model="crm.lead">
@@ -412,7 +418,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
@@ -438,8 +444,9 @@ Andrew</field>
             <field name="title_action">Ask for the good receprion of the proposition</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="stage_id" ref="crm.stage_lead4"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(months=3)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_20" model="crm.lead">
@@ -468,10 +475,11 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="stage_id" ref="crm.stage_lead8"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_22" model="crm.lead">
@@ -486,7 +494,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
@@ -504,14 +512,15 @@ Andrew</field>
             <field name="priority">5</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead5"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_24" model="crm.lead">
             <field name="type">opportunity</field>
             <field name="name">Need 20 Days of Consultancy</field>
-            <field eval="5025" name="planned_revenue"/>
+            <field eval="6025" name="planned_revenue"/>
             <field eval="90.0" name="probability"/>
             <field name="email_from">info@mycompany.net</field>
             <field name="country_id" ref="base.pe"/>
@@ -525,6 +534,7 @@ Andrew</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(month=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_25" model="crm.lead">
@@ -544,7 +554,7 @@ Andrew</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
-            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
@@ -569,10 +579,11 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
-            <field name="section_id" ref="crm_case_section_4"/>
+            <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead3"/>
+            <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
+            <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <!-- Unsubscribe Admin from case15, subscribe Demo -->
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 8c38ed41a1c..7ee3287fd75 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -9,34 +9,24 @@
         <field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
         <field name="view_id" ref="crm_case_tree_view_leads"/>
         <field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
-        <field name="context">{'default_type':'lead', 'stage_type':'lead'}</field>
-        <field name="help" type="html">
-          <p class="oe_view_nocontent_create">
-            Click to create an unqualified lead.
-          </p><p>
-            Use leads if you need a qualification step before creating an
-            opportunity or a customer. It can be a business card you received,
-            a contact form filled in your website, or a file of unqualified
-            prospects you import, etc.
-          </p><p>
-            Once qualified, the lead can be converted into a business
-            opportunity and/or a new customer in your address book.
-          </p>
+        <field name="context">{
+                'default_type':'lead',
+                'stage_type':'lead',
+                'needaction_menu_ref': 'crm.menu_crm_opportunities',
+                'search_default_unassigned':1,
+            }
+        </field>
+        <field name="help" type="html">
+            <p>
+                Use leads if you need a qualification step before creating an
+                opportunity or a customer. It can be a business card you received,
+                a contact form filled in your website, or a file of unqualified
+                prospects you import, etc.
+            </p><p>
+                Once qualified, the lead can be converted into a business
+                opportunity and/or a new customer in your address book.
+            </p>
         </field>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
-        <field name="sequence" eval="1"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="crm_case_tree_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
-    </record>
-
-    <record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
-        <field name="sequence" eval="3"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="crm_case_form_view_leads"/>
-        <field name="act_window_id" ref="crm_case_category_act_leads_all"/>
     </record>
 
     <record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
@@ -44,20 +34,25 @@
         <field name="res_model">crm.lead</field>
         <field name="view_mode">kanban,tree,graph,form,calendar</field>
         <field name="domain">[('type','=','opportunity')]</field>
-        <field name="context">{'stage_type': 'opportunity', 'default_type': 'opportunity', 'default_user_id': uid}</field>
+        <field name="context">{
+                'stage_type': 'opportunity', 
+                'default_type': 'opportunity', 
+                'default_user_id': uid
+            }
+        </field>
         <field name="view_id" eval="False"/>
         <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
         <field name="help" type="html">
-          <p class="oe_view_nocontent_create">
-          Click to create a new opportunity.
-          </p><p>
-          OpenERP helps you keep track of your sales pipeline to follow
-          up potential sales and better forecast your future revenues.
-          </p><p>
-          You will be able to plan meetings and phone calls from
-          opportunities, convert them into quotations, attach related
-          documents, track all discussions, and much more.
-          </p>
+            <p class="oe_view_nocontent_create">
+                Click to create a new opportunity.
+            </p><p>
+                OpenERP helps you keep track of your sales pipeline to follow
+                up potential sales and better forecast your future revenues.
+            </p><p>
+                You will be able to plan meetings and phone calls from
+                opportunities, convert them into quotations, attach related
+                documents, track all discussions, and much more.
+            </p>
         </field>
     </record>
 
@@ -82,9 +77,13 @@
         <field name="act_window_id" ref="crm_case_category_act_oppor11"/>
     </record>
 
-    <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" />
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" />
+    <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1"/>
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" sequence="3"
+            action="crm_case_category_act_leads_all"
+            groups="base.group_mono_salesteams,base.group_sale_manager"/>
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" sequence="4"
+            action="crm_case_category_act_oppor11"
+            groups="base.group_mono_salesteams,base.group_sale_manager"/>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 894df92b70f..6ddd06c1c90 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -152,12 +152,14 @@
                             -->
                         </group>
                         <group>
-                            <field name="user_id"
-                                context="{'default_groups_ref': ['base.group_user', 'base.group_sale_salesman_all_leads']}"/>
-                            <label for="section_id"/>
-                            <div>
+                            <field name="user_id" on_change="on_change_user(user_id, context)"
+                                context="{'default_groups_ref': ['base.group_user', 'base.group_sale_salesman_all_leads'] }"/>
+                            <label for="section_id" groups="base.group_multi_salesteams"/>
+                            <div groups="base.group_multi_salesteams">
                                 <field name="section_id"/>
-                                <button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
+                                <button name="case_escalate" string="Escalate"
+                                        type="object" class="oe_link"
+                                        attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
                             </div>
                             <field name="type" invisible="1"/>
                         </group>
@@ -229,7 +231,7 @@
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
+                    <field name="section_id" invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
                     <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
@@ -327,22 +329,22 @@
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
-                    <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="create_date"/>
                     <field name="country_id" context="{'invisible_country': False}"/>
                     <separator/>
                     <filter string="Open" name="open" domain="[('state','!=','cancel')]" help="Open Leads"/>
                     <filter string="Dead" name="dead" domain="[('state','=','cancel')]"/>
-                    <filter string="Unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
                     <filter string="Assigned to Me"
                             domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
                             help="Leads that are assigned to me"/>
                     <filter string="Assigned to My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                            help="Leads that are assigned to any sales teams I am member of"/>
+                            help="Leads that are assigned to any sales teams I am member of" groups="base.group_multi_salesteams"/>
                     <separator />
                     <filter string="Available for mass mailing"
                             name='not_opt_out' domain="[('opt_out', '=', False)]"
@@ -350,7 +352,7 @@
                     <separator />
                     <group expand="0" string="Group By...">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Customer" help="Partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Country" domain="[]" context="{'group_by':'country_id'}"/>
@@ -361,7 +363,7 @@
                     </group>
                     <group string="Display">
                         <filter string="Show Countries" context="{'invisible_country': False}" help="Show Countries"/>
-                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team" groups="base.group_multi_salesteams"/>
                     </group>
                 </search>
             </field>
@@ -428,9 +430,9 @@
                             </group>
 
                             <group>
-                                <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_sale_salesman_all_leads']}"/>
-                                <label for="section_id"/>
-                                <div>
+                                <field name="user_id" on_change="on_change_user(user_id, context)" context="{'default_groups_ref': ['base.group_user', 'base.group_sale_salesman_all_leads']}"/>
+                                <label for="section_id" groups="base.group_multi_salesteams"/>
+                                <div groups="base.group_multi_salesteams">
                                     <field name="section_id" widget="selection"/>
                                     <button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
                                 </div>
@@ -526,7 +528,7 @@
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="probability" avg="Avg. of Probability"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
+                    <field name="section_id" invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
                     <field name="user_id"/>
                     <field name="referred" invisible="1"/>
                     <field name="priority" invisible="1"/>
@@ -545,17 +547,17 @@
                 <search string="Search Opportunities">
                     <field name="name" string="Opportunity" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
                     <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
-                    <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <separator/>
                     <filter string="New" name="new" domain="[('state','=','draft')]" help="New Opportunities"/>
                     <filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
                     <filter string="Won" name="won" domain="[('state','=','done')]"/>
                     <filter string="Lost" name="lost" domain="[('state','=','cancel')]"/>
-                    <filter string="Unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
-                    <filter string="Assigned to Me"
+                    <filter string="My Opportunities" name="assigned_to_me"
                             domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to me"/>
                     <filter string="Assigned to My Team(s)"
@@ -576,7 +578,7 @@
                         <filter string="Creation" domain="[]" context="{'group_by':'create_date'}"/>
                     </group>
                     <group string="Display">
-                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                        <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team" groups="base.group_multi_salesteams"/>
                         <filter string="Show Countries" context="{'invisible_country': False}" help="Show Countries"/>
                     </group>
                 </search>
@@ -607,5 +609,22 @@
             <field name="ref_ir_act_window" ref="crm.action_lead_mass_mail"/>
         </record>
 
+        <record id="action_mark_as_lost" model="ir.actions.server">
+            <field name="name">Mark As Lost</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="state">code</field>
+            <field name="code">
+                if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
+                    self.case_cancel(cr, uid, context['active_ids'], context=context)
+            </field>
+        </record>
+
+        <record id="ir_mark_as_lost" model="ir.values">
+            <field eval="'client_action_multi'" name="key2"/>
+            <field eval="'crm.lead'" name="model"/>
+            <field name="name">Mark As Lost</field>
+            <field eval="'ir.actions.server,%d'%action_mark_as_lost" name="value"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 14b69ed0e11..c31907bebe2 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -34,6 +34,13 @@ class crm_meeting(osv.Model):
         'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"),
     }
 
+    def create(self, cr, uid, vals, context=None):
+        res = super(crm_meeting, self).create(cr, uid, vals, context=context)
+        obj = self.browse(cr, uid, res, context=context)
+        if obj.opportunity_id:
+            self.pool.get('crm.lead').log_meeting(cr, uid, [obj.opportunity_id.id], obj.name, obj.date, obj.duration, context=context)
+        return res
+
 
 class calendar_attendee(osv.osv):
     """ Calendar Attendee """
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index f441c29a7e6..4002e18815e 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -37,7 +37,7 @@
             <field name="name">Ask for convenient time of meeting</field>
             <field name="state">open</field>
             <field name="partner_phone">+1 786 525 0724</field>
-            <field name="section_id" ref="crm.crm_case_section_3"/>
+            <field name="section_id" ref="crm.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="5.0" name="duration"/>
@@ -50,7 +50,7 @@
             <field name="state">done</field>
             <field name="partner_phone">(077) 582-4035</field>
             <field name="partner_mobile">(077) 341-3591</field>
-            <field name="section_id" ref="crm.crm_case_section_4"/>
+            <field name="section_id" ref="crm.crm_case_section_2"/>
             <field eval="1" name="active"/>
             <field name="categ_id" ref="crm.categ_phone1"/>
             <field eval="5.45" name="duration"/>
@@ -74,7 +74,7 @@
             <field name="name">Proposal for discount offer</field>
             <field name="state">open</field>
             <field name="partner_phone">+34 230 953 485</field>
-            <field name="section_id" ref="crm.crm_case_section_3"/>
+            <field name="section_id" ref="crm.crm_case_section_2"/>
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="8.56" name="duration"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 67df85e6178..6c1b31180be 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -103,7 +103,8 @@
                         <field name="date"/>
                         <field name="user_id"/>
                         <field name="duration" widget="float_time"/>
-                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="section_id" colspan="1" widget="selection"
+                                groups="base.group_multi_salesteams"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                         <field name="email_from" invisible="1"/> <!--not needed because of the chatter, thus invisible, but must be in the view as it's returned by onchange_partner_id()-->
                         <field name="categ_id" widget="selection"
@@ -185,9 +186,10 @@
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
                        help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
-               <field name="partner_id"/>
+               <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                <field name="user_id"/>
-               <field name="section_id" string="Sales Team"/>
+               <field name="section_id" string="Sales Team"
+                        groups="base.group_multi_salesteams"/>
                <group expand="0" string="Group By...">
                    <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                    <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_report_view.xml b/addons/crm/crm_report_view.xml
index 355d862c898..39a2967c947 100644
--- a/addons/crm/crm_report_view.xml
+++ b/addons/crm/crm_report_view.xml
@@ -12,7 +12,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"/>
+                <field name="section_id" groups="base.group_multi_salesteams"/>
                 <field name="category2_id"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
@@ -33,7 +33,8 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"  widget="selection"/>
+                <field name="section_id" widget="selection"
+                        groups="base.group_multi_salesteams"/>
                 <field name="category2_id" />
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
@@ -53,7 +54,8 @@
             <graph string="Cases by Teams and Type" type="bar" orientation="horizontal">
                 <field name="category2_id"/>
                 <field name="amount_revenue" operator="+"/>
-                <field name="section_id" group="True"/>
+                <field name="section_id" group="True"
+                        groups="base.group_multi_salesteams"/>
             </graph>
         </field>
     </record>
@@ -69,7 +71,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                     <field name="category2_id"/>
                </search>
             </field>
@@ -95,7 +97,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"/>
+                <field name="section_id" groups="base.group_multi_salesteams"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
                 <field name="nbr"/>
@@ -115,7 +117,8 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"  widget="selection"/>
+                <field name="section_id" widget="selection"
+                        groups="base.group_multi_salesteams"/>
                 <field name="stage_id"/>
                 <field name="amount_revenue"/>
                 <field name="nbr" />
@@ -134,7 +137,7 @@
             <graph string="Cases by Team and Stage" type="bar" orientation="horizontal">
                 <field name="stage_id"/>
                 <field name="amount_revenue" operator="+"/>
-                <field name="section_id" group="True"/>
+                <field name="section_id" group="True" groups="base.group_multi_salesteams"/>
             </graph>
         </field>
     </record>
@@ -150,7 +153,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                </search>
             </field>
         </record>
@@ -175,7 +178,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"/>
+                <field name="section_id" groups="base.group_multi_salesteams"/>
                 <field name="categ_id"/>
                 <field name="stage_id"/>
                 <field name="nbr"/>
@@ -195,7 +198,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"  widget="selection"/>
+                <field name="section_id"  widget="selection" groups="base.group_multi_salesteams"/>
                 <field name="categ_id"/>
                 <field name="stage_id"/>
                 <field name="nbr" />
@@ -216,7 +219,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                </search>
             </field>
         </record>
@@ -230,7 +233,7 @@
             <graph string="Cases by Section, Category and Stage" type="bar" orientation="horizontal">
                 <field name="categ_id"/>
                 <field name="nbr" operator="+"/>
-                <field name="section_id" group="True"/>
+                <field name="section_id" group="True" groups="base.group_multi_salesteams"/>
             </graph>
         </field>
     </record>
@@ -255,7 +258,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"/>
+                <field name="section_id" groups="base.group_multi_salesteams"/>
                 <field name="categ_id"/>
                 <field name="category2_id"/>
                 <field name="stage_id"/>
@@ -276,7 +279,7 @@
                 <field name="name"/>
                 <field name="month"/>
                 <field name="user_id"/>
-                <field name="section_id"  widget="selection"/>
+                <field name="section_id"  widget="selection" groups="base.group_multi_salesteams"/>
                 <field name="categ_id"/>
                 <field name="category2_id"/>
                 <field name="stage_id"/>
@@ -298,7 +301,7 @@
                     <field name="month"/>
                     <field name="nbr"/>
                     <field name="state"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                </search>
             </field>
     </record>
@@ -312,7 +315,7 @@
             <graph string="Cases by Section, Category and Type" type="bar" orientation="horizontal">
                 <field name="category2_id"/>
                 <field name="nbr" operator="+"/>
-                <field name="section_id" group="True"/>
+                <field name="section_id" group="True" groups="base.group_multi_salesteams"/>
             </graph>
         </field>
     </record>
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index b11fac31dcf..6e596b5fb9c 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -108,7 +108,6 @@ added to partners that match the segmentation criterions after computation.'),
 
         self.write(cr, uid, ids, {'state':'running', 'partner_id':0})
         return self.process_continue(cr, uid, ids, start=True)
-crm_segmentation()
 
 class crm_segmentation_line(osv.osv):
     """ Segmentation line """
@@ -180,7 +179,6 @@ class crm_segmentation_line(osv.osv):
                     return True
         return True
 
-crm_segmentation_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 2c156ca2ac2..a84ae553b4a 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -70,109 +70,6 @@
 
         <menuitem action="crm_case_channel_action" id="menu_crm_case_channel" parent="base.menu_crm_config_lead" sequence="4" groups="base.group_no_one"/>
 
-        <!-- Case Sections Form View -->
-
-        <record id="crm_case_section_view_form" model="ir.ui.view">
-            <field name="name">crm.case.section.form</field>
-            <field name="model">crm.case.section</field>
-            <field name="arch" type="xml">
-                <form string="Sales Team" version="7.0">
-                    <group>
-                        <group>
-                            <field name="name" colspan="2"/>
-                            <field name="parent_id"/>
-                            <field name="code"/>
-                        </group>
-
-                        <group>
-                            <field name="user_id"/>
-                            <field name="resource_calendar_id"/>
-                            <field name="active"/>
-                        </group>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Sales Team">
-                           <group>
-                                <field name="alias_id" invisible="1" required="0"/>
-                                <label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
-                                 </div>
-                                <field name="change_responsible"/>
-                            </group>
-                            <separator string="Team Members"/>
-                            <field name="member_ids" widget="many2many_kanban">
-                                <kanban quick_create="false" create="true">
-                                    <field name="name"/>
-                                    <templates>
-                                        <t t-name="kanban-box">
-                                            <div style="position: relative">
-                                                <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
-                                                <div class="oe_module_vignette">
-                                                    <div class="oe_module_desc">
-                                                        <field name="name"/>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </t>
-                                    </templates>
-                                </kanban>
-                            </field>
-                        </page>
-                        <page string="Stages">
-                            <separator string="Select Stages for this Sales Team"/>
-                            <field name="stage_ids"/>
-                        </page>
-                        <page string="Notes">
-                            <field name="note"/>
-                        </page>
-                    </notebook>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" help="Follow this salesteam to automatically track the events associated to users of this team."/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- Case Sections Tree View -->
-
-        <record id="crm_case_section_view_tree" model="ir.ui.view">
-            <field name="name">crm.case.section.tree</field>
-            <field name="model">crm.case.section</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree string="Sales Team">
-                    <field name="name"/>
-                    <field name="code"/>
-                    <field name="user_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Case Sections Action -->
-
-        <record id="crm_case_section_act" model="ir.actions.act_window">
-            <field name="name">Sales Teams</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm_case_section_view_tree"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to define a new sales team.
-              </p><p>
-                Use sales team to organize your different salespersons or
-                departments into separate teams. Each team will work in
-                its own list of opportunities.
-              </p>
-            </field>
-        </record>
-
-        <menuitem action="crm_case_section_act"
-            id="menu_crm_case_section_act" sequence="15"
-            parent="base.menu_base_config" groups="base.group_sale_manager"/>
-
-
         <!-- CRM Stage Tree View -->
 
         <record model="ir.ui.view" id="crm_case_stage_tree">
@@ -204,7 +101,7 @@
                         <field name="type"/>
                         <field name="on_change"/>
                         <field name="sequence"/>
-                        <field name="case_default"/>
+                        <field name="case_default" groups="base.group_multi_salesteams"/>
                         <field name="fold"/>
                     </group>
                     <separator string="Requirements"/>
@@ -233,7 +130,7 @@
                 <form string="Case Category" version="7.0">
                     <group>
                         <field name="name"/>
-                        <field name="section_id"/>
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
                         <field name="object_id" invisible="1"/>
                     </group>
                 </form>
@@ -248,7 +145,7 @@
             <field name="arch" type="xml">
                 <tree string="Case Category">
                     <field name="name"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                 </tree>
             </field>
         </record>
@@ -261,7 +158,7 @@
             <field name="arch" type="xml">
                 <tree string="Campaign">
                     <field name="name"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                 </tree>
             </field>
         </record>
@@ -275,7 +172,7 @@
                 <form string="Campaign" version="7.0">
                     <group>
                         <field name="name"/>
-                        <field name="section_id"/>
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
                     </group>
                 </form>
             </field>
@@ -295,13 +192,6 @@
             groups="base.group_no_one"
             parent="base.menu_crm_config_lead"/>
 
-        <record id="crm_case_section_act_tree" model="ir.actions.act_window">
-            <field name="name">Cases by Sales Team</field>
-            <field name="res_model">crm.case.section</field>
-            <field name="domain">[('parent_id','=',False)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="crm_case_section_view_tree"/>
-        </record>
 
         <!-- Segmentation line Tree View  -->
 
@@ -434,7 +324,7 @@
             <field name="arch" type="xml">
                 <tree string="Payment Mode">
                     <field name="name"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                 </tree>
             </field>
         </record>
@@ -448,7 +338,7 @@
                 <form string="Payment Mode" version="7.0">
                     <group>
                         <field name="name"/>
-                        <field name="section_id"/>
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/crm/html/Stephan-Keller.jpg b/addons/crm/html/Stephan-Keller.jpg
new file mode 100644
index 00000000000..57464ea0b2b
Binary files /dev/null and b/addons/crm/html/Stephan-Keller.jpg differ
diff --git a/addons/crm/html/claudia-sebastiani.jpg b/addons/crm/html/claudia-sebastiani.jpg
new file mode 100644
index 00000000000..f24ba95189a
Binary files /dev/null and b/addons/crm/html/claudia-sebastiani.jpg differ
diff --git a/addons/crm/html/crm_game.png b/addons/crm/html/crm_game.png
new file mode 100644
index 00000000000..b5416926793
Binary files /dev/null and b/addons/crm/html/crm_game.png differ
diff --git a/addons/crm/html/crm_game_01.png b/addons/crm/html/crm_game_01.png
new file mode 100644
index 00000000000..a3cd109c2de
Binary files /dev/null and b/addons/crm/html/crm_game_01.png differ
diff --git a/addons/crm/html/crm_game_02.png b/addons/crm/html/crm_game_02.png
new file mode 100644
index 00000000000..1a747e1ffe8
Binary files /dev/null and b/addons/crm/html/crm_game_02.png differ
diff --git a/addons/crm/html/crm_game_03.png b/addons/crm/html/crm_game_03.png
new file mode 100644
index 00000000000..2fd14886179
Binary files /dev/null and b/addons/crm/html/crm_game_03.png differ
diff --git a/addons/crm/html/crm_linkedin.png b/addons/crm/html/crm_linkedin.png
new file mode 100644
index 00000000000..e40563dbfc7
Binary files /dev/null and b/addons/crm/html/crm_linkedin.png differ
diff --git a/addons/crm/html/crm_sc_01.jpg b/addons/crm/html/crm_sc_01.jpg
new file mode 100644
index 00000000000..7a2a44d7b0d
Binary files /dev/null and b/addons/crm/html/crm_sc_01.jpg differ
diff --git a/addons/crm/html/crm_sc_01.png b/addons/crm/html/crm_sc_01.png
new file mode 100644
index 00000000000..8f1ff1e95fe
Binary files /dev/null and b/addons/crm/html/crm_sc_01.png differ
diff --git a/addons/crm/html/crm_sc_02.png b/addons/crm/html/crm_sc_02.png
new file mode 100644
index 00000000000..e20c44836ba
Binary files /dev/null and b/addons/crm/html/crm_sc_02.png differ
diff --git a/addons/crm/html/crm_sc_04a.png b/addons/crm/html/crm_sc_04a.png
new file mode 100644
index 00000000000..d0308e3f68b
Binary files /dev/null and b/addons/crm/html/crm_sc_04a.png differ
diff --git a/addons/crm/html/crm_sc_04b.png b/addons/crm/html/crm_sc_04b.png
new file mode 100644
index 00000000000..57b7965771e
Binary files /dev/null and b/addons/crm/html/crm_sc_04b.png differ
diff --git a/addons/crm/html/crm_sc_04c.png b/addons/crm/html/crm_sc_04c.png
new file mode 100644
index 00000000000..d3c4dbae043
Binary files /dev/null and b/addons/crm/html/crm_sc_04c.png differ
diff --git a/addons/crm/html/crm_sc_04d.png b/addons/crm/html/crm_sc_04d.png
new file mode 100644
index 00000000000..687bdfb971f
Binary files /dev/null and b/addons/crm/html/crm_sc_04d.png differ
diff --git a/addons/crm/html/crm_sc_05.png b/addons/crm/html/crm_sc_05.png
new file mode 100644
index 00000000000..b71ce805250
Binary files /dev/null and b/addons/crm/html/crm_sc_05.png differ
diff --git a/addons/crm/html/crm_sc_06.png b/addons/crm/html/crm_sc_06.png
new file mode 100644
index 00000000000..1da7d5e841f
Binary files /dev/null and b/addons/crm/html/crm_sc_06.png differ
diff --git a/addons/crm/html/crm_sc_08.png b/addons/crm/html/crm_sc_08.png
new file mode 100644
index 00000000000..b47d9738cf9
Binary files /dev/null and b/addons/crm/html/crm_sc_08.png differ
diff --git a/addons/crm/html/crm_sc_agenda.png b/addons/crm/html/crm_sc_agenda.png
new file mode 100644
index 00000000000..a0f57eb4bca
Binary files /dev/null and b/addons/crm/html/crm_sc_agenda.png differ
diff --git a/addons/crm/html/crm_sc_marketing.png b/addons/crm/html/crm_sc_marketing.png
new file mode 100644
index 00000000000..f7662587969
Binary files /dev/null and b/addons/crm/html/crm_sc_marketing.png differ
diff --git a/addons/crm/html/index.html b/addons/crm/html/index.html
new file mode 100644
index 00000000000..5ae542f5c91
--- /dev/null
+++ b/addons/crm/html/index.html
@@ -0,0 +1,252 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Customer Relationship Management</h2>
+            <h3 class="oe_slogan">Boost sales productivity, improve win rates, grow revenue</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="crm_sc_01.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Manage your sales funnel with no effort. Attract leads, follow-up on phone calls and meetings. Analyse the quality of your leads to make informed decisions and save time by integrating emails directly into the application.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Your Sales Funnel, The Way You Like It</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Track your opportunities pipeline with the revolutionary kanban view. Work inside your sales funnel and get instant visual information about next actions, new messages, top opportunities and expected revenues.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_02.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Social Network Integration</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_linkedin.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Bring social intelligence to your sales process. Gain insights from social media site LinkedIn to find prospects easily and load their data automatically into your address book.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Lead Management Made Easy</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Create leads automatically from incoming emails. Analyse leads efficiency and compare performance by campaigns, channels or sales team.
+            </p>
+            <p class="oe_mt32">
+Find duplicates, merge leads and assign them to the right salesperson in one operation. Spend less time on administration and more time on qualifying leads.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Organize Your Opportunities</h2>
+        <h3 class="oe_slogan">A clean user interface with everything in one screen</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_06.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get your opportunities organized to stay focused on the best deals. Manage all your customer interactions from the opportunity like emails, phone calls, internal notes, meetings and quotations.
+            </p><p>
+Follow opportunities that interrests you to get notified upon specific events: deal won or lost, stage changed, new customer demand, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Email Integration and Automation</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Work with the email applications you already use every day. Whether your company uses Microsoft Outlook or Gmail, no one needs to change the way they work, so everyone stays productive.
+            </p><p>
+Route, sort and filter incoming emails automatically. OpenERP CRM handles incoming emails and route them to the right opportunities or sales team. New leads are created on the fly and interested salespersons are notified automatically.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_08.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Collaborative Agenda</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_agenda.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Schedule your meetings and phone calls using the integrated calendar. You can see your agenda and your colleagues' in one view. As a manager, it's easy to see what your team is busy with.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Lead Automation and Marketing Campaigns</h2>
+        <h3 class="oe_slogan">Drive performance by automating tasks</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+            Use our marketing campaigns to automate lead acquisition, follow ups and promotions. Define automated actions (e.g. ask a salesperson to call, send an email, ...) based on triggers (no activity since 20 days, answered a promotional email, etc.)
+            </p><p class="oe_mt32">
+            Optimize campaigns from lead to close, on every channel. Make smarter decisions about where to invest and show the impact of your marketing activities on your company's bottom line.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_marketing.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Customize Your Sales Cycle</h2>
+        <h3 class="oe_slogan">It Fits Your Sales Approach</h3>
+        <p>
+Customize your sales cycle by configuring sales stages that perfectly fit your sales approach. Control statistics to get accurate forecasts to improve your sales performance at every stage of your customer relationship.
+        </p>
+        <div class="oe_row_img oe_centered oe_mt32">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04a.png">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04b.png">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04c.png">
+            <img class="oe_picture oe_screenshot" src="crm_sc_04d.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_spaced oe_row">
+        <h2 class="oe_slogan">Reporting and Dashboards</h2>
+        <h3 class="oe_slogan">Get access to the right information to take smart decisions</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the insights you need to make smarter decisions. Design custom dashboards to get a picture of your business at a glance. Dig deeper with real-time reports that anyone can create and share.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_spaced oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Drive Engagement with Gamification</h2>
+        <h3 class="oe_slogan">Leverage sales' natural desire for competition</h3>
+        <p class="oe_mt32">
+               Reinforce good habits and improve win rates with real-time recognition and rewards inspired by <a href="http://en.wikipedia.org/wiki/Gamification">game mechanics</a>. Align sales teams around clear business objectives with challenges, personal objectives and team leader boards.
+        </p>
+        <div class="oe_span4 oe_centered">
+            <h3>Leaderboards</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_01.png">
+            </div>
+            <p>
+               Promote leaders and competition amongst sales team with performance ratios.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Personnal Objectives</h3>
+            <div class="oe_row_img">
+                <img class="oe_picture" src="crm_game_02.png">
+            </div>
+            <p>
+                Assign clear goals to users to align them with the company objectives.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Team Targets</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_03.png">
+            </div>
+            <p>
+                Compare revenues with forecasts and budgets in real time.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    With OpenERP CRM I keep all the information about leads and customers
+                    in a single place, and share it with my colleagues. It's great and effective.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="claudia-sebastiani.jpg">
+                    <div class="oe_author">Claudia Sebastiani</div>
+                    <div class="oe_job">Sales manager at <a href="http://openerp.creativiquadrati.it" target="_blank">CQ Creativi Quadrati</a>.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    I am surprised by how good OpenERP CRM is. Awesome product.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Stephan-Keller.jpg">
+                    <div class="oe_author">Stephan Keller</div>
+                    <div class="oe_job">CEO of <a href="http://www.sodexis.com" target="_blank">Sodexis, Inc</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 193fbdfc6cb..98313efb4f3 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-17 23:22+0000\n"
+"PO-Revision-Date: 2013-04-13 08:42+0000\n"
 "Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-19 05:33+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-14 05:12+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "Érdeklődők száma"
+msgstr "# Érdeklődések"
 
 #. module: crm
 #: help:sale.config.settings,fetchmail_lead:0
@@ -2688,7 +2688,7 @@ msgstr "Telefonhívásaim"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Qualification"
-msgstr "Végzettség"
+msgstr "Besorolás"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -2993,7 +2993,7 @@ msgstr "ekkor"
 #: selection:crm.lead,state:0
 #: view:crm.lead.report:0
 msgid "New"
-msgstr "új"
+msgstr "Új"
 
 #. module: crm
 #: field:crm.lead,function:0
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 697c7c4f083..a22d1f605a6 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/i18n/nl_BE.po
@@ -1,20 +1,20 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
 # * crm
-# Els Van Vossel <evv@agaplan.eu>, 2012.
+# Els Van Vossel <evv@agaplan.eu>, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-10-02 07:29+0000\n"
+"PO-Revision-Date: 2013-04-26 23:39+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 "Language: nl\n"
 
 #. module: crm
@@ -28,6 +28,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Hiermee kunt u de inkomende mailserver instellen en leads laten maken van "
+"binnenkomende e-mails."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:881
@@ -76,7 +78,7 @@ msgstr "Opportuniteiten kiezen"
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -96,7 +98,7 @@ msgstr "Fasenaam"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Verkoper"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -113,18 +115,18 @@ msgstr "Dag"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Bedrijfsnaam"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Training"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Verkooplabels"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -137,6 +139,7 @@ msgstr "Verw. sluiting"
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
 msgstr ""
+"Als dit is ingeschakeld, zijn er nieuwe berichten die uw aandacht vragen."
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -182,6 +185,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Bevat de Chatsamenvatting (aantal berichten, ...). Deze samenvatting is in "
+"html-formaat, zodat ze in de kanbanweergave kan worden gebruikt."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:624
@@ -189,7 +194,7 @@ msgstr ""
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: crm
 #: view:crm.lead:0
@@ -238,7 +243,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Herinnering voor gebruiker"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -266,7 +271,7 @@ msgstr "Leadanalyse"
 #: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s een gesprek</b> voor <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -328,6 +333,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een nieuwe klantensegmentering wilt instellen.\n"
+"              </p><p>\n"
+"                Maak specifiieke categorieën en ken deze toe aan uw\n"
+"                contactpersonen voor een betere interactie. Via\n"
+"                segmentering kunt u categorieën toekennen aan "
+"contactpersonen\n"
+"                volgens de door u ingestelde criteria.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -341,6 +356,7 @@ msgstr "Contactpersoon"
 msgid ""
 "When escalating to this team override the salesman with the team leader."
 msgstr ""
+"Bij escaleren naar dit team, wordt de verkoper vervangen door de teamleider."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -380,12 +396,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om een opportuniteit voor deze klant te maken.\n"
+"              </p><p>\n"
+"                Met opportuniteiten kunt u uw verkooppijplijn en uw "
+"mogelijke verkopen opvolgen,\n"
+"                voor een beter zicht op te verwachten inkomsten.\n"
+"              </p><p>\n"
+"                U kunt vergaderingen en telefoongesprekken plannen\n"
+"                voor opportuniteiten. U kunt van een opportuniteit een "
+"offerte maken, documenten\n"
+"                toevoegen, discussies volgen, en nog veel meer.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "Dood"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -393,7 +422,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -407,7 +436,7 @@ msgstr "Segmentering"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Koppelen aan een bestaande relatie"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -425,8 +454,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
-"Dit percentage drukt de standaard/gemiddelde slaagkans uit voor de zaak in "
-"deze fase."
+"Dit percentage drukt de standaard/gemiddelde slagingskans uit voor de zaak "
+"in deze fase."
 
 #. module: crm
 #: view:crm.lead:0
@@ -454,6 +483,7 @@ msgstr ""
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
+"Leads toegewezen aan een van de verkoopteams onder mijn beheer, of aan mij"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
@@ -472,6 +502,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een nieuw verkoopteam wilt maken.\n"
+"              </p><p>\n"
+"                Met verkoopteams organiseert u meerdere verkopers of "
+"afdelingen in\n"
+"                aparte teams. Elk team werkt op zijn eigen\n"
+"                opportuniteitenlijst.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -485,7 +524,7 @@ msgstr "Gewone of telefonische vergadering over opportuniteit"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -495,7 +534,7 @@ msgstr "Opportuniteit maken"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Instellen"
 
 #. module: crm
 #: view:crm.lead:0
@@ -555,18 +594,26 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"De status wordt op 'Uit te voeren' gezet als er een zaak wordt gemaakt.      "
+"                            \n"
+"Als de zaak lopende is, wordt de status op 'Open' gezet.                     "
+"             \n"
+"Als het gesprek is gevoerd, wordt de status op 'Uitgevoerd' gezet.           "
+"                       \n"
+"Als het gesprek nog moet worden uitgevoerd, gaat de status naar 'Niet "
+"uitgevoerd'."
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
 #: field:crm.lead,message_summary:0
 #: field:crm.phonecall,message_summary:0
 msgid "Summary"
-msgstr "Samenvatting"
+msgstr "Overzicht"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Samenvoegen"
 
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
@@ -589,6 +636,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Herinnering voor Lead: [[object.id ]] [[object.partner_id and 'van ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -608,7 +657,7 @@ msgstr "De code van het verkoopteam moet uniek zijn"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "Email address of the contact"
-msgstr ""
+msgstr "E-mailadres van de contactpersoon"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -629,6 +678,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Klik als u een nieuwe categorie wilt maken.\n"
+"          </p><p>\n"
+"            Maak specifieke telefooncategorieën om beter de gesprekstypen\n"
+"            op te volgen in het systeem.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -734,12 +790,12 @@ msgstr "Televisie"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -749,7 +805,7 @@ msgstr "Verwerking stoppen"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -761,6 +817,8 @@ msgstr "Telefoongesprekken zoeken"
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Leads/Opportuniteiten die zijn toegewezen aan een van de verkoopteams onder "
+"mijn beheer"
 
 #. module: crm
 #: field:calendar.attendee,categ_id:0
@@ -781,7 +839,7 @@ msgstr "Van %s : %s"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -790,7 +848,7 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -809,6 +867,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Koppeling tussen fasen en verkoopteams. Deze maken de huidige fase enkel "
+"toegankelijk voor de gekozen verkoopteams."
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -847,7 +907,7 @@ msgstr "Relatiecategorie"
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Slagingskans (%)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -889,7 +949,7 @@ msgstr "Maart"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "E-mail verzenden"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
@@ -919,6 +979,8 @@ msgid ""
 "Opportunities that are assigned to either me or one of the sale teams I "
 "manage"
 msgstr ""
+"Opportuniteiten die zijn toegewezen aan een van de verkoopteams onder mijn "
+"beheer of aan mij"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
@@ -984,6 +1046,9 @@ msgid ""
 "Allows you to track your customers/suppliers claims and grievances.\n"
 "                    This installs the module crm_claim."
 msgstr ""
+"Hiermee kunt u klachten en problemen van klanten/ aan leveranciers "
+"opvolgen.\n"
+"                    Hiermee installeert u de module crm_claim."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -1058,7 +1123,7 @@ msgstr "Fase"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "Aan mij toegewezen telefoongesprekken"
 
 #. module: crm
 #: field:crm.lead,user_login:0
@@ -1086,11 +1151,13 @@ msgid ""
 "Allows you to communicate with Customer,  process Customer query, and "
 "provide better help and support. This installs the module crm_helpdesk."
 msgstr ""
+"Hiermee kunt u met de klant communiceren, vragen beantwoorden en betere "
+"ondersteuning verlenen. Hiermee installeert u de module crm_helpdesk."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Verwijderen"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
@@ -1100,7 +1167,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1141,12 +1208,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "Betalingswijzen"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1193,6 +1260,9 @@ msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
+"Dit veld dient om een onderscheid te maken tussen de fasen voor leads en die "
+"voor opportuniteiten, of om fasen in te stellen die voor beide typen van "
+"toepassing zijn."
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_create
@@ -1234,7 +1304,7 @@ msgstr "onbekend"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1247,7 +1317,7 @@ msgstr "Datum"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Onlineondersteuning"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1273,6 +1343,10 @@ msgid ""
 "set to 'Done'. If the case needs to be reviewed then the Status is  set to "
 "'Pending'."
 msgstr ""
+"De status wordt op 'Voorlopig' gezet als de zaak wordt gemaakt. Als de zaak "
+"lopende is, wordt de status op 'Open' gezet. Als de zaak is behandeld, wordt "
+"de status op 'Gereed' gezet. Als de zaak moet worden bekeken, wordt de "
+"status op 'Wachtend' gezet."
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
@@ -1306,7 +1380,7 @@ msgstr "Segmenteringsomschrijving"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Description"
-msgstr ""
+msgstr "Leadomschrijving"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:565
@@ -1317,7 +1391,7 @@ msgstr "Samengevoegde opportuniteiten"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Consulting"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1327,7 +1401,7 @@ msgstr "Code"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Opties"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1342,7 +1416,7 @@ msgstr "Telefoongesprekken in status Uit te voeren en Open."
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Verkopers"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1362,12 +1436,12 @@ msgstr "Annuleren"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Opportuniteiten voor mij of mijn team(s)"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1389,7 +1463,7 @@ msgstr ""
 #: field:crm.lead2opportunity.partner.mass,action:0
 #: field:crm.partner.binding,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "Gekoppelde klant"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1406,12 +1480,12 @@ msgstr "Lead/opportuniteit"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten samenvoegen"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "WOrdt gebruikt om fasen te rangschikken. Lager is beter."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1426,7 +1500,7 @@ msgstr "Leads/opportuniteiten in status Open."
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
@@ -1484,7 +1558,7 @@ msgstr "Naam"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities that are assigned to me"
-msgstr ""
+msgstr "Leads/opportuniteiten die aan mij zijn toegekend"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
@@ -1502,12 +1576,12 @@ msgstr "Mijn zaken"
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatiehistoriek"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "Landen tonen"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1531,7 +1605,7 @@ msgstr "Prospect omzetten naar relatie"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
-msgstr ""
+msgstr "CRM betalingswijze"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1554,7 +1628,7 @@ msgstr "Groeperen op..."
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge Leads/Opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten samenvoegen"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -1566,7 +1640,7 @@ msgstr "Hoofdteam"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Do not link to a customer"
-msgstr ""
+msgstr "Geen relatie koppelen"
 
 #. module: crm
 #: field:crm.lead,date_action:0
@@ -1580,11 +1654,14 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"De status van uw document wordt automatisch gewijzigd in de functie van de "
+"gekozen fase. Als een fase gekoppeld is aan de status 'Gesloten', dan wordt "
+"het document automatisch gesloten als het in deze status komt."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assign opportunities to"
-msgstr ""
+msgstr "Opportuniteiten toewijzen aan"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
@@ -1600,12 +1677,12 @@ msgstr "Maand van gesprek"
 #: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "Relatie is <b>gemaakt</b>."
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
 msgid "Manage Customer Claims"
-msgstr ""
+msgstr "Klachten van klanten opvolgen"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -1618,7 +1695,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "Diensten"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1657,7 +1734,7 @@ msgstr "Antwoord aan"
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "Weergeven"
 
 #. module: crm
 #: view:board.board:0
@@ -1693,12 +1770,12 @@ msgstr "Extra informatie"
 #. module: crm
 #: view:crm.lead:0
 msgid "Fund Raising"
-msgstr ""
+msgstr "Fondsenwerving"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "Bewerken…"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1730,13 +1807,15 @@ msgstr "Lead naar opportuniteit / relatie"
 #: help:crm.lead,partner_id:0
 msgid "Linked partner (optional). Usually created when converting the lead."
 msgstr ""
+"Gekoppelde relatie (optioneel). Doorgaans gemaakt bij het omzetten van de "
+"lead."
 
 #. module: crm
 #: field:crm.lead,payment_mode:0
 #: view:crm.payment.mode:0
 #: model:ir.actions.act_window,name:crm.action_crm_payment_mode
 msgid "Payment Mode"
-msgstr ""
+msgstr "Betalingswijze"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
@@ -1746,19 +1825,19 @@ msgstr "Vele leads naar opportuniteit / relatie"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "On Mail Server"
-msgstr ""
+msgstr "Op mailserver"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Contacts Segmentation"
-msgstr ""
+msgstr "Contactpersoonsegmentering"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -1773,7 +1852,7 @@ msgstr "Televerkoop"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Leads voor mij of mijn team(s)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1817,7 +1896,7 @@ msgstr "Lead / klant"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "Supportafdeling"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1881,13 +1960,13 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "Ontwerp"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing opportunities"
-msgstr ""
+msgstr "Samenvoegen met bestaande opportuniteiten"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1912,6 +1991,8 @@ msgid ""
 "The name of the future partner company that will be created while converting "
 "the lead into opportunity"
 msgstr ""
+"De naam van de toekomstige relatie die zal worden gemaakt als van de lead "
+"een opportuniteit wordt gemaakt."
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0
@@ -1945,7 +2026,7 @@ msgstr "Openstaande opportuniteiten"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Email Campaign - Services"
-msgstr ""
+msgstr "E-mailcampagne - Diensten"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2018,7 +2099,7 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Create a new customer"
-msgstr ""
+msgstr "Een  nieuwe klant maken"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2028,7 +2109,7 @@ msgstr "Verw. sluiting"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "Software"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2063,12 +2144,12 @@ msgstr "Plaats"
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "Beide"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "Gesprek uitgevoerd"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2079,12 +2160,12 @@ msgstr "Verantwoordelijke"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
-msgstr ""
+msgstr "Direct Marketing"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
@@ -2094,7 +2175,7 @@ msgstr "Creatiejaar"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
-msgstr ""
+msgstr "Conversieopties"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -2106,7 +2187,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2114,6 +2195,8 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"Het e-mailadres van het team. Nieuwe e-mails worden automatisch als lead "
+"gemaakt en toegekend aan dit team."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2172,7 +2255,7 @@ msgstr "Verder verwerken"
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2214,6 +2297,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Deze fase is niet zichtbaar, vb. in statusbalk of kanbanweergave, als er "
+"zich geen records in deze fase bevinden."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2229,12 +2314,12 @@ msgstr "Verkoopteam aan wie de zaak toebehoort"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Kopadvertenties"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2279,17 +2364,17 @@ msgstr "Objectnaam"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Telefoongesprekken voor mij of mijn team(s)"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "Herstellen"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Klantenservice"
 
 #. module: crm
 #: field:crm.case.section,message_ids:0
@@ -2344,7 +2429,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Gekoppelde status"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -2365,7 +2450,7 @@ msgstr "Een gesprek plannen/noteren"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "Leads/opportuniteiten kiezen"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2390,7 +2475,7 @@ msgstr "Bevestigen"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Ongelezen berichten"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2407,7 +2492,7 @@ msgstr "Optionele expressie"
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Volgers"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2430,7 +2515,7 @@ msgstr ""
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "Leads maken van binnenkomende mails"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2481,7 +2566,7 @@ msgstr "Opportuniteiten maken van leads"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "E-mailcampagne - Producten"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -2509,7 +2594,7 @@ msgstr "Allereerste contact met een nieuwe prospect"
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "Gesprekken"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2519,7 +2604,7 @@ msgstr "Kans automatisch wijzigen"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "Mijn telefoongesprekken"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
@@ -2530,7 +2615,7 @@ msgstr "Kwalificatie"
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Conversion Action"
-msgstr ""
+msgstr "Conversieactie"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2606,7 +2691,7 @@ msgstr "Verw. sluitingsjaar"
 #. module: crm
 #: model:ir.actions.client,name:crm.action_client_crm_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Het verkoopmenu openen"
 
 #. module: crm
 #: field:crm.lead,date_open:0
@@ -2629,12 +2714,12 @@ msgstr "Een gesprek plannen/noteren"
 #. module: crm
 #: field:crm.lead,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Geplande kosten"
 
 #. module: crm
 #: help:crm.lead,date_deadline:0
 msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Verwachte datum waarop de opportuniteit kan worden gerealiseerd."
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -2698,7 +2783,7 @@ msgstr "Straat 2"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "Helpdesk en ondersteuning"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
@@ -2785,7 +2870,7 @@ msgstr "Gesprek noteren"
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
-msgstr ""
+msgstr "Hiermee kunt u activiteiten voor fondsenwerving beheren"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -2797,6 +2882,8 @@ msgstr "Telefoongesprek"
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
 msgstr ""
+"Telefoongesprekken die zijn toegewezen aan een van de verkoopteams onder "
+"mijn beheer"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2806,7 +2893,7 @@ msgstr "Creatiedatum"
 #. module: crm
 #: view:crm.lead:0
 msgid "at"
-msgstr ""
+msgstr "bij"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -2875,7 +2962,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne notities"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2895,7 +2982,7 @@ msgstr "Straat"
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "Doorverwezen via"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2940,6 +3027,7 @@ msgstr "Verloren"
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
+"Gesloten/geannuleerde leads kunnen niet in een opportuniteit worden omgezet"
 
 #. module: crm
 #: view:crm.lead:0
@@ -4199,3 +4287,6 @@ msgstr ""
 
 #~ msgid "Recurrent"
 #~ msgstr "Recurrent"
+
+#~ msgid "Conditions on Case Fields"
+#~ msgstr "Voorwaardevelden"
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 19ae76e9f46..0029293866c 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-01 11:27+0000\n"
-"Last-Translator: Антон Лаврёнов <lavrton@gmail.com>\n"
+"PO-Revision-Date: 2013-06-06 09:56+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -56,6 +56,11 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"Внимание, необработанный кандидат создан более 5 дней назад.\n"
+"Название: [[object.name ]]\n"
+"Идентификатор: [[object.id ]]\n"
+"Описание: [[object.description]]\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
@@ -452,7 +457,7 @@ msgstr "# Предложений"
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
-msgstr ""
+msgstr "Пожалуйста, выберите хотя бы один элемент из списка ниже."
 
 #. module: crm
 #: view:crm.lead:0
@@ -953,7 +958,7 @@ msgstr "Следующее действие"
 #: code:addons/crm/crm_lead.py:763
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
-msgstr ""
+msgstr "<b>Партнер</b> установлен как <em>%s</em>."
 
 #. module: crm
 #: selection:crm.lead.report,state:0
@@ -1108,7 +1113,7 @@ msgstr "Удалить"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Предложение создано"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1397,7 +1402,7 @@ msgstr "Сделать"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr ""
+msgstr "Предложение отклонено"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -1446,7 +1451,7 @@ msgstr "Пользователи"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Стадия изменена"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -1759,7 +1764,7 @@ msgstr "Способ оплаты"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr "Массовое проведение предложений партнёру"
+msgstr "Массовое преобразование кандидатов в предложения"
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -1894,7 +1899,7 @@ msgstr "Кандидаты"
 #: code:addons/crm/crm_lead.py:563
 #, python-format
 msgid "Merged leads"
-msgstr ""
+msgstr "Объединенные кандидаты"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1917,7 +1922,7 @@ msgstr "Сделать"
 #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
 msgid "Lead to Opportunity"
-msgstr ""
+msgstr "Кандидат в предложение"
 
 #. module: crm
 #: field:crm.lead,user_email:0
@@ -2126,7 +2131,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Адрес"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2134,6 +2139,8 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"Адрес эл. почты связанный с этой командой. Новая полученная эл. почта будет "
+"автоматически создавать новые кандидаты связанные с командой."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2192,7 +2199,7 @@ msgstr "Продолжение процесса"
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 msgid "Convert to opportunity"
-msgstr "Преобразовать в возможность"
+msgstr "Преобразовать в предложение"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2234,6 +2241,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2249,7 +2258,7 @@ msgstr "Отдел продаж, которому принадлежит воп
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Баннер"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
@@ -2279,7 +2288,7 @@ msgstr "Выполняется"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
 msgid "Lead converted into an opportunity"
-msgstr ""
+msgstr "Кандидат превращенный в предложение"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2289,7 +2298,7 @@ msgstr "Нераспределенные кандидаты"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
 msgid "Opportunity won"
-msgstr ""
+msgstr "Предложение принято"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2364,7 +2373,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Связанный статус"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -2410,7 +2419,7 @@ msgstr "Подтвердить"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2501,7 +2510,7 @@ msgstr "Создание предложений из кандидатов"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Кампания эл. почты - Продукция"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -2578,7 +2587,7 @@ msgstr "Август"
 #: model:mail.message.subtype,name:crm.mt_lead_lost
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
 msgid "Opportunity Lost"
-msgstr ""
+msgstr "Предложение отклонено"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@@ -2644,7 +2653,7 @@ msgstr "Сотрудники отдела"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Запланировать/Описать звонок"
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
@@ -2654,7 +2663,7 @@ msgstr "Планируемые затраты"
 #. module: crm
 #: help:crm.lead,date_deadline:0
 msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Оценка даты на которую это предложение будет принято."
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -2676,7 +2685,7 @@ msgstr "Описанные звонки"
 #: model:mail.message.subtype,name:crm.mt_lead_won
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
 msgid "Opportunity Won"
-msgstr ""
+msgstr "Предложение принято"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2717,7 +2726,7 @@ msgstr "Улица (2-я строка)"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "Управление поддержкой"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
@@ -2826,7 +2835,7 @@ msgstr "Дата создания"
 #. module: crm
 #: view:crm.lead:0
 msgid "at"
-msgstr ""
+msgstr "в"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -2895,7 +2904,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Внутренние заметки"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2960,6 +2969,7 @@ msgstr "Проиграно"
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
+"Закрытые/Отмененные кандидаты не могут быть конвертированы в возможности."
 
 #. module: crm
 #: view:crm.lead:0
@@ -3050,7 +3060,7 @@ msgstr "Рассылка"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
 msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "Этап предложения изменен"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
diff --git a/addons/crm/process/crm_configuration_process.xml b/addons/crm/process/crm_configuration_process.xml
index c56bb8935d9..882c9680268 100644
--- a/addons/crm/process/crm_configuration_process.xml
+++ b/addons/crm/process/crm_configuration_process.xml
@@ -60,24 +60,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Prospect Opportunity&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Creating business opportunities from Leads&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_opportunities0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_leads0"/>
+            <field name="target_node_id" ref="process_node_opportunities0"/>
+            <field name="source_node_id" ref="process_node_leads0"/>
         </record>
 
         <record id="process_transition_leadpartner0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Prospect Partner&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Prospect is converting to business partner&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_partner0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_leads0"/>
+            <field name="target_node_id" ref="process_node_partner0"/>
+            <field name="source_node_id" ref="process_node_leads0"/>
         </record>
 
         <record id="process_transition_opportunitymeeting0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Meeting&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Normal or phone meeting for opportunity&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_meeting0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_meeting0"/>
+            <field name="source_node_id" ref="process_node_opportunities0"/>
         </record>
 
     </data>
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 323d6e4c3d6..d12facd66a0 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -145,6 +145,5 @@ class crm_lead_report(osv.osv):
                 WHERE c.active = 'true'
             )""")
 
-crm_lead_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 0e5df8837f1..09853c6379e 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -19,7 +19,8 @@
                 <field name="channel_id" invisible="1"/>
                 <field name="type" invisible="1"/>
                 <field name="priority" invisible="1"/>
-                <field name="section_id" invisible="1"/>
+                <field name="section_id" invisible="1"
+                        groups="base.group_multi_salesteams"/>
                 <field name="user_id" invisible="1"/>
                 <field name="company_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
@@ -74,13 +75,14 @@
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
                     <separator/>
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
-                            help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
+                            help="Leads/Opportunities that are assigned to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
-                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="section_id" context="{'invisible_section': False}"
+                            groups="base.group_multi_salesteams"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]" />
                         <field name="type_id"/>
                         <field name="channel_id"/>
@@ -134,7 +136,8 @@
                 <field name="creation_month" invisible="1"/>
                 <field name="creation_day" invisible="1"/>
                 <field name="deadline_month" invisible="1"/>
-                <field name="section_id" invisible="1"/>
+                <field name="section_id" invisible="1"
+                        groups="base.group_multi_salesteams"/>
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index c4b014bb86f..77195097965 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -98,6 +98,5 @@ class crm_phonecall_report(osv.osv):
                 from
                     crm_phonecall c
             )""")
-crm_phonecall_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 1f1a4f91046..aa2162d163a 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -11,7 +11,8 @@
                 <tree string="Phone calls" create="false">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="section_id" invisible="1"/>
+                    <field name="section_id" invisible="1"
+                            groups="base.group_multi_salesteams"/>
                     <field name="priority" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
@@ -56,13 +57,14 @@
                         help="Phone calls which are in pending state"/>
                     <separator/>
                     <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]"
-                            help="Phone calls that are assigned to one of the sale teams I manage"/>
+                            help="Phone calls that are assigned to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"
+                            groups="base.group_multi_salesteams"/>
                     <field name="user_id" string="Salesperson"/>
                     <group expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                         <field name="creation_date"/>
                         <field name="opening_date"/>
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 229ad0189ff..ea37c24fe06 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#    Copyright (C) 2004-TODAY OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,24 +21,51 @@
 
 from openerp.osv import fields, osv
 
-class crm_configuration(osv.osv_memory):
+
+class crm_configuration(osv.TransientModel):
     _name = 'sale.config.settings'
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
+    def set_group_multi_salesteams(self, cr, uid, ids, context=None):
+        """ This method is automatically called by res_config as it begins
+            with set. It is used to implement the 'one group or another'
+            behavior. We have to perform some group manipulation by hand
+            because in res_config.execute(), set_* methods are called
+            after group_*; therefore writing on an hidden res_config file
+            could not work.
+            If group_multi_salesteams is checked: remove group_mono_salesteams
+            from group_user, remove the users. Otherwise, just add
+            group_mono_salesteams in group_user.
+            The inverse logic about group_multi_salesteams is managed by the
+            normal behavior of 'group_multi_salesteams' field.
+        """
+        def ref(xml_id):
+            mod, xml = xml_id.split('.', 1)
+            return self.pool['ir.model.data'].get_object(cr, uid, mod, xml, context)
+
+        for obj in self.browse(cr, uid, ids, context=context):
+            config_group = ref('base.group_mono_salesteams')
+            base_group = ref('base.group_user')
+            if obj.group_multi_salesteams:
+                base_group.write({'implied_ids': [(3, config_group.id)]})
+                config_group.write({'users': [(3, u.id) for u in base_group.users]})
+            else:
+                base_group.write({'implied_ids': [(4, config_group.id)]})
+        return True
+
     _columns = {
-        'fetchmail_lead': fields.boolean("Create leads from incoming mails",
-            fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
-            help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
         'group_fund_raising': fields.boolean("Manage Fund Raising",
             implied_group='crm.group_fund_raising',
             help="""Allows you to trace and manage your activities for fund raising."""),
-        'module_crm_claim':fields.boolean("Manage Customer Claims",
+        'module_crm_claim': fields.boolean("Manage Customer Claims",
             help="""Allows you to track your customers/suppliers claims and grievances.
                     This installs the module crm_claim."""),
-        'module_crm_helpdesk':fields.boolean("Manage Helpdesk and Support",
-            help="""Allows you to communicate with Customer,  process Customer query, and provide better help and support. This installs the module crm_helpdesk."""),
-        
-        
+        'module_crm_helpdesk': fields.boolean("Manage Helpdesk and Support",
+            help="""Allows you to communicate with Customer, process Customer query, and provide better help and support. This installs the module crm_helpdesk."""),
+        'group_multi_salesteams': fields.boolean("Organize Sales activities into multiple Sales Teams",
+            implied_group='base.group_multi_salesteams',
+            help="""Allows you to use Sales Teams to manage your leads and opportunities."""),
     }
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 9534c8620ee..9fd542c9dbd 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -22,20 +22,15 @@
                             </div>
                         </div>
                     </group>
-	            </div>
-                <group name="On Mail Client" version="7.0" position="after">
+                    <separator string="Sales Teams"/>
                     <group>
-                        <label for="id" string="On Mail Server"/>
+                        <label for="id" string="Manage Sales Teams"/>
                         <div>
-                            <div name="fetchmail_lead">
-                                <field name="fetchmail_lead" class="oe_inline"/>
-                                <label for="fetchmail_lead"/>
-                                <button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
-                                attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
-                            </div>
+                            <field name="group_multi_salesteams" class="oe_inline"/>
+                            <label for="group_multi_salesteams"/>
                         </div>
                     </group>
-                </group>
+	            </div>
             </field>
         </record>
 
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 2fdccda2e06..f25b1303c02 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -92,7 +92,6 @@ class res_partner(osv.osv):
             }, context=context)
             opportunity_ids[partner_id] = opportunity_id
         return opportunity_ids
-res_partner()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 00a071fa954..dd6c50dbaba 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -10,7 +10,7 @@
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
                     <field name="user_id" position="after">
-                        <field name="section_id" completion="1"/>
+                        <field name="section_id" completion="1" groups="base.group_multi_salesteams"/>
                     </field>
                 </field>
         </record>
@@ -30,8 +30,11 @@
             <field name="res_model">crm.lead</field>
             <field name="view_mode">kanban,tree,form,graph,calendar</field>
             <field name="domain">[('type','=','opportunity')]</field>
-            <field name="context">{'search_default_partner_id': active_id,
-                'stage_type': 'opportunity', 'default_type': 'opportunity'}</field>
+            <field name="context">{
+                'search_default_partner_id': active_id,
+                'stage_type': 'opportunity', 
+                'default_type': 'opportunity'
+            }</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="crm.view_crm_case_opportunities_filter"/>
             <field name="help" type="html">
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 2c34252209c..34137dc0fac 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -22,6 +22,19 @@
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
+
+    <record id="base.group_mono_salesteams" model="res.groups">
+        <field name="name">Do Not Use Sales Teams</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+    <record id="base.group_user" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('base.group_mono_salesteams'))]"/>
+    </record>
+
+    <record id="base.group_multi_salesteams" model="res.groups">
+        <field name="name">Manage Sales Teams</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
     
     <record id="group_fund_raising" model="res.groups">
         <field name="name">Manage Fund Raising</field>
diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv
index 52648c8e347..cadb8c24550 100644
--- a/addons/crm/security/ir.model.access.csv
+++ b/addons/crm/security/ir.model.access.csv
@@ -12,7 +12,7 @@ access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.grou
 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0
 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0
 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0
-access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,1,1,0
+access_crm_case_section_user,crm.case.section.user,model_crm_case_section,base.group_sale_salesman,1,0,0,0
 access_crm_case_section_manager,crm.case.section.manager,model_crm_case_section,base.group_sale_manager,1,1,1,1
 access_crm_case_stage,crm.case.stage,model_crm_case_stage,,1,0,0,0
 access_crm_case_stage_manager,crm.case.stage,model_crm_case_stage,base.group_sale_manager,1,1,1,1
@@ -35,3 +35,5 @@ access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.gro
 access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1
 access_crm_payment_mode_user,crm.payment.mode,model_crm_payment_mode,base.group_sale_salesman,1,0,0,0
 access_crm_payment_mode,crm.payment.mode,model_crm_payment_mode,base.group_sale_manager,1,1,1,1
+access_base_partner_merge_line_manager,base_partner_merge_line.manager,model_base_partner_merge_line,base.group_system,1,1,1,1
+access_base_partner_merge_manager,base_partner_merge.manager,model_base_partner_merge_automatic_wizard,base.group_system,1,1,1,1
diff --git a/addons/crm/static/lib/sparkline/jquery.sparkline.js b/addons/crm/static/lib/sparkline/jquery.sparkline.js
new file mode 100644
index 00000000000..c003923e03b
--- /dev/null
+++ b/addons/crm/static/lib/sparkline/jquery.sparkline.js
@@ -0,0 +1,3047 @@
+/**
+*
+* jquery.sparkline.js
+*
+* v2.1.1
+* (c) Splunk, Inc
+* Contact: Gareth Watts (gareth@splunk.com)
+* http://omnipotent.net/jquery.sparkline/
+*
+* Generates inline sparkline charts from data supplied either to the method
+* or inline in HTML
+*
+* Compatible with Internet Explorer 6.0+ and modern browsers equipped with the canvas tag
+* (Firefox 2.0+, Safari, Opera, etc)
+*
+* License: New BSD License
+*
+* Copyright (c) 2012, Splunk Inc.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification,
+* are permitted provided that the following conditions are met:
+*
+*     * Redistributions of source code must retain the above copyright notice,
+*       this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright notice,
+*       this list of conditions and the following disclaimer in the documentation
+*       and/or other materials provided with the distribution.
+*     * Neither the name of Splunk Inc nor the names of its contributors may
+*       be used to endorse or promote products derived from this software without
+*       specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+* SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*
+* Usage:
+*  $(selector).sparkline(values, options)
+*
+* If values is undefined or set to 'html' then the data values are read from the specified tag:
+*   <p>Sparkline: <span class="sparkline">1,4,6,6,8,5,3,5</span></p>
+*   $('.sparkline').sparkline();
+* There must be no spaces in the enclosed data set
+*
+* Otherwise values must be an array of numbers or null values
+*    <p>Sparkline: <span id="sparkline1">This text replaced if the browser is compatible</span></p>
+*    $('#sparkline1').sparkline([1,4,6,6,8,5,3,5])
+*    $('#sparkline2').sparkline([1,4,6,null,null,5,3,5])
+*
+* Values can also be specified in an HTML comment, or as a values attribute:
+*    <p>Sparkline: <span class="sparkline"><!--1,4,6,6,8,5,3,5 --></span></p>
+*    <p>Sparkline: <span class="sparkline" values="1,4,6,6,8,5,3,5"></span></p>
+*    $('.sparkline').sparkline();
+*
+* For line charts, x values can also be specified:
+*   <p>Sparkline: <span class="sparkline">1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5</span></p>
+*    $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ])
+*
+* By default, options should be passed in as teh second argument to the sparkline function:
+*   $('.sparkline').sparkline([1,2,3,4], {type: 'bar'})
+*
+* Options can also be set by passing them on the tag itself.  This feature is disabled by default though
+* as there's a slight performance overhead:
+*   $('.sparkline').sparkline([1,2,3,4], {enableTagOptions: true})
+*   <p>Sparkline: <span class="sparkline" sparkType="bar" sparkBarColor="red">loading</span></p>
+* Prefix all options supplied as tag attribute with "spark" (configurable by setting tagOptionPrefix)
+*
+* Supported options:
+*   lineColor - Color of the line used for the chart
+*   fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart
+*   width - Width of the chart - Defaults to 3 times the number of values in pixels
+*   height - Height of the chart - Defaults to the height of the containing element
+*   chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied
+*   chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied
+*   chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax
+*   chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied
+*   chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied
+*   composite - If true then don't erase any existing chart attached to the tag, but draw
+*           another chart over the top - Note that width and height are ignored if an
+*           existing chart is detected.
+*   tagValuesAttribute - Name of tag attribute to check for data values - Defaults to 'values'
+*   enableTagOptions - Whether to check tags for sparkline options
+*   tagOptionPrefix - Prefix used for options supplied as tag attributes - Defaults to 'spark'
+*   disableHiddenCheck - If set to true, then the plugin will assume that charts will never be drawn into a
+*           hidden dom element, avoding a browser reflow
+*   disableInteraction - If set to true then all mouseover/click interaction behaviour will be disabled,
+*       making the plugin perform much like it did in 1.x
+*   disableTooltips - If set to true then tooltips will be disabled - Defaults to false (tooltips enabled)
+*   disableHighlight - If set to true then highlighting of selected chart elements on mouseover will be disabled
+*       defaults to false (highlights enabled)
+*   highlightLighten - Factor to lighten/darken highlighted chart values by - Defaults to 1.4 for a 40% increase
+*   tooltipContainer - Specify which DOM element the tooltip should be rendered into - defaults to document.body
+*   tooltipClassname - Optional CSS classname to apply to tooltips - If not specified then a default style will be applied
+*   tooltipOffsetX - How many pixels away from the mouse pointer to render the tooltip on the X axis
+*   tooltipOffsetY - How many pixels away from the mouse pointer to render the tooltip on the r axis
+*   tooltipFormatter  - Optional callback that allows you to override the HTML displayed in the tooltip
+*       callback is given arguments of (sparkline, options, fields)
+*   tooltipChartTitle - If specified then the tooltip uses the string specified by this setting as a title
+*   tooltipFormat - A format string or SPFormat object  (or an array thereof for multiple entries)
+*       to control the format of the tooltip
+*   tooltipPrefix - A string to prepend to each field displayed in a tooltip
+*   tooltipSuffix - A string to append to each field displayed in a tooltip
+*   tooltipSkipNull - If true then null values will not have a tooltip displayed (defaults to true)
+*   tooltipValueLookups - An object or range map to map field values to tooltip strings
+*       (eg. to map -1 to "Lost", 0 to "Draw", and 1 to "Win")
+*   numberFormatter - Optional callback for formatting numbers in tooltips
+*   numberDigitGroupSep - Character to use for group separator in numbers "1,234" - Defaults to ","
+*   numberDecimalMark - Character to use for the decimal point when formatting numbers - Defaults to "."
+*   numberDigitGroupCount - Number of digits between group separator - Defaults to 3
+*
+* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default),
+* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box'
+*    line - Line chart.  Options:
+*       spotColor - Set to '' to not end each line in a circular spot
+*       minSpotColor - If set, color of spot at minimum value
+*       maxSpotColor - If set, color of spot at maximum value
+*       spotRadius - Radius in pixels
+*       lineWidth - Width of line in pixels
+*       normalRangeMin
+*       normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal"
+*                      or expected range of values
+*       normalRangeColor - Color to use for the above bar
+*       drawNormalOnTop - Draw the normal range above the chart fill color if true
+*       defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart
+*       highlightSpotColor - The color to use for drawing a highlight spot on mouseover - Set to null to disable
+*       highlightLineColor - The color to use for drawing a highlight line on mouseover - Set to null to disable
+*       valueSpots - Specify which points to draw spots on, and in which color.  Accepts a range map
+*
+*   bar - Bar chart.  Options:
+*       barColor - Color of bars for postive values
+*       negBarColor - Color of bars for negative values
+*       zeroColor - Color of bars with zero values
+*       nullColor - Color of bars with null values - Defaults to omitting the bar entirely
+*       barWidth - Width of bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars or a range map
+*                  to specify colors for individual ranges of values
+*       barSpacing - Gap between bars in pixels
+*       zeroAxis - Centers the y-axis around zero if true
+*
+*   tristate - Charts values of win (>0), lose (<0) or draw (=0)
+*       posBarColor - Color of win values
+*       negBarColor - Color of lose values
+*       zeroBarColor - Color of draw values
+*       barWidth - Width of bars in pixels
+*       barSpacing - Gap between bars in pixels
+*       colorMap - Optional mappnig of values to colors to override the *BarColor values above
+*                  can be an Array of values to control the color of individual bars or a range map
+*                  to specify colors for individual ranges of values
+*
+*   discrete - Options:
+*       lineHeight - Height of each line in pixels - Defaults to 30% of the graph height
+*       thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor
+*       thresholdColor
+*
+*   bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ...
+*       options:
+*       targetColor - The color of the vertical target marker
+*       targetWidth - The width of the target marker in pixels
+*       performanceColor - The color of the performance measure horizontal bar
+*       rangeColors - Colors to use for each qualitative range background color
+*
+*   pie - Pie chart. Options:
+*       sliceColors - An array of colors to use for pie slices
+*       offset - Angle in degrees to offset the first slice - Try -90 or +90
+*       borderWidth - Width of border to draw around the pie chart, in pixels - Defaults to 0 (no border)
+*       borderColor - Color to use for the pie chart border - Defaults to #000
+*
+*   box - Box plot. Options:
+*       raw - Set to true to supply pre-computed plot points as values
+*             values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier
+*             When set to false you can supply any number of values and the box plot will
+*             be computed for you.  Default is false.
+*       showOutliers - Set to true (default) to display outliers as circles
+*       outlierIQR - Interquartile range used to determine outliers.  Default 1.5
+*       boxLineColor - Outline color of the box
+*       boxFillColor - Fill color for the box
+*       whiskerColor - Line color used for whiskers
+*       outlierLineColor - Outline color of outlier circles
+*       outlierFillColor - Fill color of the outlier circles
+*       spotRadius - Radius of outlier circles
+*       medianColor - Line color of the median line
+*       target - Draw a target cross hair at the supplied value (default undefined)
+*
+*
+*
+*   Examples:
+*   $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false });
+*   $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 });
+*   $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }):
+*   $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' });
+*   $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' });
+*   $('#pie').sparkline([1,1,2], { type:'pie' });
+*/
+
+/*jslint regexp: true, browser: true, jquery: true, white: true, nomen: false, plusplus: false, maxerr: 500, indent: 4 */
+
+(function(factory) {
+    if(typeof define === 'function' && define.amd) {
+		define(['jquery'], factory);
+	}
+	else {
+		factory(jQuery);
+	}
+}
+(function($) {
+    'use strict';
+
+    var UNSET_OPTION = {},
+        getDefaults, createClass, SPFormat, clipval, quartile, normalizeValue, normalizeValues,
+        remove, isNumber, all, sum, addCSS, ensureArray, formatNumber, RangeMap,
+        MouseHandler, Tooltip, barHighlightMixin,
+        line, bar, tristate, discrete, bullet, pie, box, defaultStyles, initStyles,
+        VShape, VCanvas_base, VCanvas_canvas, VCanvas_vml, pending, shapeCount = 0;
+
+    /**
+     * Default configuration settings
+     */
+    getDefaults = function () {
+        return {
+            // Settings common to most/all chart types
+            common: {
+                type: 'line',
+                lineColor: '#00f',
+                fillColor: '#cdf',
+                defaultPixelsPerValue: 3,
+                width: 'auto',
+                height: 'auto',
+                composite: false,
+                tagValuesAttribute: 'values',
+                tagOptionsPrefix: 'spark',
+                enableTagOptions: false,
+                enableHighlight: true,
+                highlightLighten: 1.4,
+                tooltipSkipNull: true,
+                tooltipPrefix: '',
+                tooltipSuffix: '',
+                disableHiddenCheck: false,
+                numberFormatter: false,
+                numberDigitGroupCount: 3,
+                numberDigitGroupSep: ',',
+                numberDecimalMark: '.',
+                disableTooltips: false,
+                disableInteraction: false
+            },
+            // Defaults for line charts
+            line: {
+                spotColor: '#f80',
+                highlightSpotColor: '#5f5',
+                highlightLineColor: '#f22',
+                spotRadius: 1.5,
+                minSpotColor: '#f80',
+                maxSpotColor: '#f80',
+                lineWidth: 1,
+                normalRangeMin: undefined,
+                normalRangeMax: undefined,
+                normalRangeColor: '#ccc',
+                drawNormalOnTop: false,
+                chartRangeMin: undefined,
+                chartRangeMax: undefined,
+                chartRangeMinX: undefined,
+                chartRangeMaxX: undefined,
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{y}}{{suffix}}')
+            },
+            // Defaults for bar charts
+            bar: {
+                barColor: '#3366cc',
+                negBarColor: '#f44',
+                stackedBarColor: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
+                    '#dd4477', '#0099c6', '#990099'],
+                zeroColor: undefined,
+                nullColor: undefined,
+                zeroAxis: true,
+                barWidth: 4,
+                barSpacing: 1,
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                chartRangeClip: false,
+                colorMap: undefined,
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{prefix}}{{value}}{{suffix}}')
+            },
+            // Defaults for tristate charts
+            tristate: {
+                barWidth: 4,
+                barSpacing: 1,
+                posBarColor: '#6f6',
+                negBarColor: '#f44',
+                zeroBarColor: '#999',
+                colorMap: {},
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value:map}}'),
+                tooltipValueLookups: { map: { '-1': 'Loss', '0': 'Draw', '1': 'Win' } }
+            },
+            // Defaults for discrete charts
+            discrete: {
+                lineHeight: 'auto',
+                thresholdColor: undefined,
+                thresholdValue: 0,
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                chartRangeClip: false,
+                tooltipFormat: new SPFormat('{{prefix}}{{value}}{{suffix}}')
+            },
+            // Defaults for bullet charts
+            bullet: {
+                targetColor: '#f33',
+                targetWidth: 3, // width of the target bar in pixels
+                performanceColor: '#33f',
+                rangeColors: ['#d3dafe', '#a8b6ff', '#7f94ff'],
+                base: undefined, // set this to a number to change the base start number
+                tooltipFormat: new SPFormat('{{fieldkey:fields}} - {{value}}'),
+                tooltipValueLookups: { fields: {r: 'Range', p: 'Performance', t: 'Target'} }
+            },
+            // Defaults for pie charts
+            pie: {
+                offset: 0,
+                sliceColors: ['#3366cc', '#dc3912', '#ff9900', '#109618', '#66aa00',
+                    '#dd4477', '#0099c6', '#990099'],
+                borderWidth: 0,
+                borderColor: '#000',
+                tooltipFormat: new SPFormat('<span style="color: {{color}}">&#9679;</span> {{value}} ({{percent.1}}%)')
+            },
+            // Defaults for box plots
+            box: {
+                raw: false,
+                boxLineColor: '#000',
+                boxFillColor: '#cdf',
+                whiskerColor: '#000',
+                outlierLineColor: '#333',
+                outlierFillColor: '#fff',
+                medianColor: '#f00',
+                showOutliers: true,
+                outlierIQR: 1.5,
+                spotRadius: 1.5,
+                target: undefined,
+                targetColor: '#4a2',
+                chartRangeMax: undefined,
+                chartRangeMin: undefined,
+                tooltipFormat: new SPFormat('{{field:fields}}: {{value}}'),
+                tooltipFormatFieldlistKey: 'field',
+                tooltipValueLookups: { fields: { lq: 'Lower Quartile', med: 'Median',
+                    uq: 'Upper Quartile', lo: 'Left Outlier', ro: 'Right Outlier',
+                    lw: 'Left Whisker', rw: 'Right Whisker'} }
+            }
+        };
+    };
+
+    // You can have tooltips use a css class other than jqstooltip by specifying tooltipClassname
+    defaultStyles = '.jqstooltip { ' +
+            'position: absolute;' +
+            'left: 0px;' +
+            'top: 0px;' +
+            'visibility: hidden;' +
+            'background: rgb(0, 0, 0) transparent;' +
+            'background-color: rgba(0,0,0,0.6);' +
+            'filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);' +
+            '-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";' +
+            'color: white;' +
+            'font: 10px arial, san serif;' +
+            'text-align: left;' +
+            'white-space: nowrap;' +
+            'padding: 5px;' +
+            'border: 1px solid white;' +
+            'z-index: 10000;' +
+            '}' +
+            '.jqsfield { ' +
+            'color: white;' +
+            'font: 10px arial, san serif;' +
+            'text-align: left;' +
+            '}';
+
+    /**
+     * Utilities
+     */
+
+    createClass = function (/* [baseclass, [mixin, ...]], definition */) {
+        var Class, args;
+        Class = function () {
+            this.init.apply(this, arguments);
+        };
+        if (arguments.length > 1) {
+            if (arguments[0]) {
+                Class.prototype = $.extend(new arguments[0](), arguments[arguments.length - 1]);
+                Class._super = arguments[0].prototype;
+            } else {
+                Class.prototype = arguments[arguments.length - 1];
+            }
+            if (arguments.length > 2) {
+                args = Array.prototype.slice.call(arguments, 1, -1);
+                args.unshift(Class.prototype);
+                $.extend.apply($, args);
+            }
+        } else {
+            Class.prototype = arguments[0];
+        }
+        Class.prototype.cls = Class;
+        return Class;
+    };
+
+    /**
+     * Wraps a format string for tooltips
+     * {{x}}
+     * {{x.2}
+     * {{x:months}}
+     */
+    $.SPFormatClass = SPFormat = createClass({
+        fre: /\{\{([\w.]+?)(:(.+?))?\}\}/g,
+        precre: /(\w+)\.(\d+)/,
+
+        init: function (format, fclass) {
+            this.format = format;
+            this.fclass = fclass;
+        },
+
+        render: function (fieldset, lookups, options) {
+            var self = this,
+                fields = fieldset,
+                match, token, lookupkey, fieldvalue, prec;
+            return this.format.replace(this.fre, function () {
+                var lookup;
+                token = arguments[1];
+                lookupkey = arguments[3];
+                match = self.precre.exec(token);
+                if (match) {
+                    prec = match[2];
+                    token = match[1];
+                } else {
+                    prec = false;
+                }
+                fieldvalue = fields[token];
+                if (fieldvalue === undefined) {
+                    return '';
+                }
+                if (lookupkey && lookups && lookups[lookupkey]) {
+                    lookup = lookups[lookupkey];
+                    if (lookup.get) { // RangeMap
+                        return lookups[lookupkey].get(fieldvalue) || fieldvalue;
+                    } else {
+                        return lookups[lookupkey][fieldvalue] || fieldvalue;
+                    }
+                }
+                if (isNumber(fieldvalue)) {
+                    if (options.get('numberFormatter')) {
+                        fieldvalue = options.get('numberFormatter')(fieldvalue);
+                    } else {
+                        fieldvalue = formatNumber(fieldvalue, prec,
+                            options.get('numberDigitGroupCount'),
+                            options.get('numberDigitGroupSep'),
+                            options.get('numberDecimalMark'));
+                    }
+                }
+                return fieldvalue;
+            });
+        }
+    });
+
+    // convience method to avoid needing the new operator
+    $.spformat = function(format, fclass) {
+        return new SPFormat(format, fclass);
+    };
+
+    clipval = function (val, min, max) {
+        if (val < min) {
+            return min;
+        }
+        if (val > max) {
+            return max;
+        }
+        return val;
+    };
+
+    quartile = function (values, q) {
+        var vl;
+        if (q === 2) {
+            vl = Math.floor(values.length / 2);
+            return values.length % 2 ? values[vl] : (values[vl-1] + values[vl]) / 2;
+        } else {
+            if (values.length % 2 ) { // odd
+                vl = (values.length * q + q) / 4;
+                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 : values[vl-1];
+            } else { //even
+                vl = (values.length * q + 2) / 4;
+                return vl % 1 ? (values[Math.floor(vl)] + values[Math.floor(vl) - 1]) / 2 :  values[vl-1];
+
+            }
+        }
+    };
+
+    normalizeValue = function (val) {
+        var nf;
+        switch (val) {
+            case 'undefined':
+                val = undefined;
+                break;
+            case 'null':
+                val = null;
+                break;
+            case 'true':
+                val = true;
+                break;
+            case 'false':
+                val = false;
+                break;
+            default:
+                nf = parseFloat(val);
+                if (val == nf) {
+                    val = nf;
+                }
+        }
+        return val;
+    };
+
+    normalizeValues = function (vals) {
+        var i, result = [];
+        for (i = vals.length; i--;) {
+            result[i] = normalizeValue(vals[i]);
+        }
+        return result;
+    };
+
+    remove = function (vals, filter) {
+        var i, vl, result = [];
+        for (i = 0, vl = vals.length; i < vl; i++) {
+            if (vals[i] !== filter) {
+                result.push(vals[i]);
+            }
+        }
+        return result;
+    };
+
+    isNumber = function (num) {
+        return !isNaN(parseFloat(num)) && isFinite(num);
+    };
+
+    formatNumber = function (num, prec, groupsize, groupsep, decsep) {
+        var p, i;
+        num = (prec === false ? parseFloat(num).toString() : num.toFixed(prec)).split('');
+        p = (p = $.inArray('.', num)) < 0 ? num.length : p;
+        if (p < num.length) {
+            num[p] = decsep;
+        }
+        for (i = p - groupsize; i > 0; i -= groupsize) {
+            num.splice(i, 0, groupsep);
+        }
+        return num.join('');
+    };
+
+    // determine if all values of an array match a value
+    // returns true if the array is empty
+    all = function (val, arr, ignoreNull) {
+        var i;
+        for (i = arr.length; i--; ) {
+            if (ignoreNull && arr[i] === null) continue;
+            if (arr[i] !== val) {
+                return false;
+            }
+        }
+        return true;
+    };
+
+    // sums the numeric values in an array, ignoring other values
+    sum = function (vals) {
+        var total = 0, i;
+        for (i = vals.length; i--;) {
+            total += typeof vals[i] === 'number' ? vals[i] : 0;
+        }
+        return total;
+    };
+
+    ensureArray = function (val) {
+        return $.isArray(val) ? val : [val];
+    };
+
+    // http://paulirish.com/2008/bookmarklet-inject-new-css-rules/
+    addCSS = function(css) {
+        var tag;
+        //if ('\v' == 'v') /* ie only */ {
+        if (document.createStyleSheet) {
+            document.createStyleSheet().cssText = css;
+        } else {
+            tag = document.createElement('style');
+            tag.type = 'text/css';
+            document.getElementsByTagName('head')[0].appendChild(tag);
+            tag[(typeof document.body.style.WebkitAppearance == 'string') /* webkit only */ ? 'innerText' : 'innerHTML'] = css;
+        }
+    };
+
+    // Provide a cross-browser interface to a few simple drawing primitives
+    $.fn.simpledraw = function (width, height, useExisting, interact) {
+        var target, mhandler;
+        if (useExisting && (target = this.data('_jqs_vcanvas'))) {
+            return target;
+        }
+        if (width === undefined) {
+            width = $(this).innerWidth();
+        }
+        if (height === undefined) {
+            height = $(this).innerHeight();
+        }
+        if ($.fn.sparkline.hasCanvas) {
+            target = new VCanvas_canvas(width, height, this, interact);
+        } else if ($.fn.sparkline.hasVML) {
+            target = new VCanvas_vml(width, height, this);
+        } else {
+            return false;
+        }
+        mhandler = $(this).data('_jqs_mhandler');
+        if (mhandler) {
+            mhandler.registerCanvas(target);
+        }
+        return target;
+    };
+
+    $.fn.cleardraw = function () {
+        var target = this.data('_jqs_vcanvas');
+        if (target) {
+            target.reset();
+        }
+    };
+
+    $.RangeMapClass = RangeMap = createClass({
+        init: function (map) {
+            var key, range, rangelist = [];
+            for (key in map) {
+                if (map.hasOwnProperty(key) && typeof key === 'string' && key.indexOf(':') > -1) {
+                    range = key.split(':');
+                    range[0] = range[0].length === 0 ? -Infinity : parseFloat(range[0]);
+                    range[1] = range[1].length === 0 ? Infinity : parseFloat(range[1]);
+                    range[2] = map[key];
+                    rangelist.push(range);
+                }
+            }
+            this.map = map;
+            this.rangelist = rangelist || false;
+        },
+
+        get: function (value) {
+            var rangelist = this.rangelist,
+                i, range, result;
+            if ((result = this.map[value]) !== undefined) {
+                return result;
+            }
+            if (rangelist) {
+                for (i = rangelist.length; i--;) {
+                    range = rangelist[i];
+                    if (range[0] <= value && range[1] >= value) {
+                        return range[2];
+                    }
+                }
+            }
+            return undefined;
+        }
+    });
+
+    // Convenience function
+    $.range_map = function(map) {
+        return new RangeMap(map);
+    };
+
+    MouseHandler = createClass({
+        init: function (el, options) {
+            var $el = $(el);
+            this.$el = $el;
+            this.options = options;
+            this.currentPageX = 0;
+            this.currentPageY = 0;
+            this.el = el;
+            this.splist = [];
+            this.tooltip = null;
+            this.over = false;
+            this.displayTooltips = !options.get('disableTooltips');
+            this.highlightEnabled = !options.get('disableHighlight');
+        },
+
+        registerSparkline: function (sp) {
+            this.splist.push(sp);
+            if (this.over) {
+                this.updateDisplay();
+            }
+        },
+
+        registerCanvas: function (canvas) {
+            var $canvas = $(canvas.canvas);
+            this.canvas = canvas;
+            this.$canvas = $canvas;
+            $canvas.mouseenter($.proxy(this.mouseenter, this));
+            $canvas.mouseleave($.proxy(this.mouseleave, this));
+            $canvas.click($.proxy(this.mouseclick, this));
+        },
+
+        reset: function (removeTooltip) {
+            this.splist = [];
+            if (this.tooltip && removeTooltip) {
+                this.tooltip.remove();
+                this.tooltip = undefined;
+            }
+        },
+
+        mouseclick: function (e) {
+            var clickEvent = $.Event('sparklineClick');
+            clickEvent.originalEvent = e;
+            clickEvent.sparklines = this.splist;
+            this.$el.trigger(clickEvent);
+        },
+
+        mouseenter: function (e) {
+            $(document.body).unbind('mousemove.jqs');
+            $(document.body).bind('mousemove.jqs', $.proxy(this.mousemove, this));
+            this.over = true;
+            this.currentPageX = e.pageX;
+            this.currentPageY = e.pageY;
+            this.currentEl = e.target;
+            if (!this.tooltip && this.displayTooltips) {
+                this.tooltip = new Tooltip(this.options);
+                this.tooltip.updatePosition(e.pageX, e.pageY);
+            }
+            this.updateDisplay();
+        },
+
+        mouseleave: function () {
+            $(document.body).unbind('mousemove.jqs');
+            var splist = this.splist,
+                 spcount = splist.length,
+                 needsRefresh = false,
+                 sp, i;
+            this.over = false;
+            this.currentEl = null;
+
+            if (this.tooltip) {
+                this.tooltip.remove();
+                this.tooltip = null;
+            }
+
+            for (i = 0; i < spcount; i++) {
+                sp = splist[i];
+                if (sp.clearRegionHighlight()) {
+                    needsRefresh = true;
+                }
+            }
+
+            if (needsRefresh) {
+                this.canvas.render();
+            }
+        },
+
+        mousemove: function (e) {
+            this.currentPageX = e.pageX;
+            this.currentPageY = e.pageY;
+            this.currentEl = e.target;
+            if (this.tooltip) {
+                this.tooltip.updatePosition(e.pageX, e.pageY);
+            }
+            this.updateDisplay();
+        },
+
+        updateDisplay: function () {
+            var splist = this.splist,
+                 spcount = splist.length,
+                 needsRefresh = false,
+                 offset = this.$canvas.offset(),
+                 localX = this.currentPageX - offset.left,
+                 localY = this.currentPageY - offset.top,
+                 tooltiphtml, sp, i, result, changeEvent;
+            if (!this.over) {
+                return;
+            }
+            for (i = 0; i < spcount; i++) {
+                sp = splist[i];
+                result = sp.setRegionHighlight(this.currentEl, localX, localY);
+                if (result) {
+                    needsRefresh = true;
+                }
+            }
+            if (needsRefresh) {
+                changeEvent = $.Event('sparklineRegionChange');
+                changeEvent.sparklines = this.splist;
+                this.$el.trigger(changeEvent);
+                if (this.tooltip) {
+                    tooltiphtml = '';
+                    for (i = 0; i < spcount; i++) {
+                        sp = splist[i];
+                        tooltiphtml += sp.getCurrentRegionTooltip();
+                    }
+                    this.tooltip.setContent(tooltiphtml);
+                }
+                if (!this.disableHighlight) {
+                    this.canvas.render();
+                }
+            }
+            if (result === null) {
+                this.mouseleave();
+            }
+        }
+    });
+
+
+    Tooltip = createClass({
+        sizeStyle: 'position: static !important;' +
+            'display: block !important;' +
+            'visibility: hidden !important;' +
+            'float: left !important;',
+
+        init: function (options) {
+            var tooltipClassname = options.get('tooltipClassname', 'jqstooltip'),
+                sizetipStyle = this.sizeStyle,
+                offset;
+            this.container = options.get('tooltipContainer') || document.body;
+            this.tooltipOffsetX = options.get('tooltipOffsetX', 10);
+            this.tooltipOffsetY = options.get('tooltipOffsetY', 12);
+            // remove any previous lingering tooltip
+            $('#jqssizetip').remove();
+            $('#jqstooltip').remove();
+            this.sizetip = $('<div/>', {
+                id: 'jqssizetip',
+                style: sizetipStyle,
+                'class': tooltipClassname
+            });
+            this.tooltip = $('<div/>', {
+                id: 'jqstooltip',
+                'class': tooltipClassname
+            }).appendTo(this.container);
+            // account for the container's location
+            offset = this.tooltip.offset();
+            this.offsetLeft = offset.left;
+            this.offsetTop = offset.top;
+            this.hidden = true;
+            $(window).unbind('resize.jqs scroll.jqs');
+            $(window).bind('resize.jqs scroll.jqs', $.proxy(this.updateWindowDims, this));
+            this.updateWindowDims();
+        },
+
+        updateWindowDims: function () {
+            this.scrollTop = $(window).scrollTop();
+            this.scrollLeft = $(window).scrollLeft();
+            this.scrollRight = this.scrollLeft + $(window).width();
+            this.updatePosition();
+        },
+
+        getSize: function (content) {
+            this.sizetip.html(content).appendTo(this.container);
+            this.width = this.sizetip.width() + 1;
+            this.height = this.sizetip.height();
+            this.sizetip.remove();
+        },
+
+        setContent: function (content) {
+            if (!content) {
+                this.tooltip.css('visibility', 'hidden');
+                this.hidden = true;
+                return;
+            }
+            this.getSize(content);
+            this.tooltip.html(content)
+                .css({
+                    'width': this.width,
+                    'height': this.height,
+                    'visibility': 'visible'
+                });
+            if (this.hidden) {
+                this.hidden = false;
+                this.updatePosition();
+            }
+        },
+
+        updatePosition: function (x, y) {
+            if (x === undefined) {
+                if (this.mousex === undefined) {
+                    return;
+                }
+                x = this.mousex - this.offsetLeft;
+                y = this.mousey - this.offsetTop;
+
+            } else {
+                this.mousex = x = x - this.offsetLeft;
+                this.mousey = y = y - this.offsetTop;
+            }
+            if (!this.height || !this.width || this.hidden) {
+                return;
+            }
+
+            y -= this.height + this.tooltipOffsetY;
+            x += this.tooltipOffsetX;
+
+            if (y < this.scrollTop) {
+                y = this.scrollTop;
+            }
+            if (x < this.scrollLeft) {
+                x = this.scrollLeft;
+            } else if (x + this.width > this.scrollRight) {
+                x = this.scrollRight - this.width;
+            }
+
+            this.tooltip.css({
+                'left': x,
+                'top': y
+            });
+        },
+
+        remove: function () {
+            this.tooltip.remove();
+            this.sizetip.remove();
+            this.sizetip = this.tooltip = undefined;
+            $(window).unbind('resize.jqs scroll.jqs');
+        }
+    });
+
+    initStyles = function() {
+        addCSS(defaultStyles);
+    };
+
+    $(initStyles);
+
+    pending = [];
+    $.fn.sparkline = function (userValues, userOptions) {
+        return this.each(function () {
+            var options = new $.fn.sparkline.options(this, userOptions),
+                 $this = $(this),
+                 render, i;
+            render = function () {
+                var values, width, height, tmp, mhandler, sp, vals;
+                if (userValues === 'html' || userValues === undefined) {
+                    vals = this.getAttribute(options.get('tagValuesAttribute'));
+                    if (vals === undefined || vals === null) {
+                        vals = $this.html();
+                    }
+                    values = vals.replace(/(^\s*<!--)|(-->\s*$)|\s+/g, '').split(',');
+                } else {
+                    values = userValues;
+                }
+
+                width = options.get('width') === 'auto' ? values.length * options.get('defaultPixelsPerValue') : options.get('width');
+                if (options.get('height') === 'auto') {
+                    if (!options.get('composite') || !$.data(this, '_jqs_vcanvas')) {
+                        // must be a better way to get the line height
+                        tmp = document.createElement('span');
+                        tmp.innerHTML = 'a';
+                        $this.html(tmp);
+                        height = $(tmp).innerHeight() || $(tmp).height();
+                        $(tmp).remove();
+                        tmp = null;
+                    }
+                } else {
+                    height = options.get('height');
+                }
+
+                if (!options.get('disableInteraction')) {
+                    mhandler = $.data(this, '_jqs_mhandler');
+                    if (!mhandler) {
+                        mhandler = new MouseHandler(this, options);
+                        $.data(this, '_jqs_mhandler', mhandler);
+                    } else if (!options.get('composite')) {
+                        mhandler.reset();
+                    }
+                } else {
+                    mhandler = false;
+                }
+
+                if (options.get('composite') && !$.data(this, '_jqs_vcanvas')) {
+                    if (!$.data(this, '_jqs_errnotify')) {
+                        alert('Attempted to attach a composite sparkline to an element with no existing sparkline');
+                        $.data(this, '_jqs_errnotify', true);
+                    }
+                    return;
+                }
+
+                sp = new $.fn.sparkline[options.get('type')](this, values, options, width, height);
+
+                sp.render();
+
+                if (mhandler) {
+                    mhandler.registerSparkline(sp);
+                }
+            };
+            // jQuery 1.3.0 completely changed the meaning of :hidden :-/
+            if (($(this).html() && !options.get('disableHiddenCheck') && $(this).is(':hidden')) || ($.fn.jquery < '1.3.0' && $(this).parents().is(':hidden')) || !$(this).parents('body').length) {
+                if (!options.get('composite') && $.data(this, '_jqs_pending')) {
+                    // remove any existing references to the element
+                    for (i = pending.length; i; i--) {
+                        if (pending[i - 1][0] == this) {
+                            pending.splice(i - 1, 1);
+                        }
+                    }
+                }
+                pending.push([this, render]);
+                $.data(this, '_jqs_pending', true);
+            } else {
+                render.call(this);
+            }
+        });
+    };
+
+    $.fn.sparkline.defaults = getDefaults();
+
+
+    $.sparkline_display_visible = function () {
+        var el, i, pl;
+        var done = [];
+        for (i = 0, pl = pending.length; i < pl; i++) {
+            el = pending[i][0];
+            if ($(el).is(':visible') && !$(el).parents().is(':hidden')) {
+                pending[i][1].call(el);
+                $.data(pending[i][0], '_jqs_pending', false);
+                done.push(i);
+            } else if (!$(el).closest('html').length && !$.data(el, '_jqs_pending')) {
+                // element has been inserted and removed from the DOM
+                // If it was not yet inserted into the dom then the .data request
+                // will return true.
+                // removing from the dom causes the data to be removed.
+                $.data(pending[i][0], '_jqs_pending', false);
+                done.push(i);
+            }
+        }
+        for (i = done.length; i; i--) {
+            pending.splice(done[i - 1], 1);
+        }
+    };
+
+
+    /**
+     * User option handler
+     */
+    $.fn.sparkline.options = createClass({
+        init: function (tag, userOptions) {
+            var extendedOptions, defaults, base, tagOptionType;
+            this.userOptions = userOptions = userOptions || {};
+            this.tag = tag;
+            this.tagValCache = {};
+            defaults = $.fn.sparkline.defaults;
+            base = defaults.common;
+            this.tagOptionsPrefix = userOptions.enableTagOptions && (userOptions.tagOptionsPrefix || base.tagOptionsPrefix);
+
+            tagOptionType = this.getTagSetting('type');
+            if (tagOptionType === UNSET_OPTION) {
+                extendedOptions = defaults[userOptions.type || base.type];
+            } else {
+                extendedOptions = defaults[tagOptionType];
+            }
+            this.mergedOptions = $.extend({}, base, extendedOptions, userOptions);
+        },
+
+
+        getTagSetting: function (key) {
+            var prefix = this.tagOptionsPrefix,
+                val, i, pairs, keyval;
+            if (prefix === false || prefix === undefined) {
+                return UNSET_OPTION;
+            }
+            if (this.tagValCache.hasOwnProperty(key)) {
+                val = this.tagValCache.key;
+            } else {
+                val = this.tag.getAttribute(prefix + key);
+                if (val === undefined || val === null) {
+                    val = UNSET_OPTION;
+                } else if (val.substr(0, 1) === '[') {
+                    val = val.substr(1, val.length - 2).split(',');
+                    for (i = val.length; i--;) {
+                        val[i] = normalizeValue(val[i].replace(/(^\s*)|(\s*$)/g, ''));
+                    }
+                } else if (val.substr(0, 1) === '{') {
+                    pairs = val.substr(1, val.length - 2).split(',');
+                    val = {};
+                    for (i = pairs.length; i--;) {
+                        keyval = pairs[i].split(':', 2);
+                        val[keyval[0].replace(/(^\s*)|(\s*$)/g, '')] = normalizeValue(keyval[1].replace(/(^\s*)|(\s*$)/g, ''));
+                    }
+                } else {
+                    val = normalizeValue(val);
+                }
+                this.tagValCache.key = val;
+            }
+            return val;
+        },
+
+        get: function (key, defaultval) {
+            var tagOption = this.getTagSetting(key),
+                result;
+            if (tagOption !== UNSET_OPTION) {
+                return tagOption;
+            }
+            return (result = this.mergedOptions[key]) === undefined ? defaultval : result;
+        }
+    });
+
+
+    $.fn.sparkline._base = createClass({
+        disabled: false,
+
+        init: function (el, values, options, width, height) {
+            this.el = el;
+            this.$el = $(el);
+            this.values = values;
+            this.options = options;
+            this.width = width;
+            this.height = height;
+            this.currentRegion = undefined;
+        },
+
+        /**
+         * Setup the canvas
+         */
+        initTarget: function () {
+            var interactive = !this.options.get('disableInteraction');
+            if (!(this.target = this.$el.simpledraw(this.width, this.height, this.options.get('composite'), interactive))) {
+                this.disabled = true;
+            } else {
+                this.canvasWidth = this.target.pixelWidth;
+                this.canvasHeight = this.target.pixelHeight;
+            }
+        },
+
+        /**
+         * Actually render the chart to the canvas
+         */
+        render: function () {
+            if (this.disabled) {
+                this.el.innerHTML = '';
+                return false;
+            }
+            return true;
+        },
+
+        /**
+         * Return a region id for a given x/y co-ordinate
+         */
+        getRegion: function (x, y) {
+        },
+
+        /**
+         * Highlight an item based on the moused-over x,y co-ordinate
+         */
+        setRegionHighlight: function (el, x, y) {
+            var currentRegion = this.currentRegion,
+                highlightEnabled = !this.options.get('disableHighlight'),
+                newRegion;
+            if (x > this.canvasWidth || y > this.canvasHeight || x < 0 || y < 0) {
+                return null;
+            }
+            newRegion = this.getRegion(el, x, y);
+            if (currentRegion !== newRegion) {
+                if (currentRegion !== undefined && highlightEnabled) {
+                    this.removeHighlight();
+                }
+                this.currentRegion = newRegion;
+                if (newRegion !== undefined && highlightEnabled) {
+                    this.renderHighlight();
+                }
+                return true;
+            }
+            return false;
+        },
+
+        /**
+         * Reset any currently highlighted item
+         */
+        clearRegionHighlight: function () {
+            if (this.currentRegion !== undefined) {
+                this.removeHighlight();
+                this.currentRegion = undefined;
+                return true;
+            }
+            return false;
+        },
+
+        renderHighlight: function () {
+            this.changeHighlight(true);
+        },
+
+        removeHighlight: function () {
+            this.changeHighlight(false);
+        },
+
+        changeHighlight: function (highlight)  {},
+
+        /**
+         * Fetch the HTML to display as a tooltip
+         */
+        getCurrentRegionTooltip: function () {
+            var options = this.options,
+                header = '',
+                entries = [],
+                fields, formats, formatlen, fclass, text, i,
+                showFields, showFieldsKey, newFields, fv,
+                formatter, format, fieldlen, j;
+            if (this.currentRegion === undefined) {
+                return '';
+            }
+            fields = this.getCurrentRegionFields();
+            formatter = options.get('tooltipFormatter');
+            if (formatter) {
+                return formatter(this, options, fields);
+            }
+            if (options.get('tooltipChartTitle')) {
+                header += '<div class="jqs jqstitle">' + options.get('tooltipChartTitle') + '</div>\n';
+            }
+            formats = this.options.get('tooltipFormat');
+            if (!formats) {
+                return '';
+            }
+            if (!$.isArray(formats)) {
+                formats = [formats];
+            }
+            if (!$.isArray(fields)) {
+                fields = [fields];
+            }
+            showFields = this.options.get('tooltipFormatFieldlist');
+            showFieldsKey = this.options.get('tooltipFormatFieldlistKey');
+            if (showFields && showFieldsKey) {
+                // user-selected ordering of fields
+                newFields = [];
+                for (i = fields.length; i--;) {
+                    fv = fields[i][showFieldsKey];
+                    if ((j = $.inArray(fv, showFields)) != -1) {
+                        newFields[j] = fields[i];
+                    }
+                }
+                fields = newFields;
+            }
+            formatlen = formats.length;
+            fieldlen = fields.length;
+            for (i = 0; i < formatlen; i++) {
+                format = formats[i];
+                if (typeof format === 'string') {
+                    format = new SPFormat(format);
+                }
+                fclass = format.fclass || 'jqsfield';
+                for (j = 0; j < fieldlen; j++) {
+                    if (!fields[j].isNull || !options.get('tooltipSkipNull')) {
+                        $.extend(fields[j], {
+                            prefix: options.get('tooltipPrefix'),
+                            suffix: options.get('tooltipSuffix')
+                        });
+                        text = format.render(fields[j], options.get('tooltipValueLookups'), options);
+                        entries.push('<div class="' + fclass + '">' + text + '</div>');
+                    }
+                }
+            }
+            if (entries.length) {
+                return header + entries.join('\n');
+            }
+            return '';
+        },
+
+        getCurrentRegionFields: function () {},
+
+        calcHighlightColor: function (color, options) {
+            var highlightColor = options.get('highlightColor'),
+                lighten = options.get('highlightLighten'),
+                parse, mult, rgbnew, i;
+            if (highlightColor) {
+                return highlightColor;
+            }
+            if (lighten) {
+                // extract RGB values
+                parse = /^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(color) || /^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(color);
+                if (parse) {
+                    rgbnew = [];
+                    mult = color.length === 4 ? 16 : 1;
+                    for (i = 0; i < 3; i++) {
+                        rgbnew[i] = clipval(Math.round(parseInt(parse[i + 1], 16) * mult * lighten), 0, 255);
+                    }
+                    return 'rgb(' + rgbnew.join(',') + ')';
+                }
+
+            }
+            return color;
+        }
+
+    });
+
+    barHighlightMixin = {
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                target = this.target,
+                shapeids = this.regionShapes[currentRegion],
+                newShapes;
+            // will be null if the region value was null
+            if (shapeids) {
+                newShapes = this.renderRegion(currentRegion, highlight);
+                if ($.isArray(newShapes) || $.isArray(shapeids)) {
+                    target.replaceWithShapes(shapeids, newShapes);
+                    this.regionShapes[currentRegion] = $.map(newShapes, function (newShape) {
+                        return newShape.id;
+                    });
+                } else {
+                    target.replaceWithShape(shapeids, newShapes);
+                    this.regionShapes[currentRegion] = newShapes.id;
+                }
+            }
+        },
+
+        render: function () {
+            var values = this.values,
+                target = this.target,
+                regionShapes = this.regionShapes,
+                shapes, ids, i, j;
+
+            if (!this.cls._super.render.call(this)) {
+                return;
+            }
+            for (i = values.length; i--;) {
+                shapes = this.renderRegion(i);
+                if (shapes) {
+                    if ($.isArray(shapes)) {
+                        ids = [];
+                        for (j = shapes.length; j--;) {
+                            shapes[j].append();
+                            ids.push(shapes[j].id);
+                        }
+                        regionShapes[i] = ids;
+                    } else {
+                        shapes.append();
+                        regionShapes[i] = shapes.id; // store just the shapeid
+                    }
+                } else {
+                    // null value
+                    regionShapes[i] = null;
+                }
+            }
+            target.render();
+        }
+    };
+
+    /**
+     * Line charts
+     */
+    $.fn.sparkline.line = line = createClass($.fn.sparkline._base, {
+        type: 'line',
+
+        init: function (el, values, options, width, height) {
+            line._super.init.call(this, el, values, options, width, height);
+            this.vertices = [];
+            this.regionMap = [];
+            this.xvalues = [];
+            this.yvalues = [];
+            this.yminmax = [];
+            this.hightlightSpotId = null;
+            this.lastShapeId = null;
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            var i,
+                regionMap = this.regionMap; // maps regions to value positions
+            for (i = regionMap.length; i--;) {
+                if (regionMap[i] !== null && x >= regionMap[i][0] && x <= regionMap[i][1]) {
+                    return regionMap[i][2];
+                }
+            }
+            return undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.yvalues[currentRegion] === null,
+                x: this.xvalues[currentRegion],
+                y: this.yvalues[currentRegion],
+                color: this.options.get('lineColor'),
+                fillColor: this.options.get('fillColor'),
+                offset: currentRegion
+            };
+        },
+
+        renderHighlight: function () {
+            var currentRegion = this.currentRegion,
+                target = this.target,
+                vertex = this.vertices[currentRegion],
+                options = this.options,
+                spotRadius = options.get('spotRadius'),
+                highlightSpotColor = options.get('highlightSpotColor'),
+                highlightLineColor = options.get('highlightLineColor'),
+                highlightSpot, highlightLine;
+
+            if (!vertex) {
+                return;
+            }
+            if (spotRadius && highlightSpotColor) {
+                highlightSpot = target.drawCircle(vertex[0], vertex[1],
+                    spotRadius, undefined, highlightSpotColor);
+                this.highlightSpotId = highlightSpot.id;
+                target.insertAfterShape(this.lastShapeId, highlightSpot);
+            }
+            if (highlightLineColor) {
+                highlightLine = target.drawLine(vertex[0], this.canvasTop, vertex[0],
+                    this.canvasTop + this.canvasHeight, highlightLineColor);
+                this.highlightLineId = highlightLine.id;
+                target.insertAfterShape(this.lastShapeId, highlightLine);
+            }
+        },
+
+        removeHighlight: function () {
+            var target = this.target;
+            if (this.highlightSpotId) {
+                target.removeShapeId(this.highlightSpotId);
+                this.highlightSpotId = null;
+            }
+            if (this.highlightLineId) {
+                target.removeShapeId(this.highlightLineId);
+                this.highlightLineId = null;
+            }
+        },
+
+        scanValues: function () {
+            var values = this.values,
+                valcount = values.length,
+                xvalues = this.xvalues,
+                yvalues = this.yvalues,
+                yminmax = this.yminmax,
+                i, val, isStr, isArray, sp;
+            for (i = 0; i < valcount; i++) {
+                val = values[i];
+                isStr = typeof(values[i]) === 'string';
+                isArray = typeof(values[i]) === 'object' && values[i] instanceof Array;
+                sp = isStr && values[i].split(':');
+                if (isStr && sp.length === 2) { // x:y
+                    xvalues.push(Number(sp[0]));
+                    yvalues.push(Number(sp[1]));
+                    yminmax.push(Number(sp[1]));
+                } else if (isArray) {
+                    xvalues.push(val[0]);
+                    yvalues.push(val[1]);
+                    yminmax.push(val[1]);
+                } else {
+                    xvalues.push(i);
+                    if (values[i] === null || values[i] === 'null') {
+                        yvalues.push(null);
+                    } else {
+                        yvalues.push(Number(val));
+                        yminmax.push(Number(val));
+                    }
+                }
+            }
+            if (this.options.get('xvalues')) {
+                xvalues = this.options.get('xvalues');
+            }
+
+            this.maxy = this.maxyorg = Math.max.apply(Math, yminmax);
+            this.miny = this.minyorg = Math.min.apply(Math, yminmax);
+
+            this.maxx = Math.max.apply(Math, xvalues);
+            this.minx = Math.min.apply(Math, xvalues);
+
+            this.xvalues = xvalues;
+            this.yvalues = yvalues;
+            this.yminmax = yminmax;
+
+        },
+
+        processRangeOptions: function () {
+            var options = this.options,
+                normalRangeMin = options.get('normalRangeMin'),
+                normalRangeMax = options.get('normalRangeMax');
+
+            if (normalRangeMin !== undefined) {
+                if (normalRangeMin < this.miny) {
+                    this.miny = normalRangeMin;
+                }
+                if (normalRangeMax > this.maxy) {
+                    this.maxy = normalRangeMax;
+                }
+            }
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.miny)) {
+                this.miny = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.maxy)) {
+                this.maxy = options.get('chartRangeMax');
+            }
+            if (options.get('chartRangeMinX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMinX') < this.minx)) {
+                this.minx = options.get('chartRangeMinX');
+            }
+            if (options.get('chartRangeMaxX') !== undefined && (options.get('chartRangeClipX') || options.get('chartRangeMaxX') > this.maxx)) {
+                this.maxx = options.get('chartRangeMaxX');
+            }
+
+        },
+
+        drawNormalRange: function (canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey) {
+            var normalRangeMin = this.options.get('normalRangeMin'),
+                normalRangeMax = this.options.get('normalRangeMax'),
+                ytop = canvasTop + Math.round(canvasHeight - (canvasHeight * ((normalRangeMax - this.miny) / rangey))),
+                height = Math.round((canvasHeight * (normalRangeMax - normalRangeMin)) / rangey);
+            this.target.drawRect(canvasLeft, ytop, canvasWidth, height, undefined, this.options.get('normalRangeColor')).append();
+        },
+
+        render: function () {
+            var options = this.options,
+                target = this.target,
+                canvasWidth = this.canvasWidth,
+                canvasHeight = this.canvasHeight,
+                vertices = this.vertices,
+                spotRadius = options.get('spotRadius'),
+                regionMap = this.regionMap,
+                rangex, rangey, yvallast,
+                canvasTop, canvasLeft,
+                vertex, path, paths, x, y, xnext, xpos, xposnext,
+                last, next, yvalcount, lineShapes, fillShapes, plen,
+                valueSpots, hlSpotsEnabled, color, xvalues, yvalues, i;
+
+            if (!line._super.render.call(this)) {
+                return;
+            }
+
+            this.scanValues();
+            this.processRangeOptions();
+
+            xvalues = this.xvalues;
+            yvalues = this.yvalues;
+
+            if (!this.yminmax.length || this.yvalues.length < 2) {
+                // empty or all null valuess
+                return;
+            }
+
+            canvasTop = canvasLeft = 0;
+
+            rangex = this.maxx - this.minx === 0 ? 1 : this.maxx - this.minx;
+            rangey = this.maxy - this.miny === 0 ? 1 : this.maxy - this.miny;
+            yvallast = this.yvalues.length - 1;
+
+            if (spotRadius && (canvasWidth < (spotRadius * 4) || canvasHeight < (spotRadius * 4))) {
+                spotRadius = 0;
+            }
+            if (spotRadius) {
+                // adjust the canvas size as required so that spots will fit
+                hlSpotsEnabled = options.get('highlightSpotColor') &&  !options.get('disableInteraction');
+                if (hlSpotsEnabled || options.get('minSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.miny)) {
+                    canvasHeight -= Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled || options.get('maxSpotColor') || (options.get('spotColor') && yvalues[yvallast] === this.maxy)) {
+                    canvasHeight -= Math.ceil(spotRadius);
+                    canvasTop += Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled ||
+                     ((options.get('minSpotColor') || options.get('maxSpotColor')) && (yvalues[0] === this.miny || yvalues[0] === this.maxy))) {
+                    canvasLeft += Math.ceil(spotRadius);
+                    canvasWidth -= Math.ceil(spotRadius);
+                }
+                if (hlSpotsEnabled || options.get('spotColor') ||
+                    (options.get('minSpotColor') || options.get('maxSpotColor') &&
+                        (yvalues[yvallast] === this.miny || yvalues[yvallast] === this.maxy))) {
+                    canvasWidth -= Math.ceil(spotRadius);
+                }
+            }
+
+
+            canvasHeight--;
+
+            if (options.get('normalRangeMin') !== undefined && !options.get('drawNormalOnTop')) {
+                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+            }
+
+            path = [];
+            paths = [path];
+            last = next = null;
+            yvalcount = yvalues.length;
+            for (i = 0; i < yvalcount; i++) {
+                x = xvalues[i];
+                xnext = xvalues[i + 1];
+                y = yvalues[i];
+                xpos = canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex));
+                xposnext = i < yvalcount - 1 ? canvasLeft + Math.round((xnext - this.minx) * (canvasWidth / rangex)) : canvasWidth;
+                next = xpos + ((xposnext - xpos) / 2);
+                regionMap[i] = [last || 0, next, i];
+                last = next;
+                if (y === null) {
+                    if (i) {
+                        if (yvalues[i - 1] !== null) {
+                            path = [];
+                            paths.push(path);
+                        }
+                        vertices.push(null);
+                    }
+                } else {
+                    if (y < this.miny) {
+                        y = this.miny;
+                    }
+                    if (y > this.maxy) {
+                        y = this.maxy;
+                    }
+                    if (!path.length) {
+                        // previous value was null
+                        path.push([xpos, canvasTop + canvasHeight]);
+                    }
+                    vertex = [xpos, canvasTop + Math.round(canvasHeight - (canvasHeight * ((y - this.miny) / rangey)))];
+                    path.push(vertex);
+                    vertices.push(vertex);
+                }
+            }
+
+            lineShapes = [];
+            fillShapes = [];
+            plen = paths.length;
+            for (i = 0; i < plen; i++) {
+                path = paths[i];
+                if (path.length) {
+                    if (options.get('fillColor')) {
+                        path.push([path[path.length - 1][0], (canvasTop + canvasHeight)]);
+                        fillShapes.push(path.slice(0));
+                        path.pop();
+                    }
+                    // if there's only a single point in this path, then we want to display it
+                    // as a vertical line which means we keep path[0]  as is
+                    if (path.length > 2) {
+                        // else we want the first value
+                        path[0] = [path[0][0], path[1][1]];
+                    }
+                    lineShapes.push(path);
+                }
+            }
+
+            // draw the fill first, then optionally the normal range, then the line on top of that
+            plen = fillShapes.length;
+            for (i = 0; i < plen; i++) {
+                target.drawShape(fillShapes[i],
+                    options.get('fillColor'), options.get('fillColor')).append();
+            }
+
+            if (options.get('normalRangeMin') !== undefined && options.get('drawNormalOnTop')) {
+                this.drawNormalRange(canvasLeft, canvasTop, canvasHeight, canvasWidth, rangey);
+            }
+
+            plen = lineShapes.length;
+            for (i = 0; i < plen; i++) {
+                target.drawShape(lineShapes[i], options.get('lineColor'), undefined,
+                    options.get('lineWidth')).append();
+            }
+
+            if (spotRadius && options.get('valueSpots')) {
+                valueSpots = options.get('valueSpots');
+                if (valueSpots.get === undefined) {
+                    valueSpots = new RangeMap(valueSpots);
+                }
+                for (i = 0; i < yvalcount; i++) {
+                    color = valueSpots.get(yvalues[i]);
+                    if (color) {
+                        target.drawCircle(canvasLeft + Math.round((xvalues[i] - this.minx) * (canvasWidth / rangex)),
+                            canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[i] - this.miny) / rangey))),
+                            spotRadius, undefined,
+                            color).append();
+                    }
+                }
+
+            }
+            if (spotRadius && options.get('spotColor') && yvalues[yvallast] !== null) {
+                target.drawCircle(canvasLeft + Math.round((xvalues[xvalues.length - 1] - this.minx) * (canvasWidth / rangex)),
+                    canvasTop + Math.round(canvasHeight - (canvasHeight * ((yvalues[yvallast] - this.miny) / rangey))),
+                    spotRadius, undefined,
+                    options.get('spotColor')).append();
+            }
+            if (this.maxy !== this.minyorg) {
+                if (spotRadius && options.get('minSpotColor')) {
+                    x = xvalues[$.inArray(this.minyorg, yvalues)];
+                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.minyorg - this.miny) / rangey))),
+                        spotRadius, undefined,
+                        options.get('minSpotColor')).append();
+                }
+                if (spotRadius && options.get('maxSpotColor')) {
+                    x = xvalues[$.inArray(this.maxyorg, yvalues)];
+                    target.drawCircle(canvasLeft + Math.round((x - this.minx) * (canvasWidth / rangex)),
+                        canvasTop + Math.round(canvasHeight - (canvasHeight * ((this.maxyorg - this.miny) / rangey))),
+                        spotRadius, undefined,
+                        options.get('maxSpotColor')).append();
+                }
+            }
+
+            this.lastShapeId = target.getLastShapeId();
+            this.canvasTop = canvasTop;
+            target.render();
+        }
+    });
+
+    /**
+     * Bar charts
+     */
+    $.fn.sparkline.bar = bar = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'bar',
+
+        init: function (el, values, options, width, height) {
+            var barWidth = parseInt(options.get('barWidth'), 10),
+                barSpacing = parseInt(options.get('barSpacing'), 10),
+                chartRangeMin = options.get('chartRangeMin'),
+                chartRangeMax = options.get('chartRangeMax'),
+                chartRangeClip = options.get('chartRangeClip'),
+                stackMin = Infinity,
+                stackMax = -Infinity,
+                isStackString, groupMin, groupMax, stackRanges,
+                numValues, i, vlen, range, zeroAxis, xaxisOffset, min, max, clipMin, clipMax,
+                stacked, vlist, j, slen, svals, val, yoffset, yMaxCalc, canvasHeightEf;
+            bar._super.init.call(this, el, values, options, width, height);
+
+            // scan values to determine whether to stack bars
+            for (i = 0, vlen = values.length; i < vlen; i++) {
+                val = values[i];
+                isStackString = typeof(val) === 'string' && val.indexOf(':') > -1;
+                if (isStackString || $.isArray(val)) {
+                    stacked = true;
+                    if (isStackString) {
+                        val = values[i] = normalizeValues(val.split(':'));
+                    }
+                    val = remove(val, null); // min/max will treat null as zero
+                    groupMin = Math.min.apply(Math, val);
+                    groupMax = Math.max.apply(Math, val);
+                    if (groupMin < stackMin) {
+                        stackMin = groupMin;
+                    }
+                    if (groupMax > stackMax) {
+                        stackMax = groupMax;
+                    }
+                }
+            }
+
+            this.stacked = stacked;
+            this.regionShapes = {};
+            this.barWidth = barWidth;
+            this.barSpacing = barSpacing;
+            this.totalBarWidth = barWidth + barSpacing;
+            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+            this.initTarget();
+
+            if (chartRangeClip) {
+                clipMin = chartRangeMin === undefined ? -Infinity : chartRangeMin;
+                clipMax = chartRangeMax === undefined ? Infinity : chartRangeMax;
+            }
+
+            numValues = [];
+            stackRanges = stacked ? [] : numValues;
+            var stackTotals = [];
+            var stackRangesNeg = [];
+            for (i = 0, vlen = values.length; i < vlen; i++) {
+                if (stacked) {
+                    vlist = values[i];
+                    values[i] = svals = [];
+                    stackTotals[i] = 0;
+                    stackRanges[i] = stackRangesNeg[i] = 0;
+                    for (j = 0, slen = vlist.length; j < slen; j++) {
+                        val = svals[j] = chartRangeClip ? clipval(vlist[j], clipMin, clipMax) : vlist[j];
+                        if (val !== null) {
+                            if (val > 0) {
+                                stackTotals[i] += val;
+                            }
+                            if (stackMin < 0 && stackMax > 0) {
+                                if (val < 0) {
+                                    stackRangesNeg[i] += Math.abs(val);
+                                } else {
+                                    stackRanges[i] += val;
+                                }
+                            } else {
+                                stackRanges[i] += Math.abs(val - (val < 0 ? stackMax : stackMin));
+                            }
+                            numValues.push(val);
+                        }
+                    }
+                } else {
+                    val = chartRangeClip ? clipval(values[i], clipMin, clipMax) : values[i];
+                    val = values[i] = normalizeValue(val);
+                    if (val !== null) {
+                        numValues.push(val);
+                    }
+                }
+            }
+            this.max = max = Math.max.apply(Math, numValues);
+            this.min = min = Math.min.apply(Math, numValues);
+            this.stackMax = stackMax = stacked ? Math.max.apply(Math, stackTotals) : max;
+            this.stackMin = stackMin = stacked ? Math.min.apply(Math, numValues) : min;
+
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < min)) {
+                min = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > max)) {
+                max = options.get('chartRangeMax');
+            }
+
+            this.zeroAxis = zeroAxis = options.get('zeroAxis', true);
+            if (min <= 0 && max >= 0 && zeroAxis) {
+                xaxisOffset = 0;
+            } else if (zeroAxis == false) {
+                xaxisOffset = min;
+            } else if (min > 0) {
+                xaxisOffset = min;
+            } else {
+                xaxisOffset = max;
+            }
+            this.xaxisOffset = xaxisOffset;
+
+            range = stacked ? (Math.max.apply(Math, stackRanges) + Math.max.apply(Math, stackRangesNeg)) : max - min;
+
+            // as we plot zero/min values a single pixel line, we add a pixel to all other
+            // values - Reduce the effective canvas size to suit
+            this.canvasHeightEf = (zeroAxis && min < 0) ? this.canvasHeight - 2 : this.canvasHeight - 1;
+
+            if (min < xaxisOffset) {
+                yMaxCalc = (stacked && max >= 0) ? stackMax : max;
+                yoffset = (yMaxCalc - xaxisOffset) / range * this.canvasHeight;
+                if (yoffset !== Math.ceil(yoffset)) {
+                    this.canvasHeightEf -= 2;
+                    yoffset = Math.ceil(yoffset);
+                }
+            } else {
+                yoffset = this.canvasHeight;
+            }
+            this.yoffset = yoffset;
+
+            if ($.isArray(options.get('colorMap'))) {
+                this.colorMapByIndex = options.get('colorMap');
+                this.colorMapByValue = null;
+            } else {
+                this.colorMapByIndex = null;
+                this.colorMapByValue = options.get('colorMap');
+                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
+                }
+            }
+
+            this.range = range;
+        },
+
+        getRegion: function (el, x, y) {
+            var result = Math.floor(x / this.totalBarWidth);
+            return (result < 0 || result >= this.values.length) ? undefined : result;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion,
+                values = ensureArray(this.values[currentRegion]),
+                result = [],
+                value, i;
+            for (i = values.length; i--;) {
+                value = values[i];
+                result.push({
+                    isNull: value === null,
+                    value: value,
+                    color: this.calcColor(i, value, currentRegion),
+                    offset: currentRegion
+                });
+            }
+            return result;
+        },
+
+        calcColor: function (stacknum, value, valuenum) {
+            var colorMapByIndex = this.colorMapByIndex,
+                colorMapByValue = this.colorMapByValue,
+                options = this.options,
+                color, newColor;
+            if (this.stacked) {
+                color = options.get('stackedBarColor');
+            } else {
+                color = (value < 0) ? options.get('negBarColor') : options.get('barColor');
+            }
+            if (value === 0 && options.get('zeroColor') !== undefined) {
+                color = options.get('zeroColor');
+            }
+            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+                color = newColor;
+            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+                color = colorMapByIndex[valuenum];
+            }
+            return $.isArray(color) ? color[stacknum % color.length] : color;
+        },
+
+        /**
+         * Render bar(s) for a region
+         */
+        renderRegion: function (valuenum, highlight) {
+            var vals = this.values[valuenum],
+                options = this.options,
+                xaxisOffset = this.xaxisOffset,
+                result = [],
+                range = this.range,
+                stacked = this.stacked,
+                target = this.target,
+                x = valuenum * this.totalBarWidth,
+                canvasHeightEf = this.canvasHeightEf,
+                yoffset = this.yoffset,
+                y, height, color, isNull, yoffsetNeg, i, valcount, val, minPlotted, allMin;
+
+            vals = $.isArray(vals) ? vals : [vals];
+            valcount = vals.length;
+            val = vals[0];
+            isNull = all(null, vals);
+            allMin = all(xaxisOffset, vals, true);
+
+            if (isNull) {
+                if (options.get('nullColor')) {
+                    color = highlight ? options.get('nullColor') : this.calcHighlightColor(options.get('nullColor'), options);
+                    y = (yoffset > 0) ? yoffset - 1 : yoffset;
+                    return target.drawRect(x, y, this.barWidth - 1, 0, color, color);
+                } else {
+                    return undefined;
+                }
+            }
+            yoffsetNeg = yoffset;
+            for (i = 0; i < valcount; i++) {
+                val = vals[i];
+
+                if (stacked && val === xaxisOffset) {
+                    if (!allMin || minPlotted) {
+                        continue;
+                    }
+                    minPlotted = true;
+                }
+
+                if (range > 0) {
+                    height = Math.floor(canvasHeightEf * ((Math.abs(val - xaxisOffset) / range))) + 1;
+                } else {
+                    height = 1;
+                }
+                if (val < xaxisOffset || (val === xaxisOffset && yoffset === 0)) {
+                    y = yoffsetNeg;
+                    yoffsetNeg += height;
+                } else {
+                    y = yoffset - height;
+                    yoffset -= height;
+                }
+                color = this.calcColor(i, val, valuenum);
+                if (highlight) {
+                    color = this.calcHighlightColor(color, options);
+                }
+                result.push(target.drawRect(x, y, this.barWidth - 1, height - 1, color, color));
+            }
+            if (result.length === 1) {
+                return result[0];
+            }
+            return result;
+        }
+    });
+
+    /**
+     * Tristate charts
+     */
+    $.fn.sparkline.tristate = tristate = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'tristate',
+
+        init: function (el, values, options, width, height) {
+            var barWidth = parseInt(options.get('barWidth'), 10),
+                barSpacing = parseInt(options.get('barSpacing'), 10);
+            tristate._super.init.call(this, el, values, options, width, height);
+
+            this.regionShapes = {};
+            this.barWidth = barWidth;
+            this.barSpacing = barSpacing;
+            this.totalBarWidth = barWidth + barSpacing;
+            this.values = $.map(values, Number);
+            this.width = width = (values.length * barWidth) + ((values.length - 1) * barSpacing);
+
+            if ($.isArray(options.get('colorMap'))) {
+                this.colorMapByIndex = options.get('colorMap');
+                this.colorMapByValue = null;
+            } else {
+                this.colorMapByIndex = null;
+                this.colorMapByValue = options.get('colorMap');
+                if (this.colorMapByValue && this.colorMapByValue.get === undefined) {
+                    this.colorMapByValue = new RangeMap(this.colorMapByValue);
+                }
+            }
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            return Math.floor(x / this.totalBarWidth);
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                color: this.calcColor(this.values[currentRegion], currentRegion),
+                offset: currentRegion
+            };
+        },
+
+        calcColor: function (value, valuenum) {
+            var values = this.values,
+                options = this.options,
+                colorMapByIndex = this.colorMapByIndex,
+                colorMapByValue = this.colorMapByValue,
+                color, newColor;
+
+            if (colorMapByValue && (newColor = colorMapByValue.get(value))) {
+                color = newColor;
+            } else if (colorMapByIndex && colorMapByIndex.length > valuenum) {
+                color = colorMapByIndex[valuenum];
+            } else if (values[valuenum] < 0) {
+                color = options.get('negBarColor');
+            } else if (values[valuenum] > 0) {
+                color = options.get('posBarColor');
+            } else {
+                color = options.get('zeroBarColor');
+            }
+            return color;
+        },
+
+        renderRegion: function (valuenum, highlight) {
+            var values = this.values,
+                options = this.options,
+                target = this.target,
+                canvasHeight, height, halfHeight,
+                x, y, color;
+
+            canvasHeight = target.pixelHeight;
+            halfHeight = Math.round(canvasHeight / 2);
+
+            x = valuenum * this.totalBarWidth;
+            if (values[valuenum] < 0) {
+                y = halfHeight;
+                height = halfHeight - 1;
+            } else if (values[valuenum] > 0) {
+                y = 0;
+                height = halfHeight - 1;
+            } else {
+                y = halfHeight - 1;
+                height = 2;
+            }
+            color = this.calcColor(values[valuenum], valuenum);
+            if (color === null) {
+                return;
+            }
+            if (highlight) {
+                color = this.calcHighlightColor(color, options);
+            }
+            return target.drawRect(x, y, this.barWidth - 1, height - 1, color, color);
+        }
+    });
+
+    /**
+     * Discrete charts
+     */
+    $.fn.sparkline.discrete = discrete = createClass($.fn.sparkline._base, barHighlightMixin, {
+        type: 'discrete',
+
+        init: function (el, values, options, width, height) {
+            discrete._super.init.call(this, el, values, options, width, height);
+
+            this.regionShapes = {};
+            this.values = values = $.map(values, Number);
+            this.min = Math.min.apply(Math, values);
+            this.max = Math.max.apply(Math, values);
+            this.range = this.max - this.min;
+            this.width = width = options.get('width') === 'auto' ? values.length * 2 : this.width;
+            this.interval = Math.floor(width / values.length);
+            this.itemWidth = width / values.length;
+            if (options.get('chartRangeMin') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMin') < this.min)) {
+                this.min = options.get('chartRangeMin');
+            }
+            if (options.get('chartRangeMax') !== undefined && (options.get('chartRangeClip') || options.get('chartRangeMax') > this.max)) {
+                this.max = options.get('chartRangeMax');
+            }
+            this.initTarget();
+            if (this.target) {
+                this.lineHeight = options.get('lineHeight') === 'auto' ? Math.round(this.canvasHeight * 0.3) : options.get('lineHeight');
+            }
+        },
+
+        getRegion: function (el, x, y) {
+            return Math.floor(x / this.itemWidth);
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                offset: currentRegion
+            };
+        },
+
+        renderRegion: function (valuenum, highlight) {
+            var values = this.values,
+                options = this.options,
+                min = this.min,
+                max = this.max,
+                range = this.range,
+                interval = this.interval,
+                target = this.target,
+                canvasHeight = this.canvasHeight,
+                lineHeight = this.lineHeight,
+                pheight = canvasHeight - lineHeight,
+                ytop, val, color, x;
+
+            val = clipval(values[valuenum], min, max);
+            x = valuenum * interval;
+            ytop = Math.round(pheight - pheight * ((val - min) / range));
+            color = (options.get('thresholdColor') && val < options.get('thresholdValue')) ? options.get('thresholdColor') : options.get('lineColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, options);
+            }
+            return target.drawLine(x, ytop, x, ytop + lineHeight, color);
+        }
+    });
+
+    /**
+     * Bullet charts
+     */
+    $.fn.sparkline.bullet = bullet = createClass($.fn.sparkline._base, {
+        type: 'bullet',
+
+        init: function (el, values, options, width, height) {
+            var min, max, vals;
+            bullet._super.init.call(this, el, values, options, width, height);
+
+            // values: target, performance, range1, range2, range3
+            this.values = values = normalizeValues(values);
+            // target or performance could be null
+            vals = values.slice();
+            vals[0] = vals[0] === null ? vals[2] : vals[0];
+            vals[1] = values[1] === null ? vals[2] : vals[1];
+            min = Math.min.apply(Math, values);
+            max = Math.max.apply(Math, values);
+            if (options.get('base') === undefined) {
+                min = min < 0 ? min : 0;
+            } else {
+                min = options.get('base');
+            }
+            this.min = min;
+            this.max = max;
+            this.range = max - min;
+            this.shapes = {};
+            this.valueShapes = {};
+            this.regiondata = {};
+            this.width = width = options.get('width') === 'auto' ? '4.0em' : width;
+            this.target = this.$el.simpledraw(width, height, options.get('composite'));
+            if (!values.length) {
+                this.disabled = true;
+            }
+            this.initTarget();
+        },
+
+        getRegion: function (el, x, y) {
+            var shapeid = this.target.getShapeAt(el, x, y);
+            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                fieldkey: currentRegion.substr(0, 1),
+                value: this.values[currentRegion.substr(1)],
+                region: currentRegion
+            };
+        },
+
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                shapeid = this.valueShapes[currentRegion],
+                shape;
+            delete this.shapes[shapeid];
+            switch (currentRegion.substr(0, 1)) {
+                case 'r':
+                    shape = this.renderRange(currentRegion.substr(1), highlight);
+                    break;
+                case 'p':
+                    shape = this.renderPerformance(highlight);
+                    break;
+                case 't':
+                    shape = this.renderTarget(highlight);
+                    break;
+            }
+            this.valueShapes[currentRegion] = shape.id;
+            this.shapes[shape.id] = currentRegion;
+            this.target.replaceWithShape(shapeid, shape);
+        },
+
+        renderRange: function (rn, highlight) {
+            var rangeval = this.values[rn],
+                rangewidth = Math.round(this.canvasWidth * ((rangeval - this.min) / this.range)),
+                color = this.options.get('rangeColors')[rn - 2];
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(0, 0, rangewidth - 1, this.canvasHeight - 1, color, color);
+        },
+
+        renderPerformance: function (highlight) {
+            var perfval = this.values[1],
+                perfwidth = Math.round(this.canvasWidth * ((perfval - this.min) / this.range)),
+                color = this.options.get('performanceColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(0, Math.round(this.canvasHeight * 0.3), perfwidth - 1,
+                Math.round(this.canvasHeight * 0.4) - 1, color, color);
+        },
+
+        renderTarget: function (highlight) {
+            var targetval = this.values[0],
+                x = Math.round(this.canvasWidth * ((targetval - this.min) / this.range) - (this.options.get('targetWidth') / 2)),
+                targettop = Math.round(this.canvasHeight * 0.10),
+                targetheight = this.canvasHeight - (targettop * 2),
+                color = this.options.get('targetColor');
+            if (highlight) {
+                color = this.calcHighlightColor(color, this.options);
+            }
+            return this.target.drawRect(x, targettop, this.options.get('targetWidth') - 1, targetheight - 1, color, color);
+        },
+
+        render: function () {
+            var vlen = this.values.length,
+                target = this.target,
+                i, shape;
+            if (!bullet._super.render.call(this)) {
+                return;
+            }
+            for (i = 2; i < vlen; i++) {
+                shape = this.renderRange(i).append();
+                this.shapes[shape.id] = 'r' + i;
+                this.valueShapes['r' + i] = shape.id;
+            }
+            if (this.values[1] !== null) {
+                shape = this.renderPerformance().append();
+                this.shapes[shape.id] = 'p1';
+                this.valueShapes.p1 = shape.id;
+            }
+            if (this.values[0] !== null) {
+                shape = this.renderTarget().append();
+                this.shapes[shape.id] = 't0';
+                this.valueShapes.t0 = shape.id;
+            }
+            target.render();
+        }
+    });
+
+    /**
+     * Pie charts
+     */
+    $.fn.sparkline.pie = pie = createClass($.fn.sparkline._base, {
+        type: 'pie',
+
+        init: function (el, values, options, width, height) {
+            var total = 0, i;
+
+            pie._super.init.call(this, el, values, options, width, height);
+
+            this.shapes = {}; // map shape ids to value offsets
+            this.valueShapes = {}; // maps value offsets to shape ids
+            this.values = values = $.map(values, Number);
+
+            if (options.get('width') === 'auto') {
+                this.width = this.height;
+            }
+
+            if (values.length > 0) {
+                for (i = values.length; i--;) {
+                    total += values[i];
+                }
+            }
+            this.total = total;
+            this.initTarget();
+            this.radius = Math.floor(Math.min(this.canvasWidth, this.canvasHeight) / 2);
+        },
+
+        getRegion: function (el, x, y) {
+            var shapeid = this.target.getShapeAt(el, x, y);
+            return (shapeid !== undefined && this.shapes[shapeid] !== undefined) ? this.shapes[shapeid] : undefined;
+        },
+
+        getCurrentRegionFields: function () {
+            var currentRegion = this.currentRegion;
+            return {
+                isNull: this.values[currentRegion] === undefined,
+                value: this.values[currentRegion],
+                percent: this.values[currentRegion] / this.total * 100,
+                color: this.options.get('sliceColors')[currentRegion % this.options.get('sliceColors').length],
+                offset: currentRegion
+            };
+        },
+
+        changeHighlight: function (highlight) {
+            var currentRegion = this.currentRegion,
+                 newslice = this.renderSlice(currentRegion, highlight),
+                 shapeid = this.valueShapes[currentRegion];
+            delete this.shapes[shapeid];
+            this.target.replaceWithShape(shapeid, newslice);
+            this.valueShapes[currentRegion] = newslice.id;
+            this.shapes[newslice.id] = currentRegion;
+        },
+
+        renderSlice: function (valuenum, highlight) {
+            var target = this.target,
+                options = this.options,
+                radius = this.radius,
+                borderWidth = options.get('borderWidth'),
+                offset = options.get('offset'),
+                circle = 2 * Math.PI,
+                values = this.values,
+                total = this.total,
+                next = offset ? (2*Math.PI)*(offset/360) : 0,
+                start, end, i, vlen, color;
+
+            vlen = values.length;
+            for (i = 0; i < vlen; i++) {
+                start = next;
+                end = next;
+                if (total > 0) {  // avoid divide by zero
+                    end = next + (circle * (values[i] / total));
+                }
+                if (valuenum === i) {
+                    color = options.get('sliceColors')[i % options.get('sliceColors').length];
+                    if (highlight) {
+                        color = this.calcHighlightColor(color, options);
+                    }
+
+                    return target.drawPieSlice(radius, radius, radius - borderWidth, start, end, undefined, color);
+                }
+                next = end;
+            }
+        },
+
+        render: function () {
+            var target = this.target,
+                values = this.values,
+                options = this.options,
+                radius = this.radius,
+                borderWidth = options.get('borderWidth'),
+                shape, i;
+
+            if (!pie._super.render.call(this)) {
+                return;
+            }
+            if (borderWidth) {
+                target.drawCircle(radius, radius, Math.floor(radius - (borderWidth / 2)),
+                    options.get('borderColor'), undefined, borderWidth).append();
+            }
+            for (i = values.length; i--;) {
+                if (values[i]) { // don't render zero values
+                    shape = this.renderSlice(i).append();
+                    this.valueShapes[i] = shape.id; // store just the shapeid
+                    this.shapes[shape.id] = i;
+                }
+            }
+            target.render();
+        }
+    });
+
+    /**
+     * Box plots
+     */
+    $.fn.sparkline.box = box = createClass($.fn.sparkline._base, {
+        type: 'box',
+
+        init: function (el, values, options, width, height) {
+            box._super.init.call(this, el, values, options, width, height);
+            this.values = $.map(values, Number);
+            this.width = options.get('width') === 'auto' ? '4.0em' : width;
+            this.initTarget();
+            if (!this.values.length) {
+                this.disabled = 1;
+            }
+        },
+
+        /**
+         * Simulate a single region
+         */
+        getRegion: function () {
+            return 1;
+        },
+
+        getCurrentRegionFields: function () {
+            var result = [
+                { field: 'lq', value: this.quartiles[0] },
+                { field: 'med', value: this.quartiles[1] },
+                { field: 'uq', value: this.quartiles[2] }
+            ];
+            if (this.loutlier !== undefined) {
+                result.push({ field: 'lo', value: this.loutlier});
+            }
+            if (this.routlier !== undefined) {
+                result.push({ field: 'ro', value: this.routlier});
+            }
+            if (this.lwhisker !== undefined) {
+                result.push({ field: 'lw', value: this.lwhisker});
+            }
+            if (this.rwhisker !== undefined) {
+                result.push({ field: 'rw', value: this.rwhisker});
+            }
+            return result;
+        },
+
+        render: function () {
+            var target = this.target,
+                values = this.values,
+                vlen = values.length,
+                options = this.options,
+                canvasWidth = this.canvasWidth,
+                canvasHeight = this.canvasHeight,
+                minValue = options.get('chartRangeMin') === undefined ? Math.min.apply(Math, values) : options.get('chartRangeMin'),
+                maxValue = options.get('chartRangeMax') === undefined ? Math.max.apply(Math, values) : options.get('chartRangeMax'),
+                canvasLeft = 0,
+                lwhisker, loutlier, iqr, q1, q2, q3, rwhisker, routlier, i,
+                size, unitSize;
+
+            if (!box._super.render.call(this)) {
+                return;
+            }
+
+            if (options.get('raw')) {
+                if (options.get('showOutliers') && values.length > 5) {
+                    loutlier = values[0];
+                    lwhisker = values[1];
+                    q1 = values[2];
+                    q2 = values[3];
+                    q3 = values[4];
+                    rwhisker = values[5];
+                    routlier = values[6];
+                } else {
+                    lwhisker = values[0];
+                    q1 = values[1];
+                    q2 = values[2];
+                    q3 = values[3];
+                    rwhisker = values[4];
+                }
+            } else {
+                values.sort(function (a, b) { return a - b; });
+                q1 = quartile(values, 1);
+                q2 = quartile(values, 2);
+                q3 = quartile(values, 3);
+                iqr = q3 - q1;
+                if (options.get('showOutliers')) {
+                    lwhisker = rwhisker = undefined;
+                    for (i = 0; i < vlen; i++) {
+                        if (lwhisker === undefined && values[i] > q1 - (iqr * options.get('outlierIQR'))) {
+                            lwhisker = values[i];
+                        }
+                        if (values[i] < q3 + (iqr * options.get('outlierIQR'))) {
+                            rwhisker = values[i];
+                        }
+                    }
+                    loutlier = values[0];
+                    routlier = values[vlen - 1];
+                } else {
+                    lwhisker = values[0];
+                    rwhisker = values[vlen - 1];
+                }
+            }
+            this.quartiles = [q1, q2, q3];
+            this.lwhisker = lwhisker;
+            this.rwhisker = rwhisker;
+            this.loutlier = loutlier;
+            this.routlier = routlier;
+
+            unitSize = canvasWidth / (maxValue - minValue + 1);
+            if (options.get('showOutliers')) {
+                canvasLeft = Math.ceil(options.get('spotRadius'));
+                canvasWidth -= 2 * Math.ceil(options.get('spotRadius'));
+                unitSize = canvasWidth / (maxValue - minValue + 1);
+                if (loutlier < lwhisker) {
+                    target.drawCircle((loutlier - minValue) * unitSize + canvasLeft,
+                        canvasHeight / 2,
+                        options.get('spotRadius'),
+                        options.get('outlierLineColor'),
+                        options.get('outlierFillColor')).append();
+                }
+                if (routlier > rwhisker) {
+                    target.drawCircle((routlier - minValue) * unitSize + canvasLeft,
+                        canvasHeight / 2,
+                        options.get('spotRadius'),
+                        options.get('outlierLineColor'),
+                        options.get('outlierFillColor')).append();
+                }
+            }
+
+            // box
+            target.drawRect(
+                Math.round((q1 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.1),
+                Math.round((q3 - q1) * unitSize),
+                Math.round(canvasHeight * 0.8),
+                options.get('boxLineColor'),
+                options.get('boxFillColor')).append();
+            // left whisker
+            target.drawLine(
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                Math.round((q1 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                options.get('lineColor')).append();
+            target.drawLine(
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 4),
+                Math.round((lwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight - canvasHeight / 4),
+                options.get('whiskerColor')).append();
+            // right whisker
+            target.drawLine(Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                Math.round((q3 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 2),
+                options.get('lineColor')).append();
+            target.drawLine(
+                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight / 4),
+                Math.round((rwhisker - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight - canvasHeight / 4),
+                options.get('whiskerColor')).append();
+            // median line
+            target.drawLine(
+                Math.round((q2 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.1),
+                Math.round((q2 - minValue) * unitSize + canvasLeft),
+                Math.round(canvasHeight * 0.9),
+                options.get('medianColor')).append();
+            if (options.get('target')) {
+                size = Math.ceil(options.get('spotRadius'));
+                target.drawLine(
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+                    Math.round((canvasHeight / 2) - size),
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft),
+                    Math.round((canvasHeight / 2) + size),
+                    options.get('targetColor')).append();
+                target.drawLine(
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft - size),
+                    Math.round(canvasHeight / 2),
+                    Math.round((options.get('target') - minValue) * unitSize + canvasLeft + size),
+                    Math.round(canvasHeight / 2),
+                    options.get('targetColor')).append();
+            }
+            target.render();
+        }
+    });
+
+    // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
+    // This is accessible as $(foo).simpledraw()
+
+    // Detect browser renderer support
+    (function() {
+        if (document.namespaces && !document.namespaces.v) {
+            $.fn.sparkline.hasVML = true;
+            document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
+        } else {
+            $.fn.sparkline.hasVML = false;
+        }
+
+        var el = document.createElement('canvas');
+        $.fn.sparkline.hasCanvas = !!(el.getContext && el.getContext('2d'));
+
+    })()
+
+    VShape = createClass({
+        init: function (target, id, type, args) {
+            this.target = target;
+            this.id = id;
+            this.type = type;
+            this.args = args;
+        },
+        append: function () {
+            this.target.appendShape(this);
+            return this;
+        }
+    });
+
+    VCanvas_base = createClass({
+        _pxregex: /(\d+)(px)?\s*$/i,
+
+        init: function (width, height, target) {
+            if (!width) {
+                return;
+            }
+            this.width = width;
+            this.height = height;
+            this.target = target;
+            this.lastShapeId = null;
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+        },
+
+        drawLine: function (x1, y1, x2, y2, lineColor, lineWidth) {
+            return this.drawShape([[x1, y1], [x2, y2]], lineColor, lineWidth);
+        },
+
+        drawShape: function (path, lineColor, fillColor, lineWidth) {
+            return this._genShape('Shape', [path, lineColor, fillColor, lineWidth]);
+        },
+
+        drawCircle: function (x, y, radius, lineColor, fillColor, lineWidth) {
+            return this._genShape('Circle', [x, y, radius, lineColor, fillColor, lineWidth]);
+        },
+
+        drawPieSlice: function (x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            return this._genShape('PieSlice', [x, y, radius, startAngle, endAngle, lineColor, fillColor]);
+        },
+
+        drawRect: function (x, y, width, height, lineColor, fillColor) {
+            return this._genShape('Rect', [x, y, width, height, lineColor, fillColor]);
+        },
+
+        getElement: function () {
+            return this.canvas;
+        },
+
+        /**
+         * Return the most recently inserted shape id
+         */
+        getLastShapeId: function () {
+            return this.lastShapeId;
+        },
+
+        /**
+         * Clear and reset the canvas
+         */
+        reset: function () {
+            alert('reset not implemented');
+        },
+
+        _insert: function (el, target) {
+            $(target).html(el);
+        },
+
+        /**
+         * Calculate the pixel dimensions of the canvas
+         */
+        _calculatePixelDims: function (width, height, canvas) {
+            // XXX This should probably be a configurable option
+            var match;
+            match = this._pxregex.exec(height);
+            if (match) {
+                this.pixelHeight = match[1];
+            } else {
+                this.pixelHeight = $(canvas).height();
+            }
+            match = this._pxregex.exec(width);
+            if (match) {
+                this.pixelWidth = match[1];
+            } else {
+                this.pixelWidth = $(canvas).width();
+            }
+        },
+
+        /**
+         * Generate a shape object and id for later rendering
+         */
+        _genShape: function (shapetype, shapeargs) {
+            var id = shapeCount++;
+            shapeargs.unshift(id);
+            return new VShape(this, id, shapetype, shapeargs);
+        },
+
+        /**
+         * Add a shape to the end of the render queue
+         */
+        appendShape: function (shape) {
+            alert('appendShape not implemented');
+        },
+
+        /**
+         * Replace one shape with another
+         */
+        replaceWithShape: function (shapeid, shape) {
+            alert('replaceWithShape not implemented');
+        },
+
+        /**
+         * Insert one shape after another in the render queue
+         */
+        insertAfterShape: function (shapeid, shape) {
+            alert('insertAfterShape not implemented');
+        },
+
+        /**
+         * Remove a shape from the queue
+         */
+        removeShapeId: function (shapeid) {
+            alert('removeShapeId not implemented');
+        },
+
+        /**
+         * Find a shape at the specified x/y co-ordinates
+         */
+        getShapeAt: function (el, x, y) {
+            alert('getShapeAt not implemented');
+        },
+
+        /**
+         * Render all queued shapes onto the canvas
+         */
+        render: function () {
+            alert('render not implemented');
+        }
+    });
+
+    VCanvas_canvas = createClass(VCanvas_base, {
+        init: function (width, height, target, interact) {
+            VCanvas_canvas._super.init.call(this, width, height, target);
+            this.canvas = document.createElement('canvas');
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+            $(this.canvas).css({ display: 'inline-block', width: width, height: height, verticalAlign: 'top' });
+            this._insert(this.canvas, target);
+            this._calculatePixelDims(width, height, this.canvas);
+            this.canvas.width = this.pixelWidth;
+            this.canvas.height = this.pixelHeight;
+            this.interact = interact;
+            this.shapes = {};
+            this.shapeseq = [];
+            this.currentTargetShapeId = undefined;
+            $(this.canvas).css({width: this.pixelWidth, height: this.pixelHeight});
+        },
+
+        _getContext: function (lineColor, fillColor, lineWidth) {
+            var context = this.canvas.getContext('2d');
+            if (lineColor !== undefined) {
+                context.strokeStyle = lineColor;
+            }
+            context.lineWidth = lineWidth === undefined ? 1 : lineWidth;
+            if (fillColor !== undefined) {
+                context.fillStyle = fillColor;
+            }
+            return context;
+        },
+
+        reset: function () {
+            var context = this._getContext();
+            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+            this.shapes = {};
+            this.shapeseq = [];
+            this.currentTargetShapeId = undefined;
+        },
+
+        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
+            var context = this._getContext(lineColor, fillColor, lineWidth),
+                i, plen;
+            context.beginPath();
+            context.moveTo(path[0][0] + 0.5, path[0][1] + 0.5);
+            for (i = 1, plen = path.length; i < plen; i++) {
+                context.lineTo(path[i][0] + 0.5, path[i][1] + 0.5); // the 0.5 offset gives us crisp pixel-width lines
+            }
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor !== undefined) {
+                context.fill();
+            }
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+        },
+
+        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+            var context = this._getContext(lineColor, fillColor, lineWidth);
+            context.beginPath();
+            context.arc(x, y, radius, 0, 2 * Math.PI, false);
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor !== undefined) {
+                context.fill();
+            }
+        },
+
+        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            var context = this._getContext(lineColor, fillColor);
+            context.beginPath();
+            context.moveTo(x, y);
+            context.arc(x, y, radius, startAngle, endAngle, false);
+            context.lineTo(x, y);
+            context.closePath();
+            if (lineColor !== undefined) {
+                context.stroke();
+            }
+            if (fillColor) {
+                context.fill();
+            }
+            if (this.targetX !== undefined && this.targetY !== undefined &&
+                context.isPointInPath(this.targetX, this.targetY)) {
+                this.currentTargetShapeId = shapeid;
+            }
+        },
+
+        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+            return this._drawShape(shapeid, [[x, y], [x + width, y], [x + width, y + height], [x, y + height], [x, y]], lineColor, fillColor);
+        },
+
+        appendShape: function (shape) {
+            this.shapes[shape.id] = shape;
+            this.shapeseq.push(shape.id);
+            this.lastShapeId = shape.id;
+            return shape.id;
+        },
+
+        replaceWithShape: function (shapeid, shape) {
+            var shapeseq = this.shapeseq,
+                i;
+            this.shapes[shape.id] = shape;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] == shapeid) {
+                    shapeseq[i] = shape.id;
+                }
+            }
+            delete this.shapes[shapeid];
+        },
+
+        replaceWithShapes: function (shapeids, shapes) {
+            var shapeseq = this.shapeseq,
+                shapemap = {},
+                sid, i, first;
+
+            for (i = shapeids.length; i--;) {
+                shapemap[shapeids[i]] = true;
+            }
+            for (i = shapeseq.length; i--;) {
+                sid = shapeseq[i];
+                if (shapemap[sid]) {
+                    shapeseq.splice(i, 1);
+                    delete this.shapes[sid];
+                    first = i;
+                }
+            }
+            for (i = shapes.length; i--;) {
+                shapeseq.splice(first, 0, shapes[i].id);
+                this.shapes[shapes[i].id] = shapes[i];
+            }
+
+        },
+
+        insertAfterShape: function (shapeid, shape) {
+            var shapeseq = this.shapeseq,
+                i;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] === shapeid) {
+                    shapeseq.splice(i + 1, 0, shape.id);
+                    this.shapes[shape.id] = shape;
+                    return;
+                }
+            }
+        },
+
+        removeShapeId: function (shapeid) {
+            var shapeseq = this.shapeseq,
+                i;
+            for (i = shapeseq.length; i--;) {
+                if (shapeseq[i] === shapeid) {
+                    shapeseq.splice(i, 1);
+                    break;
+                }
+            }
+            delete this.shapes[shapeid];
+        },
+
+        getShapeAt: function (el, x, y) {
+            this.targetX = x;
+            this.targetY = y;
+            this.render();
+            return this.currentTargetShapeId;
+        },
+
+        render: function () {
+            var shapeseq = this.shapeseq,
+                shapes = this.shapes,
+                shapeCount = shapeseq.length,
+                context = this._getContext(),
+                shapeid, shape, i;
+            context.clearRect(0, 0, this.pixelWidth, this.pixelHeight);
+            for (i = 0; i < shapeCount; i++) {
+                shapeid = shapeseq[i];
+                shape = shapes[shapeid];
+                this['_draw' + shape.type].apply(this, shape.args);
+            }
+            if (!this.interact) {
+                // not interactive so no need to keep the shapes array
+                this.shapes = {};
+                this.shapeseq = [];
+            }
+        }
+
+    });
+
+    VCanvas_vml = createClass(VCanvas_base, {
+        init: function (width, height, target) {
+            var groupel;
+            VCanvas_vml._super.init.call(this, width, height, target);
+            if (target[0]) {
+                target = target[0];
+            }
+            $.data(target, '_jqs_vcanvas', this);
+            this.canvas = document.createElement('span');
+            $(this.canvas).css({ display: 'inline-block', position: 'relative', overflow: 'hidden', width: width, height: height, margin: '0px', padding: '0px', verticalAlign: 'top'});
+            this._insert(this.canvas, target);
+            this._calculatePixelDims(width, height, this.canvas);
+            this.canvas.width = this.pixelWidth;
+            this.canvas.height = this.pixelHeight;
+            groupel = '<v:group coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '"' +
+                    ' style="position:absolute;top:0;left:0;width:' + this.pixelWidth + 'px;height=' + this.pixelHeight + 'px;"></v:group>';
+            this.canvas.insertAdjacentHTML('beforeEnd', groupel);
+            this.group = $(this.canvas).children()[0];
+            this.rendered = false;
+            this.prerender = '';
+        },
+
+        _drawShape: function (shapeid, path, lineColor, fillColor, lineWidth) {
+            var vpath = [],
+                initial, stroke, fill, closed, vel, plen, i;
+            for (i = 0, plen = path.length; i < plen; i++) {
+                vpath[i] = '' + (path[i][0]) + ',' + (path[i][1]);
+            }
+            initial = vpath.splice(0, 1);
+            lineWidth = lineWidth === undefined ? 1 : lineWidth;
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            closed = vpath[0] === vpath[vpath.length - 1] ? 'x ' : '';
+            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                 stroke +
+                 fill +
+                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
+                ' path="m ' + initial + ' l ' + vpath.join(', ') + ' ' + closed + 'e">' +
+                ' </v:shape>';
+            return vel;
+        },
+
+        _drawCircle: function (shapeid, x, y, radius, lineColor, fillColor, lineWidth) {
+            var stroke, fill, vel;
+            x -= radius;
+            y -= radius;
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="' + lineWidth + 'px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            vel = '<v:oval ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                stroke +
+                fill +
+                ' style="position:absolute;top:' + y + 'px; left:' + x + 'px; width:' + (radius * 2) + 'px; height:' + (radius * 2) + 'px"></v:oval>';
+            return vel;
+
+        },
+
+        _drawPieSlice: function (shapeid, x, y, radius, startAngle, endAngle, lineColor, fillColor) {
+            var vpath, startx, starty, endx, endy, stroke, fill, vel;
+            if (startAngle === endAngle) {
+                return '';  // VML seems to have problem when start angle equals end angle.
+            }
+            if ((endAngle - startAngle) === (2 * Math.PI)) {
+                startAngle = 0.0;  // VML seems to have a problem when drawing a full circle that doesn't start 0
+                endAngle = (2 * Math.PI);
+            }
+
+            startx = x + Math.round(Math.cos(startAngle) * radius);
+            starty = y + Math.round(Math.sin(startAngle) * radius);
+            endx = x + Math.round(Math.cos(endAngle) * radius);
+            endy = y + Math.round(Math.sin(endAngle) * radius);
+
+            if (startx === endx && starty === endy) {
+                if ((endAngle - startAngle) < Math.PI) {
+                    // Prevent very small slices from being mistaken as a whole pie
+                    return '';
+                }
+                // essentially going to be the entire circle, so ignore startAngle
+                startx = endx = x + radius;
+                starty = endy = y;
+            }
+
+            if (startx === endx && starty === endy && (endAngle - startAngle) < Math.PI) {
+                return '';
+            }
+
+            vpath = [x - radius, y - radius, x + radius, y + radius, startx, starty, endx, endy];
+            stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="1px" strokeColor="' + lineColor + '" ';
+            fill = fillColor === undefined ? ' filled="false"' : ' fillColor="' + fillColor + '" filled="true" ';
+            vel = '<v:shape coordorigin="0 0" coordsize="' + this.pixelWidth + ' ' + this.pixelHeight + '" ' +
+                 ' id="jqsshape' + shapeid + '" ' +
+                 stroke +
+                 fill +
+                ' style="position:absolute;left:0px;top:0px;height:' + this.pixelHeight + 'px;width:' + this.pixelWidth + 'px;padding:0px;margin:0px;" ' +
+                ' path="m ' + x + ',' + y + ' wa ' + vpath.join(', ') + ' x e">' +
+                ' </v:shape>';
+            return vel;
+        },
+
+        _drawRect: function (shapeid, x, y, width, height, lineColor, fillColor) {
+            return this._drawShape(shapeid, [[x, y], [x, y + height], [x + width, y + height], [x + width, y], [x, y]], lineColor, fillColor);
+        },
+
+        reset: function () {
+            this.group.innerHTML = '';
+        },
+
+        appendShape: function (shape) {
+            var vel = this['_draw' + shape.type].apply(this, shape.args);
+            if (this.rendered) {
+                this.group.insertAdjacentHTML('beforeEnd', vel);
+            } else {
+                this.prerender += vel;
+            }
+            this.lastShapeId = shape.id;
+            return shape.id;
+        },
+
+        replaceWithShape: function (shapeid, shape) {
+            var existing = $('#jqsshape' + shapeid),
+                vel = this['_draw' + shape.type].apply(this, shape.args);
+            existing[0].outerHTML = vel;
+        },
+
+        replaceWithShapes: function (shapeids, shapes) {
+            // replace the first shapeid with all the new shapes then toast the remaining old shapes
+            var existing = $('#jqsshape' + shapeids[0]),
+                replace = '',
+                slen = shapes.length,
+                i;
+            for (i = 0; i < slen; i++) {
+                replace += this['_draw' + shapes[i].type].apply(this, shapes[i].args);
+            }
+            existing[0].outerHTML = replace;
+            for (i = 1; i < shapeids.length; i++) {
+                $('#jqsshape' + shapeids[i]).remove();
+            }
+        },
+
+        insertAfterShape: function (shapeid, shape) {
+            var existing = $('#jqsshape' + shapeid),
+                 vel = this['_draw' + shape.type].apply(this, shape.args);
+            existing[0].insertAdjacentHTML('afterEnd', vel);
+        },
+
+        removeShapeId: function (shapeid) {
+            var existing = $('#jqsshape' + shapeid);
+            this.group.removeChild(existing[0]);
+        },
+
+        getShapeAt: function (el, x, y) {
+            var shapeid = el.id.substr(8);
+            return shapeid;
+        },
+
+        render: function () {
+            if (!this.rendered) {
+                // batch the intial render into a single repaint
+                this.group.innerHTML = this.prerender;
+                this.rendered = true;
+            }
+        }
+    });
+
+}));
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
new file mode 100644
index 00000000000..ba4473edc26
--- /dev/null
+++ b/addons/crm/static/src/css/crm.css
@@ -0,0 +1,64 @@
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams {
+    width: 345px;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars {
+    text-align: right;
+    margin: -5px 0 -10px 0;
+}
+
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars img {
+    width: 30px;
+    height: 30px;
+    padding-left: 0px;
+    margin-top: 3px;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+    border-radius: 2px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+    -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+}
+
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
+    position: relative;
+    margin: 10px;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div {
+    width: 160px;
+    height: 22px;
+    margin: 0 !important;
+    position: relative;
+    display: inline-block;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {
+    text-decoration: underline !important;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div a:nth-child(2n) {
+    position: absolute;
+    left: 90px;
+    top: 0;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list div:nth-child(2n) a:nth-child(2n) {
+    left: 110px;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center {
+    text-align: center;
+    margin: 3px 0;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_sum {
+    margin: 0;
+    font-size: 40px;
+}
+.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
+    font-size: 10px;
+}
+
+.openerp .oe_kanban_view .oe_justgage {
+    color: black;
+    display: inline-block;
+}
+
+.openerp .oe_kanban_view .oe_sparkline_bar {
+    height: 20px;
+    width: 36px;
+}
\ No newline at end of file
diff --git a/addons/crm/static/src/js/crm_case_section.js b/addons/crm/static/src/js/crm_case_section.js
new file mode 100644
index 00000000000..2b4ca741d75
--- /dev/null
+++ b/addons/crm/static/src/js/crm_case_section.js
@@ -0,0 +1,34 @@
+openerp.crm = function(openerp) {
+    openerp.web_kanban.KanbanRecord.include({
+        on_card_clicked: function() {
+            if (this.view.dataset.model === 'crm.case.section') {
+                this.$('.oe_kanban_crm_salesteams_list a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        },
+    });
+
+    openerp.crm.SparklineBarWidget = openerp.web_kanban.AbstractField.extend({
+        className: "oe_sparkline_bar",
+        start: function() {
+            var self = this;
+            var title = this.$node.html();
+            setTimeout(function () {
+                var value = _.pluck(self.field.value, 'value');
+                var tooltips = _.pluck(self.field.value, 'tooltip');
+                self.$el.sparkline(value, {
+                    type: 'bar',
+                    barWidth: 5,
+                    tooltipFormat: '{{offset:offset}} {{value}}',
+                    tooltipValueLookups: {
+                        'offset': tooltips
+                    },
+                });
+                self.$el.tipsy({'delayIn': 0, 'html': true, 'title': function(){return title}, 'gravity': 'n'});
+            }, 0);
+        },
+    });
+    openerp.web_kanban.fields_registry.add("sparkline_bar", "openerp.crm.SparklineBarWidget");
+
+};
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index edaf844952a..8749675bf23 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -1,7 +1,9 @@
 -
-  I cancel unqualified lead.
+  I set a new sale team (with Marketing at parent) and I cancel unqualified lead .
 -
   !python {model: crm.lead}: |
+    section_id = self.pool.get('crm.case.section').create(cr, uid, {'name': "Phone Marketing", 'parent_id': ref("crm.crm_case_section_2")})
+    self.write(cr, uid, [ref("crm_case_1")], {'section_id': section_id})
     self.case_cancel(cr, uid, [ref("crm_case_1")])
 -
   I check cancelled lead.
@@ -42,4 +44,4 @@
   I check the lead is correctly escalated to the parent team.
 -
   !assert {model: crm.lead, id: crm.crm_case_1, string: Escalate lead to parent team}:
-    - section_id.name == "Support Department"
+    - section_id.name == "Marketing"
diff --git a/addons/crm/test/crm_lead_message.yml b/addons/crm/test/crm_lead_message.yml
index 221a4ab634f..0f7d4655398 100644
--- a/addons/crm/test/crm_lead_message.yml
+++ b/addons/crm/test/crm_lead_message.yml
@@ -4,8 +4,7 @@
   Mail script will fetch his request from mail server. Then I process that mail after read EML file.
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('crm','test', 'customer_request.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('crm','test', 'customer_request.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.lead', request_message)
 -
diff --git a/addons/crm/validate_email.py b/addons/crm/validate_email.py
new file mode 100644
index 00000000000..38de5743fca
--- /dev/null
+++ b/addons/crm/validate_email.py
@@ -0,0 +1,123 @@
+# RFC 2822 - style email validation for Python
+# (c) 2012 Syrus Akbary <me@syrusakbary.com>
+# Extended from (c) 2011 Noel Bush <noel@aitools.org>
+# for support of mx and user check
+# This code is made available to you under the GNU LGPL v3.
+#
+# This module provides a single method, valid_email_address(),
+# which returns True or False to indicate whether a given address
+# is valid according to the 'addr-spec' part of the specification
+# given in RFC 2822.  Ideally, we would like to find this
+# in some other library, already thoroughly tested and well-
+# maintained.  The standard Python library email.utils
+# contains a parse_addr() function, but it is not sufficient
+# to detect many malformed addresses.
+#
+# This implementation aims to be faithful to the RFC, with the
+# exception of a circular definition (see comments below), and
+# with the omission of the pattern components marked as "obsolete".
+
+import re
+import smtplib
+import socket
+
+try:
+    import DNS
+    ServerError = DNS.ServerError
+except:
+    DNS = None
+    class ServerError(Exception): pass
+# All we are really doing is comparing the input string to one
+# gigantic regular expression.  But building that regexp, and
+# ensuring its correctness, is made much easier by assembling it
+# from the "tokens" defined by the RFC.  Each of these tokens is
+# tested in the accompanying unit test file.
+#
+# The section of RFC 2822 from which each pattern component is
+# derived is given in an accompanying comment.
+#
+# (To make things simple, every string below is given as 'raw',
+# even when it's not strictly necessary.  This way we don't forget
+# when it is necessary.)
+#
+WSP = r'[ \t]'                                       # see 2.2.2. Structured Header Field Bodies
+CRLF = r'(?:\r\n)'                                   # see 2.2.3. Long Header Fields
+NO_WS_CTL = r'\x01-\x08\x0b\x0c\x0f-\x1f\x7f'        # see 3.2.1. Primitive Tokens
+QUOTED_PAIR = r'(?:\\.)'                             # see 3.2.2. Quoted characters
+FWS = r'(?:(?:' + WSP + r'*' + CRLF + r')?' + \
+            WSP + r'+)'                                    # see 3.2.3. Folding white space and comments
+CTEXT = r'[' + NO_WS_CTL + \
+                r'\x21-\x27\x2a-\x5b\x5d-\x7e]'              # see 3.2.3
+CCONTENT = r'(?:' + CTEXT + r'|' + \
+                     QUOTED_PAIR + r')'                        # see 3.2.3 (NB: The RFC includes COMMENT here
+                                                                                                         # as well, but that would be circular.)
+COMMENT = r'\((?:' + FWS + r'?' + CCONTENT + \
+                    r')*' + FWS + r'?\)'                       # see 3.2.3
+CFWS = r'(?:' + FWS + r'?' + COMMENT + ')*(?:' + \
+             FWS + '?' + COMMENT + '|' + FWS + ')'         # see 3.2.3
+ATEXT = r'[\w!#$%&\'\*\+\-/=\?\^`\{\|\}~]'           # see 3.2.4. Atom
+ATOM = CFWS + r'?' + ATEXT + r'+' + CFWS + r'?'      # see 3.2.4
+DOT_ATOM_TEXT = ATEXT + r'+(?:\.' + ATEXT + r'+)*'   # see 3.2.4
+DOT_ATOM = CFWS + r'?' + DOT_ATOM_TEXT + CFWS + r'?' # see 3.2.4
+QTEXT = r'[' + NO_WS_CTL + \
+                r'\x21\x23-\x5b\x5d-\x7e]'                   # see 3.2.5. Quoted strings
+QCONTENT = r'(?:' + QTEXT + r'|' + \
+                     QUOTED_PAIR + r')'                        # see 3.2.5
+QUOTED_STRING = CFWS + r'?' + r'"(?:' + FWS + \
+                                r'?' + QCONTENT + r')*' + FWS + \
+                                r'?' + r'"' + CFWS + r'?'
+LOCAL_PART = r'(?:' + DOT_ATOM + r'|' + \
+                         QUOTED_STRING + r')'                    # see 3.4.1. Addr-spec specification
+DTEXT = r'[' + NO_WS_CTL + r'\x21-\x5a\x5e-\x7e]'    # see 3.4.1
+DCONTENT = r'(?:' + DTEXT + r'|' + \
+                     QUOTED_PAIR + r')'                        # see 3.4.1
+DOMAIN_LITERAL = CFWS + r'?' + r'\[' + \
+                                 r'(?:' + FWS + r'?' + DCONTENT + \
+                                 r')*' + FWS + r'?\]' + CFWS + r'?'  # see 3.4.1
+DOMAIN = r'(?:' + DOT_ATOM + r'|' + \
+                 DOMAIN_LITERAL + r')'                       # see 3.4.1
+ADDR_SPEC = LOCAL_PART + r'@' + DOMAIN               # see 3.4.1
+
+# A valid address will match exactly the 3.4.1 addr-spec.
+VALID_ADDRESS_REGEXP = '^' + ADDR_SPEC + '$'
+
+def validate_email(email, check_mx=False,verify=False):
+
+    """Indicate whether the given string is a valid email address
+    according to the 'addr-spec' portion of RFC 2822 (see section
+    3.4.1).  Parts of the spec that are marked obsolete are *not*
+    included in this test, and certain arcane constructions that
+    depend on circular definitions in the spec may not pass, but in
+    general this should correctly identify any email address likely
+    to be in use as of 2011."""
+    try:
+        assert re.match(VALID_ADDRESS_REGEXP, email) is not None
+        check_mx |= verify
+        if check_mx:
+            if not DNS: raise Exception('For check the mx records or check if the email exists you must have installed pyDNS python package')
+            DNS.DiscoverNameServers()
+            hostname = email[email.find('@')+1:]
+            mx_hosts = DNS.mxlookup(hostname)
+            for mx in mx_hosts:
+                try:
+                    smtp = smtplib.SMTP()
+                    smtp.connect(mx[1])
+                    if not verify: return True
+                    status, _ = smtp.helo()
+                    if status != 250: continue
+                    smtp.mail('')
+                    status, _ = smtp.rcpt(email)
+                    if status != 250: return False
+                    break
+                except smtplib.SMTPServerDisconnected: #Server not permits verify user
+                    break
+                except smtplib.SMTPConnectError:
+                    continue
+    except (AssertionError, ServerError): 
+        return False
+    return True
+
+# import sys
+
+# sys.modules[__name__],sys.modules['validate_email_module'] = validate_email,sys.modules[__name__]
+# from validate_email_module import *
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e67b7c0c7be..3c847ade42a 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -86,7 +86,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         lead_obj = self.pool.get('crm.lead')
         for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled leads cannot be converted into opportunities."))
+                raise osv.except_osv(_("Warning!"), _("Closed/Cancelled leads cannot be converted into opportunities."))
         return False
 
     def _convert_opportunity(self, cr, uid, ids, vals, context=None):
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 00686de1c8e..4093df910d0 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -22,7 +22,7 @@
                                 <field name="phone"/>
                                 <field name="stage_id"/>
                                 <field name="user_id"/>
-                                <field name="section_id"/>
+                                <field name="section_id" groups="base.group_multi_salesteams"/>
                             </tree>
                         </field>
                     </group>
@@ -68,13 +68,13 @@
                                 <field name="phone"/>
                                 <field name="stage_id"/>
                                 <field name="user_id"/>
-                                <field name="section_id"/>
+                                <field name="section_id" groups="base.group_multi_salesteams"/>
                             </tree>
                         </field>
                     </group>
 
                     <group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
-                        <field name="section_id"/>
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
                         <field name="user_ids" widget="many2many_tags"/>
                     </group>
 
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index f68abeb8a52..919d83cb9a7 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -19,7 +19,7 @@
                             <field name="phone"/>
                             <field name="stage_id"/>
                             <field name="user_id"/>
-                            <field name="section_id"/>
+                            <field name="section_id" groups="base.group_multi_salesteams"/>
                         </tree>
                     </field>
                     <footer>
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index ee7ed1fc31f..bb1ac2fdce6 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -73,6 +73,5 @@ class crm_opportunity2phonecall(osv.osv_memory):
                 action=data.action, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-crm_opportunity2phonecall()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index ad369448517..846d71d74da 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -23,7 +23,7 @@
                             <field name="partner_id" readonly="True"/>
                             <field name="phone"/>
                             <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
-                            <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
+                            <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}" groups="base.group_multi_salesteams"/>
                         </group>
                     </group>
                     <field name="note" placeholder="Call Description" />
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index 4e21e01b834..105ab113a71 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -59,6 +59,5 @@ class crm_phonecall2meeting(osv.osv_memory):
             }
         return res
 
-crm_phonecall2meeting()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index d0bcd12dbb7..7e1da41a29f 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -96,6 +96,5 @@ class crm_phonecall2phonecall(osv.osv_memory):
                 res.update({'partner_id': phonecall.partner_id and phonecall.partner_id.id or False})
         return res
 
-crm_phonecall2phonecall()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index e2d25218749..812468b17e6 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -15,7 +15,7 @@
                         <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                         <field name="partner_id" readonly="True"/>
                         <field name="user_id"/>
-                        <field name="section_id"/>
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
                     </group>
                     <footer>
                         <button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
diff --git a/addons/crm_claim/__init__.py b/addons/crm_claim/__init__.py
index 2012c227adf..7395ea83fe5 100644
--- a/addons/crm_claim/__init__.py
+++ b/addons/crm_claim/__init__.py
@@ -21,7 +21,6 @@
 
 import crm_claim
 import report
-import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 78dfba2ed53..61257265f1b 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -41,7 +41,6 @@ automatically new claims based on incoming emails.
         'crm_claim_menu.xml',
         'security/ir.model.access.csv',
         'report/crm_claim_report_view.xml',
-        'res_config_view.xml',
         'crm_claim_data.xml',
     ],
     'demo': ['crm_claim_demo.xml'],
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 275d9edaab4..774571b0314 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -105,7 +105,7 @@ class crm_claim(base_stage, osv.osv):
         'email_from': fields.char('Email', size=128, help="Destination email for email gateway."),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange',
-                domain="['&',('fold', '=', False),'|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
+                domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
         'cause': fields.text('Root Cause'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index b1ab72e20f6..e295bfdd250 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -116,7 +116,7 @@
                     <group colspan="4" col="4"  groups="base.group_user">
                         <field name="user_id"/>
                         <field name="priority"/>
-                        <field name="section_id"/>
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
                         <field name="date_deadline"/>
                         <field name="state" groups="base.group_no_one"/>
                     </group>
@@ -201,7 +201,7 @@
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
                     <filter string="Unassigned Claims" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Claims" />
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}"/>
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index afcf4702a67..4579b6d8557 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:01+0000\n"
+"PO-Revision-Date: 2013-05-30 14:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:44+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -23,6 +23,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -46,11 +48,13 @@ msgid ""
 "Allows you to configure your incoming mail server, and create claims from "
 "incoming emails."
 msgstr ""
+"Позволяет настроить сервер входящей почты и создавать претензии из входящих "
+"эл. писем."
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_stage
 msgid "Claim stages"
-msgstr ""
+msgstr "Этапы претензии"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -65,7 +69,7 @@ msgstr "Задержка закрытия"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -100,12 +104,12 @@ msgstr "# претензий"
 #. module: crm_claim
 #: field:crm.claim.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Название этапа"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -149,7 +153,7 @@ msgstr "Предупредительная мера"
 #. module: crm_claim
 #: help:crm.claim,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
@@ -182,6 +186,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -235,12 +241,12 @@ msgstr "Важность"
 #. module: crm_claim
 #: field:crm.claim.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Скрыть вид, если пусто"
 
 #. module: crm_claim
 #: field:crm.claim,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -254,7 +260,7 @@ msgstr "Новый"
 #. module: crm_claim
 #: field:crm.claim.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "Секции"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -290,7 +296,7 @@ msgstr "Предмет претензии"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim3
 msgid "Rejected"
-msgstr ""
+msgstr "Отклонено"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
@@ -344,7 +350,7 @@ msgstr ""
 #: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
 
 #. module: crm_claim
 #: help:crm.claim.stage,state:0
@@ -358,7 +364,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr ""
+msgstr "Решать"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
@@ -384,7 +390,7 @@ msgstr "Отчет о претензиях"
 #. module: crm_claim
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Настроить"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
@@ -430,6 +436,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
+"отделу продаж. Этот этап не будет назначен существующим отделам."
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
@@ -485,7 +493,7 @@ msgstr "Закрыто"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reject"
-msgstr ""
+msgstr "Отклонить"
 
 #. module: crm_claim
 #: view:res.partner:0
@@ -495,7 +503,7 @@ msgstr "Претензии партнера"
 #. module: crm_claim
 #: view:crm.claim.stage:0
 msgid "Claim Stage"
-msgstr ""
+msgstr "Этап претензии"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -513,7 +521,7 @@ msgstr "Отложено"
 #: field:crm.claim.report,state:0
 #: field:crm.claim.stage,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -529,7 +537,7 @@ msgstr "Обычный"
 #. module: crm_claim
 #: help:crm.claim.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Используется для упорядочивания этапов. Меньше - лучше."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -549,7 +557,7 @@ msgstr "Телефон"
 #. module: crm_claim
 #: field:crm.claim,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
@@ -581,6 +589,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"Статус устанавливается в \"Черновик\", при создании  дела. Если дело в "
+"процессе, то статус - «Открыт». Когда дело закончено, устанавливается статус "
+"\"Готово\". Если дело должно быть пересмотрено то статус установлен в "
+"'Ожидание'."
 
 #. module: crm_claim
 #: field:crm.claim,active:0
@@ -628,7 +640,7 @@ msgstr "Дата претензии"
 #. module: crm_claim
 #: field:crm.claim,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -638,7 +650,7 @@ msgstr "Категории претензий"
 #. module: crm_claim
 #: field:crm.claim.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Общее для всех отделов"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -677,7 +689,7 @@ msgstr "Претензия"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Моя компания"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -807,7 +819,7 @@ msgstr "Февраль"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -833,22 +845,22 @@ msgstr "Мои дела"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr ""
+msgstr "Решено"
 
 #. module: crm_claim
 #: help:crm.claim,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: crm_claim
 #: field:sale.config.settings,fetchmail_claim:0
 msgid "Create claims from incoming mails"
-msgstr ""
+msgstr "Создать претензии из входящей почты"
 
 #. module: crm_claim
 #: field:crm.claim.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Нумерация"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -883,6 +895,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Связь между этапами и отделами продаж. При установке, ограничивает этап для "
+"выбранного отдела продаж."
 
 #. module: crm_claim
 #: help:crm.claim.stage,case_refused:0
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index ad56fa5e34e..2ed87505d9c 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -114,6 +114,5 @@ class crm_claim_report(osv.osv):
                         c.priority,c.type_action,c.date_deadline,c.date_closed,c.id
             )""")
 
-crm_claim_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index a61490c6086..bae02ef8c0c 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -11,7 +11,8 @@
                <tree string="Claims" create="false">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="section_id" invisible="1"/>
+                    <field name="section_id" invisible="1"
+                            groups="base.group_multi_salesteams"/>
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -54,16 +55,17 @@
                     <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]"/>
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
                     <separator/>
-                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="user_id" string="Salesperson"/>
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"
+                            groups="base.group_multi_salesteams"/>
                     <group  expand="0" string="Extended Filters...">
-                        <field name="partner_id"/>
+                        <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                         <field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
                         <field name="categ_id" domain="[('object_id.model', '=', 'crm.claim')]"/>
                         <field name="priority"/>
@@ -76,7 +78,7 @@
                     </group>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"  groups="base.group_multi_salesteams"/>
                         <filter string="Partner" name="partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
deleted file mode 100644
index 79474f1fb00..00000000000
--- a/addons/crm_claim/res_config_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_project_config_claim" model="ir.ui.view">
-            <field name="name">crm_claim settings</field>
-            <field name="model">sale.config.settings</field>
-            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
-            <field name="priority" eval="20"/>       
-            <field name="arch" type="xml">
-                <div name="fetchmail_lead" position="after">
-                    <div>
-                        <field name="fetchmail_claim" class="oe_inline"/>
-                        <label for="fetchmail_claim"/>
-                        <button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward" 
-                            attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/>
-                    </div>
-                </div>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index bacb073b4b9..a843372956e 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -4,8 +4,7 @@
   Mail script will be fetched him request from mail server. so I process that mail after read EML file 
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('crm_claim','test', 'customer_claim.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('crm_claim','test', 'customer_claim.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.claim', request_message)
 -
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 6c0e3433afe..f97fe654166 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -48,7 +48,7 @@
                 <sheet string="Helpdesk Support">
                     <group col="4" class="oe_header">
                         <field name="name" string="Query"/>
-                        <field name="section_id" widget="selection"/>
+                        <field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
                         <field name="user_id"/>
                         <field name="date"/>
                         <field name="date_deadline"/>
@@ -115,7 +115,7 @@
                     <field name="date" string="Date"/>
                     <field name="date_deadline"/>
                     <field name="user_id"/>
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                     <field name="priority"/>
                     <field name="state"/>
                 </tree>
@@ -151,14 +151,14 @@
                     <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="All pending Helpdesk Request" />
                     <separator/>
                     <filter string="Assigned to Me or My Sales Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
-                    <field name="partner_id" />
+                            help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" groups="base.group_multi_salesteams"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="user_id"/>
-                    <field name="section_id" string="Sales Team"/>
+                    <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" help="Sales Team" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Date" icon="terp-go-month" domain="[]" help="Request Date" context="{'group_by':'date'}" />
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index e8eb90af9d7..bb53c03294f 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:08+0000\n"
+"PO-Revision-Date: 2013-05-30 14:09+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -46,7 +46,7 @@ msgstr "Март"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -63,7 +63,7 @@ msgstr "Адреса наблюдателей"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -106,7 +106,7 @@ msgstr "Отменено"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
@@ -136,6 +136,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -176,7 +178,7 @@ msgstr "Приоритет"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -400,7 +402,7 @@ msgstr "В ожидании"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -454,7 +456,7 @@ msgstr "Планируемая выручка"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,user_id:0
@@ -501,7 +503,7 @@ msgstr "Январь"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -517,7 +519,7 @@ msgstr "Прочее"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Моя компания"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -666,7 +668,7 @@ msgstr ""
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
index 4a80e7f9385..7c8275f606a 100644
--- a/addons/crm_helpdesk/i18n/zh_CN.po
+++ b/addons/crm_helpdesk/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-14 13:33+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-06-07 05:02+0000\n"
+"Last-Translator: PeterGao <306739889@qq.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -656,6 +656,12 @@ msgid ""
 "        \n"
 "If the case needs to be reviewed then the status is set to 'Pending'."
 msgstr ""
+"当一个“case(事件)\"被新创建后，这个“case(事件)\"的状态为“草稿”状态。                                 "
+" \n"
+"若这个“case(事件)\"正在处理中，这个“case(事件)\"的状态为“开启”状态。\n"
+"若这个“case(事件)\"已处理完结，这个“case(事件)\"的状态为“结单”状态。                                 "
+" \n"
+"若这个“case(事件)\"需暂停再议，这个“case(事件)\"的状态为“挂起”状态。"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_ids:0
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 8d535fa07a0..8b54e30ddd3 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -108,6 +108,5 @@ class crm_helpdesk_report(osv.osv):
                      c.categ_id,c.channel_id,c.planned_cost,c.id
             )""")
 
-crm_helpdesk_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 05f502656d2..c1ffc00303d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -11,7 +11,7 @@
                 <tree string="Helpdesk" create="false">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
-                    <field name="section_id" invisible="1"/>
+                    <field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -56,12 +56,13 @@
                     <separator/>
                     <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                     <separator/>
-                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)" />
+                    <filter string="My Sales Team(s)" icon="terp-personal+" context="{'invisible_section': False}" domain="[('section_id.user_id','=',uid)]" help="My Sales Team(s)"  groups="base.group_multi_salesteams"/>
                     <separator/>
                     <filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
                     <field name="user_id" string="Salesperson"/>
-                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>   
+                    <field name="section_id" string="Sales Team" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>   
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <group expand="0" string="Extended Filters..."  groups="base.group_no_one">
                         <field name="priority" string="Priority"/>
                         <field name="categ_id"/>
@@ -70,7 +71,7 @@
                     </group>
                     <group expand="1" string="Group By...">
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
+                        <filter string="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
                         <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
diff --git a/addons/crm_helpdesk/test/customer_question.eml b/addons/crm_helpdesk/test/customer_question.eml
index 38a4c95fb0c..9bc7c91cb41 100644
--- a/addons/crm_helpdesk/test/customer_question.eml
+++ b/addons/crm_helpdesk/test/customer_question.eml
@@ -3,7 +3,7 @@ Date: Tue, 25 Oct 2011 13:41:17 +0530
 From: Mr. John Right <info@customer.com>
 User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.14) Gecko/20110223 Lightning/1.0b2 Thunderbird/3.1.8
 MIME-Version: 1.0
-To: info@my.com
+To: _helpdesk@my.com
 Subject: Where is download link of user manual of your product ? 
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 8bit
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index e2be4a64ca3..95536b1c8dd 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -4,8 +4,7 @@
   Mail script will be fetched him request from mail server. so I process that mail after read EML file 
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('crm_helpdesk','test', 'customer_question.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('crm_helpdesk','test', 'customer_question.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'crm.helpdesk', request_message)
 -
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index f0a7ff509c9..fa995c8e7a1 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-23 13:46+0000\n"
+"PO-Revision-Date: 2013-06-06 10:24+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -25,7 +25,7 @@ msgstr "Задержка закрытия"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Автор"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -38,6 +38,9 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Тип сообщения: эл. почта - для эл. почты, уведомление - для системных "
+"сообщений, комментарий - для остальных сообщений таких как сообщения "
+"пользователя"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
@@ -53,7 +56,7 @@ msgstr "Группировать по ..."
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Автоматически обработанное HTML содержимое"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -68,7 +71,7 @@ msgstr "Геолоцировать"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Отмеченные"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -81,6 +84,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
+"определен для входящих писем."
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -111,7 +116,7 @@ msgstr "Компания"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
-msgstr ""
+msgstr "Уведомления"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@@ -123,7 +128,7 @@ msgstr "Дата партнера"
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -170,12 +175,12 @@ msgstr "Географическое назначение"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Оборот"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@@ -199,7 +204,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Системное уведомление"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -271,7 +276,7 @@ msgstr "Тип"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
-msgstr ""
+msgstr "Эл. почта"
 
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
@@ -286,7 +291,7 @@ msgstr "Низший"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
-msgstr ""
+msgstr "Дата счета"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
@@ -311,12 +316,12 @@ msgstr "Дата создания"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
-msgstr ""
+msgstr "res.partner.activation"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Родительское сообщение"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
@@ -358,12 +363,12 @@ msgstr "Этап"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Прочитать"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -418,12 +423,12 @@ msgstr "Количество дней, для закрытия вопроса"
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -451,7 +456,7 @@ msgstr "Декабрь"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "Пользователи, которые проголосовали за это сообщение"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -467,7 +472,7 @@ msgstr "Дата открытия"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Связанные сообщения"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
@@ -483,17 +488,17 @@ msgstr "Тема"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Содержимое"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Голоса"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -504,6 +509,8 @@ msgstr "# Предложений"
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
+"Текущий пользователь имеет отмеченное уведомление, связанное с этим "
+"сообщением"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
@@ -561,7 +568,7 @@ msgstr "Август"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Название связанного документа."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -663,7 +670,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
-msgstr ""
+msgstr "Период счета"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
@@ -684,7 +691,7 @@ msgstr "Вложения"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Название записи сообщения"
 
 #. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
@@ -699,6 +706,8 @@ msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
 msgstr ""
+"Не удается связаться с сервером геолокации. Пожалуйста, убедитесь, что ваше "
+"подключение к интернету работает (%s)."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -724,7 +733,7 @@ msgstr "Открыто"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
-msgstr ""
+msgstr "Подтип"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -739,12 +748,12 @@ msgstr "Текущий"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Кандидат/Предложение"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Уведомленные партнеры"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -775,7 +784,7 @@ msgstr "Вероятная выручка"
 #: field:res.partner,activation:0
 #: view:res.partner.activation:0
 msgid "Activation"
-msgstr ""
+msgstr "Активация"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -792,6 +801,8 @@ msgstr ""
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
+"Текущий пользователь имеет непрочитанные уведомления, связанные с этим "
+"сообщением"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
@@ -860,6 +871,8 @@ msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
+"Техническое поле, содержащее уведомления. Используйте notified_partner_ids "
+"для доступа к оповещаемым партнерам."
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -874,12 +887,12 @@ msgstr "CRM - отчет по кандидатам"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Режим составления"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
@@ -892,6 +905,8 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Автор сообщения. Если не установлен, email_from может содержать адрес почты, "
+"который не соответствует ни одному партнеру."
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
@@ -906,12 +921,12 @@ msgstr "Высокий"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Дополнительные контакты"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Первое сообщение цепочки."
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 2c208131b3a..676a8536b74 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -118,6 +118,5 @@ class crm_lead_report_assign(osv.osv):
                     left join res_partner p on (c.partner_assigned_id=p.id)
             )""")
 
-crm_lead_report_assign()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index ee9266a0235..fbc46302fd7 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -10,7 +10,7 @@
                 <search string="Leads Analysis">
                     <filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
                     <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
-                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
                     <field name="grade_id"/>
                     <field name="user_id"/>
                     <field name="partner_assigned_id"/>
@@ -69,7 +69,7 @@
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="date_assign" invisible="1"/>
-                <field name="section_id" invisible="1"/>
+                <field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
                 <field name="user_id" invisible="1"/>
                 <field name="grade_id" invisible="1" widget="selection"/>
                 <field name="partner_assigned_id" invisible="1"/>
diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py
index 4611fdd06e4..6f07a8ce03a 100644
--- a/addons/crm_partner_assign/report/crm_partner_report.py
+++ b/addons/crm_partner_assign/report/crm_partner_report.py
@@ -67,6 +67,5 @@ class crm_partner_report_assign(osv.osv):
                         on (i.partner_id=p.id and i.type in ('out_invoice','out_refund') and i.state in ('open','paid'))
             )""")
 
-crm_partner_report_assign()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index eb2c86874c4..4e7e13afb15 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -8,7 +8,7 @@
             <field name="model">crm.partner.report.assign</field>
             <field name="arch" type="xml">
                 <search string="Partner assigned Analysis">
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                     <field name="user_id"/>
                     <field name="grade_id"/>
                     <field name="activation"/>
@@ -49,7 +49,7 @@
                 <field name="date_review" invisible="1"/>
                 <field name="date_partnership" invisible="1"/>
                 <field name="period_id" invisible="1"/>
-                <field name="section_id" invisible="1"/>
+                <field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
                 <field name="user_id" invisible="1"/>
                 <field name="opp"/>
                 <field name="turnover"/>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 433a290ae81..9e70835a3f1 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -140,30 +140,31 @@
                              <field name="type"/>
                              <field name="stage_id"/>
                              <button name="stage_previous" string="Previous"
-                                 states="open,pending" type="object" icon="gtk-go-back" />
+                                    states="open,pending" type="object" icon="gtk-go-back" />
                              <button name="stage_next" string="Next"
-                                 states="open,pending" type="object"
-                                 icon="gtk-go-forward" />
+                                    states="open,pending" type="object"
+                                    icon="gtk-go-forward" />
                              <field name="section_id"
-                                 invisible="context.get('invisible_section', True)" />
+                                    invisible="context.get('invisible_section', True)"
+                                    groups="base.group_multi_salesteams"/>
                              <field name="user_id" />
                              <field name="state" />
                              <button name="case_cancel" string="Cancel"
-                                 states="draft,open,pending" type="object"
-                                 icon="gtk-cancel" />
+                                    states="draft,open,pending" type="object"
+                                    icon="gtk-cancel" />
                              <button name="case_open" string="Open"
-                                 states="draft,pending" type="object"
-                                 icon="gtk-go-forward" />
+                                    states="draft,pending" type="object"
+                                    icon="gtk-go-forward" />
                              <button name="case_close" string="Close"
-                                 states="open,draft,pending" type="object"
-                                 icon="gtk-close" />
+                                    states="open,draft,pending" type="object"
+                                    icon="gtk-close" />
                              <button string="Convert to Opportunity"
-                                 name="convert_opportunity"
-                                 states="draft,open,pending" icon="gtk-index"
-                                 type="object" attrs="{'invisible':[('type','=','opportunity')]}" />
+                                    name="convert_opportunity"
+                                    states="draft,open,pending" icon="gtk-index"
+                                    type="object" attrs="{'invisible':[('type','=','opportunity')]}" />
                              <button name="case_escalate" string="Escalate"
-                                 states="open,draft,pending" type="object"
-                                 icon="gtk-go-up" />
+                                    states="open,draft,pending" type="object"
+                                    icon="gtk-go-up" />
                          </tree>
                     </field>
                 </page>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index 81cc09d9717..724102a84b1 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -86,7 +86,7 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         if context is None:
             context = {}
         if model and model == 'crm.lead' and res_id:
-            lead = self.pool.get(model).browse(cr, uid, res_id, context=context)
+            lead = self.pool[model].browse(cr, uid, res_id, context=context)
             context['history_mode'] = history_mode
             body = self.get_record_data(cr, uid, 'crm.lead', res_id, context=context)['body']
             return {'value': {'body': body}}
@@ -105,17 +105,26 @@ class crm_lead_forward_to_partner(osv.TransientModel):
         """ Forward the lead to a partner """
         if context is None:
             context = {}
+        # TDE FIX in 7.0: force mass_mailing mode; this way, the message will be
+        # send only to partners; default subtype of mass_mailing is indeed False
+        # Chatter will show 'logged a note', but partner_ids (aka, the assigned partner)
+        # will effectively receive the message if present in the composition window
+        self.write(cr, uid, ids, {'composition_mode': 'mass_mail'}, context=context)
         res = {'type': 'ir.actions.act_window_close'}
         wizard = self.browse(cr, uid, ids[0], context=context)
         if wizard.model not in ('crm.lead'):
             return res
+        if context.get('active_ids') is None:
+            context['active_ids'] = [wizard.res_id]
 
-        lead = self.pool.get(wizard.model)
+        lead = self.pool[wizard.model]
         lead_ids = wizard.res_id and [wizard.res_id] or []
 
         if wizard.composition_mode == 'mass_mail':
             lead_ids = context and context.get('active_ids', []) or []
             value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history_mode'], context=context)
+            value.pop('composition_mode')
+            self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner.id for partner in wizard.partner_ids], context=context)
             self.write(cr, uid, ids, value, context=context)
 
         return self.send_mail(cr, uid, ids, context=context)
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 8ea08601c9a..7ae9d146bdd 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -150,7 +150,6 @@ class question(osv.osv):
         'answers_ids': fields.one2many("crm_profiling.answer","question_id","Avalaible Answers",),
         }
 
-question()
 
 
 class questionnaire(osv.osv):
@@ -166,7 +165,6 @@ class questionnaire(osv.osv):
                                 'questionnaire', 'question', "Questions"),
     }
 
-questionnaire()
 
 
 class answer(osv.osv):
@@ -176,7 +174,6 @@ class answer(osv.osv):
         "name": fields.char("Answer",size=128, required=True),
         "question_id": fields.many2one('crm_profiling.question',"Question"),
         }
-answer()
 
 
 class partner(osv.osv):
@@ -214,7 +211,6 @@ class partner(osv.osv):
             vals['category_id']=[[6, 0, _recompute_categ(self, cr, uid, ids[0], vals['answers_ids'][0][2])]]
         return super(partner, self).write(cr, uid, ids, vals, context=context)
 
-partner()
 
 
 class crm_segmentation(osv.osv):
@@ -289,7 +285,6 @@ class crm_segmentation(osv.osv):
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
         return True
 
-crm_segmentation()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 8cbe1695e82..a7325d894c5 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 17:51+0000\n"
+"PO-Revision-Date: 2013-05-30 14:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:32+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -151,7 +151,7 @@ msgstr "Используйте правила профилирования"
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You cannot create recursive profiles."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивный профиль."
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
@@ -200,7 +200,7 @@ msgstr "Сохранить данные"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py
index cb7ad220e3f..979e9809d09 100644
--- a/addons/crm_profiling/wizard/open_questionnaire.py
+++ b/addons/crm_profiling/wizard/open_questionnaire.py
@@ -31,7 +31,6 @@ class open_questionnaire_line(osv.osv_memory):
         'wizard_id': fields.many2one('open.questionnaire', 'Questionnaire'),
     }
 
-open_questionnaire_line()
 
 class open_questionnaire(osv.osv_memory):
     _name = 'open.questionnaire'
@@ -61,7 +60,7 @@ class open_questionnaire(osv.osv_memory):
             for d in data.question_ans_ids:
                  if d.answer_id:
                      answers.append(d.answer_id.id)
-            self.pool.get(model)._questionnaire_compute(cr, uid, answers, context=context)
+            self.pool[model]._questionnaire_compute(cr, uid, answers, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 
@@ -84,6 +83,5 @@ class open_questionnaire(osv.osv_memory):
             'context': context
         }
 
-open_questionnaire()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index 0b3de338808..851c2abfba4 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -52,11 +52,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
     </record>
-    <menuitem
-        id="menu_crm_todo"
-        parent="base.menu_sales"
-        action="crm_todo_action"
-        sequence="6"/>
+    <menuitem id="menu_crm_todo"
+            parent="base.menu_sales"
+            action="crm_todo_action"
+            sequence="7"/>
 
 
     </data>
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index ab0979291bd..b237f053ebb 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -63,7 +63,6 @@ class decimal_precision(osv.osv):
                     col.digits_change(cr)
         return res
 
-decimal_precision()
 
 def get_precision(application):
     def change_digit(cr):
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 15a17b36775..76750212edd 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -166,7 +166,6 @@ class delivery_carrier(osv.osv):
         self.create_grid_lines(cr, uid, [res_id], vals, context=context)
         return res_id
 
-delivery_carrier()
 
 class delivery_grid(osv.osv):
     _name = "delivery.grid"
@@ -223,7 +222,6 @@ class delivery_grid(osv.osv):
         return price
 
 
-delivery_grid()
 
 class delivery_grid_line(osv.osv):
     _name = "delivery.grid.line"
@@ -249,6 +247,5 @@ class delivery_grid_line(osv.osv):
     }
     _order = 'list_price'
 
-delivery_grid_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index e4b0ba204ac..477315dfc9b 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -32,7 +32,6 @@ class res_partner(osv.osv):
           view_load=True,
           help="This delivery method will be used when invoicing from picking."),
     }
-res_partner()
 
 
 
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 98229f13c36..1b797290632 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -51,10 +51,10 @@ class sale_order(osv.osv):
         for order in self.browse(cr, uid, ids, context=context):
             grid_id = carrier_obj.grid_get(cr, uid, [order.carrier_id.id], order.partner_shipping_id.id)
             if not grid_id:
-                raise osv.except_osv(_('No grid available !'), _('No grid matching for this carrier !'))
+                raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
 
             if not order.state in ('draft'):
-                raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
+                raise osv.except_osv(_('Order not in Draft State!'), _('The order state have to be draft to add delivery lines.'))
 
             grid = grid_obj.browse(cr, uid, grid_id, context=context)
 
@@ -76,7 +76,6 @@ class sale_order(osv.osv):
         return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
         #return {'type': 'ir.actions.act_window_close'} action reload?
 
-sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 95b17a8ba68..95e87eb45ab 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -140,7 +140,6 @@ class stock_picking(osv.osv):
         'weight_uom_id': lambda self,cr,uid,c: self._get_default_uom(cr,uid,c)
     }
 
-stock_picking()
 
 class stock_move(osv.osv):
     _inherit = 'stock.move'
@@ -184,7 +183,6 @@ class stock_move(osv.osv):
     _defaults = {
         'weight_uom_id': lambda self,cr,uid,c: self._get_default_uom(cr,uid,c)
     }
-stock_move()
 
 # Redefinition of the new fields in order to update the model stock.picking.out in the orm
 # FIXME: this is a temporary workaround because of a framework bug (ref: lp996816). It should be removed as soon as
@@ -215,7 +213,6 @@ class stock_picking_out(osv.osv):
         'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
         'number_of_packages': fields.integer('Number of Packages'),
         }
-stock_picking_out()
 
 class stock_picking_in(osv.osv):
     _inherit = 'stock.picking.in'
@@ -238,7 +235,6 @@ class stock_picking_in(osv.osv):
                 'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
                 }),
         }
-stock_picking_in()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document/document.py b/addons/document/document.py
index 9b1fdc1d66b..54f12e204fe 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -137,7 +137,7 @@ class document_file(osv.osv):
             It is a hack that will try to discover if the mentioned record is
             clearly associated with a partner record.
         """
-        obj_model = self.pool.get(res_model)
+        obj_model = self.pool[res_model]
         if obj_model._name == 'res.partner':
             return res_id
         elif 'partner_id' in obj_model._columns and obj_model._columns['partner_id']._obj == 'res.partner':
@@ -422,7 +422,6 @@ class document_directory_content(osv.osv):
         tname = ''
         if content.include_name:
             record_name = node.displayname or ''
-            # obj = node.context._dirobj.pool.get(model)
             if record_name:
                 tname = (content.prefix or '') + record_name + (content.suffix or '') + (content.extension or '')
         else:
@@ -1296,9 +1295,9 @@ class node_res_dir(node_class):
             Note that many objects use NULL for a name, so we should
             better call the name_search(),name_get() set of methods
         """
-        obj = self.context._dirobj.pool.get(self.res_model)
-        if not obj:
+        if self.res_model not in self.context._dirobj.pool:
             return []
+        obj = self.context._dirobj.pool[self.res_model]
         dirobj = self.context._dirobj
         uid = self.context.uid
         ctx = self.context.context.copy()
@@ -1333,7 +1332,7 @@ class node_res_dir(node_class):
         if self.ressource_tree:
             object2 = False
             if self.resm_id:
-                object2 = dirobj.pool.get(self.res_model).browse(cr, uid, self.resm_id) or False
+                object2 = dirobj.pool[self.res_model].browse(cr, uid, self.resm_id) or False
             if obj._parent_name in obj.fields_get(cr, uid):
                 where.append((obj._parent_name,'=',object2 and object2.id or False))
 
@@ -1504,7 +1503,7 @@ class node_res_obj(node_class):
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
         directory = dirobj.browse(cr, uid, self.dir_id)
-        obj = dirobj.pool.get(self.res_model)
+        obj = dirobj.pool[self.res_model]
         where = []
         res = []
         if name:
@@ -1590,7 +1589,7 @@ class node_res_obj(node_class):
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
-        res_obj = dirobj.pool.get(self.res_model)
+        res_obj = dirobj.pool[self.res_model]
 
         object2 = res_obj.browse(cr, uid, self.res_id) or False
 
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
old mode 100644
new mode 100755
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index aec7f9b75a4..c846f288112 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -109,6 +109,5 @@ class document_configuration(osv.osv_memory):
                 'domain': '[]',
                 'ressource_tree': 1
         })
-document_configuration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index ceb7d1a60e5..ee8f897ca20 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -60,6 +60,5 @@ class document_ftp_browse(osv.osv_memory):
         'target': 'new'
         }
 
-document_ftp_browse()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 87aaa2331b4..1dee9495a95 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -47,6 +47,5 @@ class document_ftp_configuration(osv.osv_memory):
         self.pool.get('ir.actions.act_url').write(cr, uid, [aid], 
                 {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/' + cr.dbname+'/'})
 
-document_ftp_configuration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 08c77647d17..4d0b5596e75 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -26,6 +26,7 @@
                 <tree string="Document Page">
                     <field name="name"/>
                     <field name="parent_id"/>
+                    <field name="create_uid" invisible="1"/>
                     <field name="write_uid"/>
                     <field name="write_date"/>
                 </tree>
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index ec112ec7c38..befb87829ed 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -24,7 +24,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index 5e819e01754..9a35f3cfe1b 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -67,7 +67,7 @@ class node_acl_mixin(object):
         """
         ret = par_class.get_dav_props(self, cr)
         if prop_model:
-            propobj = self.context._dirobj.pool.get(prop_model)
+            propobj = self.context._dirobj.pool[prop_model]
             uid = self.context.uid
             ctx = self.context.context.copy()
             ctx.update(self.dctx)
@@ -105,7 +105,7 @@ class node_acl_mixin(object):
         if ret is not None:
             return ret
         if prop_model:
-            propobj = self.context._dirobj.pool.get(prop_model)
+            propobj = self.context._dirobj.pool[prop_model]
             uid = self.context.uid
             ctx = self.context.context.copy()
             ctx.update(self.dctx)
@@ -151,7 +151,7 @@ class node_acl_mixin(object):
         assert prop_model
         assert res_id
         assert isinstance(lock_data, dict), '%r' % lock_data
-        propobj = self.context._dirobj.pool.get(prop_model)
+        propobj = self.context._dirobj.pool[prop_model]
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
diff --git a/addons/document_webdav/test/webdav_test1.yml b/addons/document_webdav/test/webdav_test1.yml
index 82236f63846..ae91d7cd4a8 100644
--- a/addons/document_webdav/test/webdav_test1.yml
+++ b/addons/document_webdav/test/webdav_test1.yml
@@ -47,10 +47,9 @@
 -
     !python {model: ir.attachment}: |
         from document_webdav import test_davclient as te
-        import addons
         dc = te.DAVClient()
         dc.get_creds(self, cr, uid)
-        tdp = addons.get_module_resource('document_webdav', 'test_davclient.py')
+        tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py')
         res = dc.gd_put(path=cr.dbname+'/Documents/test_davclient.py', srcpath=tdp)
 -
     I will try to get the file from the root
@@ -60,5 +59,5 @@
         import addons
         dc = te.DAVClient()
         dc.get_creds(self, cr, uid)
-        tdp = addons.get_module_resource('document_webdav', 'test_davclient.py')
+        tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py')
         res = dc.gd_get(path=cr.dbname+'/Documents/test_davclient.py', crange=(4,508), compare=tdp)
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 058dc1c748d..f3a8b35b582 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 #
 # Copyright P. Christeas <p_christ@hol.gr> 2008,2009
@@ -24,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 """ A trivial HTTP/WebDAV client, used for testing the server
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 1804b9bfdb2..e495f5c9f2f 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -30,7 +30,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ###############################################################################
 
 
@@ -608,7 +608,7 @@ try:
             if base_path and base_path == '/':
                 dir_path = config.get_misc('static-http', 'dir_path', False)
             else:
-                dir_path = openerp.addons.get_module_resource('document_webdav','public_html')
+                dir_path = openerp.modules.module.get_module_resource('document_webdav','public_html')
                 # an _ugly_ hack: we put that dir back in tools.config.misc, so that
                 # the StaticHttpHandler can find its dir_path.
                 config.misc.setdefault('static-http',{})['dir_path'] = dir_path
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
index d75c416a93e..dbf6bc8fbcc 100644
--- a/addons/document_webdav/webdav_setup.xml
+++ b/addons/document_webdav/webdav_setup.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <openerp>
 <data noupdate="1">
 <!--This file contains a typical setup of a WebDAV folders' structure, 
@@ -25,7 +24,7 @@
             <field eval="0" name="ressource_tree"/>
             <field name="user_id" eval="False"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">groups</field>
@@ -36,7 +35,7 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">resources</field>
@@ -48,7 +47,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -61,7 +60,7 @@
             <field name="user_id" eval="False"/>
             <field name="resource_field" ref="base.field_res_users_login"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">ressource</field>
             <field name="ressource_type_id" ref="base.model_res_users"/>
             <field eval="[(6,0,[])]" name="group_ids"/>
@@ -72,7 +71,7 @@
             <field eval="1" name="resource_find_all"/>
             <field eval="0" name="ressource_tree"/>
             <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_principals0"/>
+            <field name="parent_id" ref="document_directory_principals0"/>
             <field name="type">directory</field>
             <field eval="[(6,0,[])]" name="group_ids"/>
             <field name="name">locations</field>
@@ -91,4 +90,4 @@
         </record>
 
 </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/edi/i18n/lt.po b/addons/edi/i18n/lt.po
new file mode 100644
index 00000000000..4c00a1dc6d6
--- /dev/null
+++ b/addons/edi/i18n/lt.po
@@ -0,0 +1,87 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:60
+#, python-format
+msgid "The document has been successfully imported!"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:65
+#, python-format
+msgid "Sorry, the document could not be imported."
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr ""
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:71
+#, python-format
+msgid "Document Import Notification"
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:130
+#, python-format
+msgid "Missing application."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:131
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: code:addons/edi/models/edi.py:47
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr ""
diff --git a/addons/edi/i18n/nl_BE.po b/addons/edi/i18n/nl_BE.po
index f5fc80a6fcc..aa96f26d13b 100644
--- a/addons/edi/i18n/nl_BE.po
+++ b/addons/edi/i18n/nl_BE.po
@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-02 08:10+0000\n"
+"PO-Revision-Date: 2013-04-15 16:04+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Reden:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "Het document is met succes geïmporteerd"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Sorry, het document kan niet worden geïmporteerd"
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_company
@@ -53,13 +53,13 @@ msgstr "Munt"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Documentimportbericht"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Ontbrekend programma"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -87,7 +87,7 @@ msgstr "Relatie"
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI-subsysteem"
 
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "De munt moet uniek zijn per firma."
diff --git a/addons/edi/i18n/ru.po b/addons/edi/i18n/ru.po
index dad4bf0dcda..3ac2689bc57 100644
--- a/addons/edi/i18n/ru.po
+++ b/addons/edi/i18n/ru.po
@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-09-10 15:12+0000\n"
+"PO-Revision-Date: 2013-05-30 13:32+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Причина:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "Документ был успешно импортирован!"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Извините, документ не может быть импортирован."
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_company
@@ -53,13 +53,13 @@ msgstr "Валюта"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Уведомление об импорте документа"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Отсутствующее приложение."
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -69,12 +69,15 @@ msgid ""
 "You can install it by connecting as the administrator and opening the "
 "configuration assistant."
 msgstr ""
+"Документу, который вы пытаетесь импортировать, необходимо OpenERP приложение "
+"'%s'. Вы можете установить его, выполнив вход под администратором и открыв "
+"настройки."
 
 #. module: edi
 #: code:addons/edi/models/edi.py:47
 #, python-format
 msgid "'%s' is an invalid external ID"
-msgstr ""
+msgstr "'%s' это неверный внешний идентификатор"
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_partner
@@ -84,7 +87,7 @@ msgstr "Контрагент"
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "Подсистема электронного документооборота"
 
 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "Код валюты должен быть уникальным в компании!"
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index 239b543e194..1b9e0c4df08 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -106,8 +106,8 @@ class edi(osv.AbstractModel):
         """
         edi_list = []
         for record in records:
-            record_model_obj = self.pool.get(record._name)
-            edi_list += record_model_obj.edi_export(cr, uid, [record], context=context)
+            record_model = record._model
+            edi_list += record_model.edi_export(cr, uid, [record], context=context)
         return self.serialize(edi_list)
 
     def load_edi(self, cr, uid, edi_documents, context=None):
@@ -126,14 +126,14 @@ class edi(osv.AbstractModel):
             module = edi_document.get('__import_module') or edi_document.get('__module')
             assert module, 'a `__module` or `__import_module` attribute is required in each EDI document.'
             if module != 'base' and not ir_module.search(cr, uid, [('name','=',module),('state','=','installed')]):
-                raise osv.except_osv(_('Missing application.'),
+                raise osv.except_osv(_('Missing Application.'),
                             _("The document you are trying to import requires the OpenERP `%s` application. "
                               "You can install it by connecting as the administrator and opening the configuration assistant.")%(module,))
             model = edi_document.get('__import_model') or edi_document.get('__model')
             assert model, 'a `__model` or `__import_model` attribute is required in each EDI document.'
-            model_obj = self.pool.get(model)
-            assert model_obj, 'model `%s` cannot be found, despite module `%s` being available - '\
+            assert model in self.pool, 'model `%s` cannot be found, despite module `%s` being available - '\
                               'this EDI document seems invalid or unsupported.' % (model,module)
+            model_obj = self.pool[model]
             record_id = model_obj.edi_import(cr, uid, edi_document, context=context)
             record_action = model_obj._edi_record_display_action(cr, uid, record_id, context=context)
             res.append((model, record_id, record_action))
@@ -400,7 +400,7 @@ class EDIMixin(object):
         return results
 
     def _edi_get_object_by_name(self, cr, uid, name, model_name, context=None):
-        model = self.pool.get(model_name)
+        model = self.pool[model_name]
         search_results = model.name_search(cr, uid, name, operator='=', context=context)
         if len(search_results) == 1:
             return model.browse(cr, uid, search_results[0][0], context=context)
@@ -483,7 +483,7 @@ class EDIMixin(object):
                                                   ('name','=',ext_id),
                                                   ('module','in',modules)])
         if data_ids:
-            model = self.pool.get(model)
+            model = self.pool[model]
             data = ir_model_data.browse(cr, uid, data_ids[0], context=context)
             if model.exists(cr, uid, [data.res_id]):
                 return model.browse(cr, uid, data.res_id, context=context)
@@ -519,7 +519,7 @@ class EDIMixin(object):
             _logger.debug("%s: Importing EDI relationship [%r,%r] - name not found, creating it.",
                           self._name, external_id, value)
             # also need_new_ext_id here, but already been set above
-            model = self.pool.get(model)
+            model = self.pool[model]
             res_id, _ = model.name_create(cr, uid, value, context=context)
             target = model.browse(cr, uid, res_id, context=context)
         else:
@@ -592,7 +592,7 @@ class EDIMixin(object):
         # process o2m values, connecting them to their parent on-the-fly
         for o2m_field, o2m_value in o2m_todo.iteritems():
             field = self._all_columns[o2m_field].column
-            dest_model = self.pool.get(field._obj)
+            dest_model = self.pool[field._obj]
             for o2m_line in o2m_value:
                 # link to parent record: expects an (ext_id, name) pair
                 o2m_line[field._fields_id] = (ext_id_members['full'], record_display[1])
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index ed76b69901c..2a7990e301b 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -89,7 +89,7 @@ class email_template(osv.osv):
             template = tools.ustr(template)
             record = None
             if res_id:
-                record = self.pool.get(model).browse(cr, uid, res_id, context=context)
+                record = self.pool[model].browse(cr, uid, res_id, context=context)
             user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             variables = {
                 'object': record,
@@ -297,8 +297,7 @@ class email_template(osv.osv):
                         'copyvalue': self.build_expression(field_value.name, False, null_value or False),
                         'null_value': null_value or False
                         })
-        return {'value':result}
-
+        return {'value': result}
 
     def generate_email(self, cr, uid, template_id, res_id, context=None):
         """Generates an email from the template for given (model, res_id) pair.
@@ -350,14 +349,16 @@ class email_template(osv.osv):
                 report_name += ext
             attachments.append((report_name, result))
 
+        attachment_ids = []
         # Add template attachments
         for attach in template.attachment_ids:
-            attachments.append((attach.datas_fname, attach.datas))
+            attachment_ids.append(attach.id)
 
         values['attachments'] = attachments
+        values['attachment_ids'] = attachment_ids
         return values
 
-    def send_mail(self, cr, uid, template_id, res_id, force_send=False, context=None):
+    def send_mail(self, cr, uid, template_id, res_id, force_send=False, raise_exception=False, context=None):
         """Generates a new mail message for the given template and record,
            and schedules it for delivery through the ``mail`` module's scheduler.
 
@@ -369,30 +370,37 @@ class email_template(osv.osv):
                 was executed for this message only.
            :returns: id of the mail.message that was created
         """
-        if context is None: context = {}
+        if context is None:
+            context = {}
         mail_mail = self.pool.get('mail.mail')
         ir_attachment = self.pool.get('ir.attachment')
+
+        # create a mail_mail based on values, without attachments
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
-        assert 'email_from' in values, 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
-        attachments = values.pop('attachments') or {}
-        del values['partner_to'] # TODO Properly use them.
+        assert values.get('email_from'), 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
+        del values['partner_to']  # TODO Properly use them.
+        attachment_ids = values.pop('attachment_ids', [])
+        attachments = values.pop('attachments', [])
         msg_id = mail_mail.create(cr, uid, values, context=context)
-        # link attachments
-        attachment_ids = []
-        for fname, fcontent in attachments.iteritems():
+        mail = mail_mail.browse(cr, uid, msg_id, context=context)
+
+        # manage attachments
+        for attachment in attachments:
             attachment_data = {
-                    'name': fname,
-                    'datas_fname': fname,
-                    'datas': fcontent,
-                    'res_model': mail_mail._name,
-                    'res_id': msg_id,
+                    'name': attachment[0],
+                    'datas_fname': attachment[0],
+                    'datas': attachment[1],
+                    'res_model': 'mail.message',
+                    'res_id': mail.mail_message_id.id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
         if attachment_ids:
+            values['attachment_ids'] = [(6, 0, attachment_ids)]
             mail_mail.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
+
         if force_send:
-            mail_mail.send(cr, uid, [msg_id], context=context)
+            mail_mail.send(cr, uid, [msg_id], raise_exception=raise_exception, context=context)
         return msg_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
old mode 100644
new mode 100755
diff --git a/addons/email_template/i18n/lt.po b/addons/email_template/i18n/lt.po
new file mode 100644
index 00000000000..20c2c5e0e5d
--- /dev/null
+++ b/addons/email_template/i18n/lt.po
@@ -0,0 +1,488 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr ""
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To (Emails)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove context action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:244
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as new template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Value Builder"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display an option on related documents to open a composition wizard with "
+"this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Preview of"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Using sample document"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Remove the contextual action to use this template on related documents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Placeholder Expression"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add context action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_id:0
+#: help:email_template.preview,model_id:0
+msgid "The kind of document with with this template can be used"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_recipients:0
+#: field:email_template.preview,email_recipients:0
+msgid "To (Partners)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addressing"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_recipients:0
+#: help:email_template.preview,email_recipients:0
+msgid ""
+"Comma-separated ids of recipient partners (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:231
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Applies to"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:196
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:231
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Default Value"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Contents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/email_template/i18n/nl_BE.po b/addons/email_template/i18n/nl_BE.po
new file mode 100644
index 00000000000..5e7ddeec587
--- /dev/null
+++ b/addons/email_template/i18n/nl_BE.po
@@ -0,0 +1,489 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-26 16:28+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-27 05:44+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "Van"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "Sjabloon"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr ""
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "Uitschrijven"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To (Emails)"
+msgstr "Naar (E-mails)"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "Uitgaande mailserver"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "Veld"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr ""
+"Adres van de afzender (variabele aanduidingen kunnen hier worden gebruikt)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove context action"
+msgstr "Contextactie verwijderen"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use template"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Body"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:244
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as new template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Value Builder"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display an option on related documents to open a composition wizard with "
+"this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Preview of"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Using sample document"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Remove the contextual action to use this template on related documents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Placeholder Expression"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add context action"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,model_id:0
+#: help:email_template.preview,model_id:0
+msgid "The kind of document with with this template can be used"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_recipients:0
+#: field:email_template.preview,email_recipients:0
+msgid "To (Partners)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addressing"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,email_recipients:0
+#: help:email_template.preview,email_recipients:0
+msgid ""
+"Comma-separated ids of recipient partners (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:231
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Applies to"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:196
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:231
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Default Value"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Contents"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr ""
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index e12ebd076cc..b16433fddd5 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-25 12:16+0000\n"
-"Last-Translator: Olga <chikiro.spam@gmail.com>\n"
+"PO-Revision-Date: 2013-06-05 07:10+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:42+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -37,7 +37,7 @@ msgstr "Кнопка боковой панели для открытия дей
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Без уведомлений"
 
 #. module: email_template
 #: field:email.template,email_to:0
@@ -254,7 +254,7 @@ msgstr "Просмотр"
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Using sample document"
-msgstr ""
+msgstr "Используя образец документа"
 
 #. module: email_template
 #: view:email.template:0
@@ -510,7 +510,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Contents"
-msgstr ""
+msgstr "Содержимое"
 
 #. module: email_template
 #: field:email.template,subject:0
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 56abe6a0fef..d5feea9ebc4 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -48,8 +48,8 @@ class test_message_compose(TestMailBase):
         _body_html1 = 'Fans of Pigs, unite !'
         _body_html2 = 'I am angry !'
         _attachments = [
-            {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
-            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}
+            {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment'), 'res_model': 'res.partner', 'res_id': self.partner_admin_id},
+            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment'), 'res_model': 'res.partner', 'res_id': self.partner_admin_id},
             ]
         _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
 
@@ -115,12 +115,20 @@ class test_message_compose(TestMailBase):
         self.assertEqual(compose.subject, _subject1, 'mail.compose.message subject incorrect')
         self.assertIn(_body_html1, compose.body, 'mail.compose.message body incorrect')
         self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
-        # Test: mail.compose.message: attachments
-        # Test: mail.message: attachments
+        # Test: mail.compose.message: attachments (owner has not been modified)
         for attach in compose.attachment_ids:
-            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
-            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
-            self.assertIn((attach.name, base64.b64decode(attach.datas)), _attachments_test,
+            self.assertEqual(attach.res_model, 'res.partner', 'mail.compose.message attachment res_model through templat was overriden')
+            self.assertEqual(attach.res_id, self.partner_admin_id, 'mail.compose.message attachment res_id incorrect')
+            self.assertIn((attach.datas_fname, base64.b64decode(attach.datas)), _attachments_test,
+                'mail.message attachment name / data incorrect')
+        # Test: mail.message: attachments
+        mail_compose.send_mail(cr, uid, [compose_id])
+        group_pigs.refresh()
+        message_pigs = group_pigs.message_ids[0]
+        for attach in message_pigs.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.compose.message attachment res_model through templat was overriden')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.compose.message attachment res_id incorrect')
+            self.assertIn((attach.datas_fname, base64.b64decode(attach.datas)), _attachments_test,
                 'mail.message attachment name / data incorrect')
 
         # ----------------------------------------
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index c6518122d02..5fee415a75e 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -40,7 +40,7 @@ class email_template_preview(osv.osv_memory):
         email_template = self.pool.get('email.template')
         template = email_template.browse(cr, uid, int(template_id), context=context)
         template_object = template.model_id
-        model =  self.pool.get(template_object.model)
+        model =  self.pool[template_object.model]
         record_ids = model.search(cr, uid, [], 0, 10, 'id', context=context)
         default_id = context.get('default_res_id')
 
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index f3b03d16a2f..7f44828ce15 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -49,26 +49,44 @@ class mail_compose_message(osv.TransientModel):
             help="Carbon copy recipients (placeholders may be used here)"),
     }
 
+    def send_mail(self, cr, uid, ids, context=None):
+        """ Override of send_mail to duplicate attachments linked to the email.template.
+            Indeed, basic mail.compose.message wizard duplicates attachments in mass
+            mailing mode. But in 'single post' mode, attachments of an email template
+            also have to be duplicated to avoid changing their ownership. """
+        for wizard in self.browse(cr, uid, ids, context=context):
+            if not wizard.attachment_ids or wizard.composition_mode == 'mass_mail' or not wizard.template_id:
+                continue
+            template = self.pool.get('email.template').browse(cr, uid, wizard.template_id.id, context=context)
+            new_attachment_ids = []
+            for attachment in wizard.attachment_ids:
+                if attachment in template.attachment_ids:
+                    new_attachment_ids.append(self.pool.get('ir.attachment').copy(cr, uid, attachment.id, {'res_model': 'mail.compose.message', 'res_id': wizard.id}, context=context))
+                else:
+                    new_attachment_ids.append(attachment.id)
+                self.write(cr, uid, wizard.id, {'attachment_ids': [(6, 0, new_attachment_ids)]}, context=context)
+        return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
+
     def onchange_template_id(self, cr, uid, ids, template_id, composition_mode, model, res_id, context=None):
         """ - mass_mailing: we cannot render, so return the template values
             - normal mode: return rendered values """
         if template_id and composition_mode == 'mass_mail':
-            fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to']
+            fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc', 'reply_to', 'attachment_ids']
             template_values = self.pool.get('email.template').read(cr, uid, template_id, fields, context)
             values = dict((field, template_values[field]) for field in fields if template_values.get(field))
         elif template_id:
-            # FIXME odo: change the mail generation to avoid attachment duplication
             values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
-            # transform attachments into attachment_ids
-            values['attachment_ids'] = []
+            # transform attachments into attachment_ids; not attached to the document because this will
+            # be done further in the posting process, allowing to clean database if email not send
+            values['attachment_ids'] = values.pop('attachment_ids', [])
             ir_attach_obj = self.pool.get('ir.attachment')
             for attach_fname, attach_datas in values.pop('attachments', []):
                 data_attach = {
                     'name': attach_fname,
                     'datas': attach_datas,
                     'datas_fname': attach_fname,
-                    'res_model': model,
-                    'res_id': res_id,
+                    'res_model': 'mail.compose.message',
+                    'res_id': 0,
                     'type': 'binary',  # override default_type from context, possibly meant for another model!
                 }
                 values['attachment_ids'].append(ir_attach_obj.create(cr, uid, data_attach, context=context))
@@ -128,7 +146,7 @@ class mail_compose_message(osv.TransientModel):
             mail.compose.message, transform email_cc and email_to into partner_ids """
         template_values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
         # filter template values
-        fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to', 'attachments']
+        fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to', 'attachment_ids', 'attachments']
         values = dict((field, template_values[field]) for field in fields if template_values.get(field))
         values['body'] = values.pop('body_html', '')
 
@@ -145,9 +163,11 @@ class mail_compose_message(osv.TransientModel):
         """ Override to handle templates. """
         # generate the composer email
         if wizard.template_id:
-            values = self.generate_email_for_composer(cr, uid, wizard.template_id, res_id, context=context)
+            values = self.generate_email_for_composer(cr, uid, wizard.template_id.id, res_id, context=context)
         else:
             values = {}
+        # remove attachments as they should not be rendered
+        values.pop('attachment_ids', None)
         # get values to return
         email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
         # those values are not managed; they are readonly
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 46ed49e6627..3cb83896ca2 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -28,7 +28,7 @@
                         <div>Use template
                             <!--FIX: To avoid css issue of many2one field in footer temporary used oe_form (BUG:1152464)-->
                             <field name="template_id" nolabel="1" class='oe_inline'
-                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id','=',context.get('default_model'))]"/>
+                                on_change="onchange_template_id(template_id, composition_mode, model, res_id, context)" domain="[('model_id.model','=',model)]"/>
                         </div>
                         <button icon="/email_template/static/src/img/email_template_save.png"
                             type="object" name="save_as_template" string="Save as new template" class="oe_link"
diff --git a/addons/event/event.py b/addons/event/event.py
index 9e50128c592..eb18afd747c 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -41,7 +41,6 @@ class event_type(osv.osv):
         'default_registration_max': 0,
     }
 
-event_type()
 
 class event_event(osv.osv):
     """Event"""
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8efae21f676..4f5e33eeafd 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -6,7 +6,7 @@
             <field name="res_model">event.registration</field>
             <field name="view_type">form</field>
             <field name="name">Registrations</field>
-            <field name="view_mode">calendar,tree,form,graph</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
         </record>
 
@@ -93,6 +93,7 @@
                                    </div>
                             </group>
                             <group>
+                                <field name="user_id"/>
                                 <field name="type" on_change="onchange_event_type(type,context)" />
                                 <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
                                 <field name="date_end"/>
@@ -100,19 +101,13 @@
                             </group>
                         </group>
                         <notebook>
-                            <page string="Email Configuration" groups="base.group_no_one">
-                                <group>
+                            <page string="Event Details" groups="base.group_no_one">
+                                <group colspan="4">
                                     <field name="reply_to"/>
-                                    <group>
-                                        <field name="email_registration_id"/>
-                                    </group>
-                                    <group>
-                                        <field name="email_confirmation_id"/>
-                                    </group>
+                                    <field name="email_registration_id"/>
+                                    <field name="email_confirmation_id"/>
                                 </group>
-                            </page>
-                            <page string="Event Description">
-                                <field name="note" colspan="4" nolabel="1"/>
+                                <field name="note" nolabel="1" placeholder="Event Description..."/>
                             </page>
                             <page string="Registrations">
                                 <group>
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 481b86f032c..0e33e892432 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -99,6 +99,5 @@ class report_event_registration(osv.osv):
         )
         """)
 
-report_event_registration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
index 88249c5a7cd..fc4afa56e69 100644
--- a/addons/event/res_partner.py
+++ b/addons/event/res_partner.py
@@ -31,6 +31,5 @@ class res_partner(osv.osv):
     }
     
 
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
index 8611a066801..5fb2cd67c87 100644
--- a/addons/event/wizard/event_confirm.py
+++ b/addons/event/wizard/event_confirm.py
@@ -32,6 +32,5 @@ class event_confirm(osv.osv_memory):
         self.pool.get('event.event').do_confirm(cr, uid, context.get('event_ids', []), context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-event_confirm()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py
index 5c7373d1adb..44d2de4bdd5 100644
--- a/addons/event_moodle/event_moodle.py
+++ b/addons/event_moodle/event_moodle.py
@@ -150,7 +150,6 @@ class event_moodle(osv.osv):
             name_user = "moodle_" + "%d" % (response_courses,) + "%d" % (random.randint(1,999999),)
         return name_user
 
-event_moodle()
 
 class event_event(osv.osv):
     _inherit = "event.event"
@@ -221,7 +220,6 @@ class event_event(osv.osv):
             moodle_pool.moodle_enrolled(cr, uid, moodle_config_wiz_id, enrolled, context=context)
         return res
 
-event_event()
 
 class event_registration(osv.osv):
 
@@ -286,4 +284,3 @@ class event_registration(osv.osv):
                     'city': reg.city,
                     'street': reg.street}}
         return res
-event_registration()
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 4f32620e667..8bacd37fc15 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -32,7 +32,6 @@ class product(osv.osv):
     def onchange_event_ok(self, cr, uid, ids, event_ok, context=None):
         return {'value': {'type': event_ok and 'service' or False}}
 
-product()
 
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
@@ -71,6 +70,8 @@ class sale_order_line(osv.osv):
         '''
         create registration with sales order
         '''
+        if context is None:
+            context = {}
         registration_obj = self.pool.get('event.registration')
         sale_obj = self.pool.get('sale.order')
         for order_line in self.browse(cr, uid, ids, context=context):
@@ -84,7 +85,8 @@ class sale_order_line(osv.osv):
                     'origin': order_line.order_id.name,
                     'event_id': order_line.event_id.id,
                 }
+                message = _("The registration has been created for event <i>%s</i> from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name)
+                context.update({'mail_create_nolog': True})
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
-                message = _("The registration %s has been created from the Sales Order %s.") % (registration_id, order_line.order_id.name)
                 registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 397ca893bae..cce1f77856e 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -89,7 +89,6 @@ class fetchmail_server(osv.osv):
         'script': '/mail/static/scripts/openerp_mailgate.py',
     }
 
-
     def onchange_server_type(self, cr, uid, ids, server_type=False, ssl=False, object_id=False):
         port = 0
         values = {}
@@ -175,13 +174,14 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
 
     def _fetch_mails(self, cr, uid, ids=False, context=None):
         if not ids:
-            ids = self.search(cr, uid, [('state','=','done')])
+            ids = self.search(cr, uid, [('state','=','done'),('type','in',['pop','imap'])])
         return self.fetch_mail(cr, uid, ids, context=context)
 
     def fetch_mail(self, cr, uid, ids, context=None):
         """WARNING: meant for cron usage only - will commit() after each email!"""
         if context is None:
             context = {}
+        context['fetchmail_cron_running'] = True
         mail_thread = self.pool.get('mail.thread')
         action_pool = self.pool.get('ir.actions.server')
         for server in self.browse(cr, uid, ids, context=context):
@@ -240,6 +240,29 @@ openerp_mailgate: "|/path/to/openerp-mailgate.py --host=localhost -u %(uid)d -p
             server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)})
         return True
 
+    def cron_update(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        if not context.get('fetchmail_cron_running'):
+            # Enabled/Disable cron based on the number of 'done' server of type pop or imap
+            ids = self.search(cr, uid, [('state','=','done'),('type','in',['pop','imap'])])
+            try:
+                cron_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fetchmail', 'ir_cron_mail_gateway_action')[1]
+                self.pool.get('ir.cron').write(cr, 1, [cron_id], {'active': bool(ids)})
+            except ValueError:
+                # Nevermind if default cron cannot be found
+                pass
+
+    def create(self, cr, uid, values, context=None):
+        res = super(fetchmail_server, self).create(cr, uid, values, context=context)
+        self.cron_update(cr, uid, context=context)
+        return res
+
+    def write(self, cr, uid, ids, values, context=None):
+        res = super(fetchmail_server, self).write(cr, uid, ids, values, context=context)
+        self.cron_update(cr, uid, context=context)
+        return res
+
 class mail_mail(osv.osv):
     _inherit = "mail.mail"
     _columns = {
diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml
index d77aadc12de..3f6592b340f 100644
--- a/addons/fetchmail/fetchmail_data.xml
+++ b/addons/fetchmail/fetchmail_data.xml
@@ -10,6 +10,8 @@
             <field name="model">fetchmail.server</field>
             <field name="function">_fetch_mails</field>
             <field name="args">()</field>
+            <!-- Active flag is set on fetchmail_server.create/write -->
+            <field name="active" eval="False"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 4e653adce28..5ee17c61b6f 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -97,15 +97,17 @@
         <record id="inherit_view_general_configuration" model="ir.ui.view">
             <field name="name">General Settings</field>
             <field name="model">base.config.settings</field>
-              <field name="inherit_id" ref="base_setup.view_general_configuration"/>
-              <field name="arch" type="xml">
-                  <div name="email" position="inside">
-                      <button type="action"
-                            name="%(action_email_server_tree)d"
-                            string="Configure the incoming email gateway" class="oe_link"/>
-                  </div>
-              </field>
-      </record>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <div name="email.outgoing_server" position="after">
+                    <div name="email.incoming_server">
+                        <button type="action"
+                                name="%(action_email_server_tree)d"
+                                string="Configure the incoming email gateway" class="oe_link"/>
+                    </div>
+                </div>
+            </field>
+        </record>
 
 
         <menuitem
diff --git a/addons/fetchmail/security/ir.model.access.csv b/addons/fetchmail/security/ir.model.access.csv
index 7deea6eb9f4..c006546659f 100644
--- a/addons/fetchmail/security/ir.model.access.csv
+++ b/addons/fetchmail/security/ir.model.access.csv
@@ -1,3 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_fetchmail_server,fetchmail.server,model_fetchmail_server,,1,0,0,0
 access_fetchmail_server,fetchmail.server,model_fetchmail_server,base.group_system,1,1,1,1
diff --git a/addons/fleet/i18n/de.po b/addons/fleet/i18n/de.po
index f9f0523056e..b47b8ba2074 100644
--- a/addons/fleet/i18n/de.po
+++ b/addons/fleet/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-01-06 11:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-06-03 05:25+0000\n"
+"Last-Translator: Armin GREGOR <armin.gregor@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -35,7 +35,7 @@ msgstr "Ersatz Kälteklimakompressor"
 #. module: fleet
 #: help:fleet.vehicle,vin_sn:0
 msgid "Unique number written on the vehicle motor (VIN/SN number)"
-msgstr "Eindeutige Fahrzeug-Identifizierungsnummer (FIN)"
+msgstr "Fahrgestellnummer"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
@@ -157,7 +157,7 @@ msgstr "Batterie Inspektion"
 #. module: fleet
 #: field:fleet.vehicle,company_id:0
 msgid "Company"
-msgstr "Unternehmen"
+msgstr "Firma"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -324,7 +324,7 @@ msgstr "Ersatz Luftfilter"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_tag
 msgid "fleet.vehicle.tag"
-msgstr ""
+msgstr "fleet.vehicle.tag"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -339,7 +339,7 @@ msgstr "Bezeichnung des zu erneuernden Vertrags"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
 msgid "Senior"
-msgstr ""
+msgstr "Senior"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,state:0
@@ -490,6 +490,8 @@ msgid ""
 "$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
 "$(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: fleet
 #: view:board.board:0
@@ -737,7 +739,7 @@ msgstr "Aktueller Fahrzeugzustand"
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Manual"
-msgstr "Betriebsanleitung"
+msgstr "Handbuch"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_52
@@ -917,7 +919,7 @@ msgstr "Kaufdatum des Fahrzeugs"
 #. module: fleet
 #: view:fleet.vehicle.model:0
 msgid "Models"
-msgstr "Modell"
+msgstr "Modelle"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -1055,7 +1057,7 @@ msgstr "Kraftstoffart"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_22
 msgid "Fuel Injector Replacement"
-msgstr "Ersatz Einfüllstutzen"
+msgstr "Ersatz Einspritzdüse"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
@@ -1101,7 +1103,7 @@ msgstr "Datum Vertragsbeginn"
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Electric"
-msgstr "Elektrisch"
+msgstr "Elektrik"
 
 #. module: fleet
 #: field:fleet.vehicle,tag_ids:0
@@ -1174,7 +1176,7 @@ msgstr "Ersatz Lichtmaschine"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_3
 msgid "A/C Diagnosis"
-msgstr "Diagnose Batterie"
+msgstr "Diagnose Klimaanlage"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_23
@@ -1199,7 +1201,7 @@ msgstr "Ersatz Wärmepumpe"
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show all the costs for this vehicle"
-msgstr "gesamte Kostenübersicht der Fahrzeuge"
+msgstr "gesamte Kostenübersicht des Fahrzeugs"
 
 #. module: fleet
 #: view:fleet.vehicle.odometer:0
@@ -1534,7 +1536,7 @@ msgstr "Achsvermessung"
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
 msgid "Purchased"
-msgstr "Ersatzteil"
+msgstr "Eingekauft"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
@@ -1747,7 +1749,7 @@ msgstr "Preis"
 #: field:fleet.vehicle.cost,odometer:0
 #: field:fleet.vehicle.odometer,value:0
 msgid "Odometer Value"
-msgstr "Tachostand"
+msgstr "Kilometerstand"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1805,7 +1807,7 @@ msgstr "Schreiben Sie hier alle erforderlichen Zusatzinformationen auf."
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_29
 msgid "Ignition Coil Replacement"
-msgstr "Ersatz Zündkerzen"
+msgstr "Ersatz Zündspule"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_16
@@ -1815,7 +1817,7 @@ msgstr "Optionen"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_contract_repairing
 msgid "Repairing"
-msgstr "Reparieren"
+msgstr "Wird repariert"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
@@ -1853,7 +1855,7 @@ msgstr "Getriebe"
 #. module: fleet
 #: field:fleet.vehicle,vin_sn:0
 msgid "Chassis Number"
-msgstr "Fahrzeuqinformationsnummer"
+msgstr "Fahrgestellnummer"
 
 #. module: fleet
 #: help:fleet.vehicle,color:0
@@ -2009,7 +2011,7 @@ msgstr "Reifenwechsel"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_42
 msgid "Starter Replacement"
-msgstr "Erstinspektion"
+msgstr "Ersatz Anlasser"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
diff --git a/addons/fleet/i18n/hu.po b/addons/fleet/i18n/hu.po
new file mode 100644
index 00000000000..eca6519a11b
--- /dev/null
+++ b/addons/fleet/i18n/hu.po
@@ -0,0 +1,1912 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-05-19 20:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-20 05:34+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Group By..."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:669
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:740
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver_id:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state_id:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state_id:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand_id:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver_id:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
diff --git a/addons/fleet/i18n/nl_BE.po b/addons/fleet/i18n/nl_BE.po
new file mode 100644
index 00000000000..380de8a945e
--- /dev/null
+++ b/addons/fleet/i18n/nl_BE.po
@@ -0,0 +1,1912 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-15 16:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
+"X-Generator: Launchpad (build 16564)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Group By..."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:669
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:740
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver_id:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state_id:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype_id:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state_id:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Brand"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand_id:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver_id:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index 46b1757a7b3..06e5643344c 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -27,7 +27,6 @@ class res_users(osv.osv):
         'gmail_user': fields.char('Username', size=64,),
         'gmail_password': fields.char('Password', size=64),
     }
-res_users()    
 
 # vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
index f4464976aee..1771d99b51e 100644
--- a/addons/google_base_account/wizard/google_login.py
+++ b/addons/google_base_account/wizard/google_login.py
@@ -81,6 +81,5 @@ class google_login(osv.osv_memory):
     def _get_next_action(self, cr, uid, context=None):
         return {'type': 'ir.actions.act_window_close'}
 
-google_login()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index cdb14de1de3..2fd1976ae3b 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -155,7 +155,7 @@ class google_docs_ir_attachment(osv.osv):
         pool_ir_attachment = self.pool.get('ir.attachment')
         pool_gdoc_config = self.pool.get('google.docs.config')
         name_gdocs = ''
-        model_fields_dic = self.pool.get(res_model).read(cr, uid, res_id, [], context=context)
+        model_fields_dic = self.pool[res_model].read(cr, uid, res_id, [], context=context)
 
         # check if a model is configured with a template
         google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
@@ -191,4 +191,3 @@ This is the id of the template document, on google side. You can find it thanks
     _defaults = {
         'name_template': 'gdoc_%(name)s',
     }
-config()
diff --git a/addons/google_docs/i18n/ln.po b/addons/google_docs/i18n/ln.po
new file mode 100644
index 00000000000..24c26b98920
--- /dev/null
+++ b/addons/google_docs/i18n/ln.po
@@ -0,0 +1,188 @@
+# Lingala translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-05 13:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lingala <ln@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:167
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a presentation (slide show) document with url like "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, the ID is `presentation:123456789`"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a text document with url like "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
+"`document:123456789`"
+msgstr ""
+
+#. module: google_docs
+#: field:google.docs.config,gdocs_resource_id:0
+msgid "Google Resource ID to Use as Template"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a drawing document with url like "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
+"`drawings:123456789`"
+msgstr ""
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/xml/gdocs.xml:6
+#, python-format
+msgid "Add Google Doc..."
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"This is the id of the template document, on google side. You can find it "
+"thanks to its URL:"
+msgstr ""
+
+#. module: google_docs
+#: model:ir.model,name:google_docs.model_google_docs_config
+msgid "Google Docs templates config"
+msgstr ""
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/js/gdocs.js:25
+#, python-format
+msgid ""
+"The user google credentials are not set yet. Contact your administrator for "
+"help."
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a spreadsheet document with url like "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"the ID is `spreadsheet:123456789`"
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:129
+#, python-format
+msgid ""
+"Your resource id is not correct. You can find the id in the google docs URL."
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:153
+#, python-format
+msgid "Creating google docs may only be done by one at a time."
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:83
+#: code:addons/google_docs/google_docs.py:129
+#: code:addons/google_docs/google_docs.py:153
+#, python-format
+msgid "Google Docs Error!"
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:83
+#, python-format
+msgid "Check your google configuration in Users/Users/Synchronization tab."
+msgstr ""
+
+#. module: google_docs
+#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
+msgid "Google Docs configuration"
+msgstr ""
+
+#. module: google_docs
+#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config
+#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config
+msgid "Models configuration"
+msgstr ""
+
+#. module: google_docs
+#: field:google.docs.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/js/gdocs.js:28
+#, python-format
+msgid "User Google credentials are not yet set."
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:167
+#, python-format
+msgid "Your Google Doc Name Pattern's key does not found in object."
+msgstr ""
+
+#. module: google_docs
+#: help:google.docs.config,name_template:0
+msgid ""
+"Choose how the new google docs will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid "Google Docs Configuration"
+msgstr ""
+
+#. module: google_docs
+#: help:google.docs.config,gdocs_resource_id:0
+msgid ""
+"\n"
+"This is the id of the template document, on google side. You can find it "
+"thanks to its URL: \n"
+"*for a text document with url like "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
+"`document:123456789`\n"
+"*for a spreadsheet document with url like "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"the ID is `spreadsheet:123456789`\n"
+"*for a presentation (slide show) document with url like "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, the ID is `presentation:123456789`\n"
+"*for a drawing document with url like "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
+"`drawings:123456789`\n"
+"...\n"
+msgstr ""
+
+#. module: google_docs
+#: model:ir.model,name:google_docs.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: google_docs
+#: field:google.docs.config,name_template:0
+msgid "Google Doc Name Pattern"
+msgstr ""
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 467f34f708b..7f704e42e5e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -19,10 +19,13 @@
 #
 ##############################################################################
 
-from openerp import addons
 import logging
+
+from openerp.modules.module import get_module_resource
 from openerp.osv import fields, osv
+from openerp.tools.translate import _
 from openerp import tools
+
 _logger = logging.getLogger(__name__)
 
 class hr_employee_category(osv.osv):
@@ -67,7 +70,6 @@ class hr_employee_category(osv.osv):
         (_check_recursion, 'Error! You cannot create recursive Categories.', ['parent_id'])
     ]
 
-hr_employee_category()
 
 class hr_job(osv.osv):
 
@@ -144,7 +146,6 @@ class hr_job(osv.osv):
         self.write(cr, uid, ids, {'state': 'open', 'no_of_recruitment': 0})
         return True
 
-hr_job()
 
 class hr_employee(osv.osv):
     _name = "hr.employee"
@@ -221,7 +222,7 @@ class hr_employee(osv.osv):
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
             employee = self.browse(cr, uid, employee_id, context=context)
             self.pool.get('mail.group').message_post(cr, uid, [mail_group_id],
-                body='Welcome to %s! Please help them take the first steps with OpenERP!' % (employee.name),
+                body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
                 subtype='mail.mt_comment', context=context)
         except:
             pass # group deleted: do not push a message
@@ -261,7 +262,7 @@ class hr_employee(osv.osv):
         return {'value': {'work_email' : work_email}}
 
     def _get_default_image(self, cr, uid, context=None):
-        image_path = addons.get_module_resource('hr', 'static/src/img', 'default_image.png')
+        image_path = get_module_resource('hr', 'static/src/img', 'default_image.png')
         return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
 
     _defaults = {
@@ -284,7 +285,6 @@ class hr_employee(osv.osv):
         (_check_recursion, 'Error! You cannot create recursive hierarchy of Employee(s).', ['parent_id']),
     ]
 
-hr_employee()
 
 class hr_department(osv.osv):
     _description = "Department"
@@ -326,7 +326,6 @@ class res_users(osv.osv):
         'employee_ids': fields.one2many('hr.employee', 'user_id', 'Related employees'),
         }
 
-res_users()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 3f34a703475..641d5b272cf 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -235,5 +235,99 @@
           <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCACWAMgDASIAAhEBAxEB/8QAHQAAAQUBAQEBAAAAAAAAAAAABQAEBgcIAwIBCf/EAEcQAAIBAwIDBQQGBgYKAwEAAAECAwAEEQUhBhIxBxNBUWEicYHBFDJCkaGxCCMkUnLRFTNTYnPhFiU0VGOCkrLw8TZDosL/xAAZAQADAQEBAAAAAAAAAAAAAAABAwQCAAX/xAAqEQACAgICAgEDAgcAAAAAAAAAAQIRAyESMQRBEyJRYRSBIzJxkdHw8f/aAAwDAQACEQMRAD8AiVmskWGRip8wcUSF0ZUEd5bwXaAggSoDgjx99P5NFuol3hJA8V3rh9DZTgqQfdTxK+6OGpadpOsFnuJLu2lbGSJCybdNum3nQu74Nv3mmuLKW3vw6N7XMO8Y42yCAPeRv49aOi3I8K9ojoeZSQfMUKTOPXD1tdR6WkV3DNDJGxXklYswHhueoookOfCuNvqF3GOV2EqeUgzT2G/snP66F4G/eT2h91cce4IfSnLRDuXH901y0+2jd8rfpdZP8LfdRk2Uf0cNzpzMSpTfmHqfQ/Kus5ETePfYVGu0sNDwTfug39gfe4qa3tuI7pUQD2jjFRXtbi7rgmceLTRA46/Wz8qD2mFaaK34O1F7qa100W5Z8H2gfLJ6VPEsmwNiKrXhV3XibTpLb9UTexgcjEbFxkZ69DWiJdPt5SSU5T5rtS8dtMt8zHHH8bj7in++yBiwIORkHzrr9Bu2jLKhZVGSx2x8elTVbC3hUExKW8yc1zlHMcYHL5U3hfZFzroqzi3VF4f00Xd5bSPzSBAqkA753391NtE1XS9YhL2NyHkxl422dfh/Kl2/Rn+gogNv2lPyaqVglntpVljZ0dTlXQkEUhyplEVasvaWGvEMOZQMeNQPh3j25iCQ6uhuounfIMSD3jofzqwNGvrHU1WexuEmTO+Oq+hHUVqMkzMotHV4ceFcmiPlRJ0BNeDFTaMWDTEPKvDRelEjEKYavK9pbd4iBjzAb9KD0EbtCMdK4yRALv8AjQm81ecZ57lYh5AAUGu9WgJPPO8p+JpfyB4h68mtUB5pkz5A5/KlUQn1ZNxHCfiaVZ5sPE1lEMJk16MEUoxJGre8V5jxy10U71QTIbnR7SUZUFD6GuEnD79Y5Fb37UXhIA6V2jffFAJF5dHuo8kwkgeI3prJaMp3Uj31OYH38Otd3jhlAEkSNnzFcc2Vw9qwOVyDXeC+1G2wFmZlH2X9ofjU2m0fT5eiGM/3TTa54biETSRz7DwZa45Mj8N7HNIklzalXU5DRN8jUb7Xmt5eDgEugiG7i7zmBDKN98eNTyDS7WHeTMjD4Cof21RJJwYYo7Yle+DHu0+qAD7Rx0Az1O1FqkFO2VXw9p96L7R76OxuHsVvE5ZxFlT+sGckeVX20saD23VBnqTiqh4Lvb+20rNjcSWyGV8RofZG/kdqOvr93uL2zhuM7F1zG/3ilxXEpz5nmUU1XFUT6Zw24II8wa48uWqH6TfWYaV4Hvbd3G/eNzgH3j51KLTULaUKqyDO2/maapImcWVd2/LjSLcedyv/AGtVKlCDjGauvt8P+rrRT/vP/wDBqn+X2l2FST2yqLaSGXdqTt7LelGOBpZ4uLdOSORkLTqrFTjmU+Bpi6KS+3TFPuCATxppYH9svzrK7NXaZeKDIyaRXNek2Fes4qsmORQUK4jT9g6fbFGA++OU0M4jH7Af4xQl0zl2VjxMuLvI68maBE53JqQ8VDE7HyiqKtJUvbKUkkdWYD1pU3aQ+JpV1B5GuoOLbrA+l6dazjxIyp+dPYeJdGlP6+wuYD5owYCnUnD2nOoKvInxBplLwyhz3Vyh/iXFWWyFRiErfUdCmGItT7onwmQrT6KASjNtdW048OSQVF5uGbxRlBG/uamk2h6hCc/RpR5FR/KhYa/JNVguYjl4mHr1FATqd9JqU6d68USuVReXGw2zvQWOfWrM4juruLHgWOPuNOE4n1uPCzGG5XyliB/EVykgOLJNbzTFRmVz8acXc7jKCSQLgbE1F4+K484udHjB8WhkK/gacHXtInTLve2pP7yBwPurXJGOEharqc1qOdTzDP1WHWgPanHd32gQxWgJmLlgqvjYDOPX3U9vILfUHQW+vWRQkcyyAq2PTO1Cu05XuLOztLYhpy5dJIpfqYHXb0yKzJ6bNxi7ojFjxPZabwXbfSkhmvSzbyDmYKMBQBsTtgDwAFDV1ziPULFJ7Th6zIbJ5+8bcD+6eho32ZcK2Wo6y3Kn0q5jwJJCP1aH91R4n31orhns809EV5tOhd8D2nGalllosx4HLZk/WIOLbm2jntrGa2kZvZMLk+zy+Xnk1OOEOKAtpa2WtWaWd/8A1fetHyrNjxz4E+NaZuOB9JZGA062BYbnuxVQdqfZfLb2015pcLSIAS9sd1YePL5GhHPTNy8a1plM9vDhrOywcjvyf/xVTZBdanHaD/SI0y2sr0FlhctFKftxkYA94qAsG5gFz7jXN2zlDR1b7f8A54U+4F/+aaWf+MvzoS7sudtvSi/A2/GWm4/tgfwND2gcaTLvQ7CvYrip2G9eubeqyU+n61DOIz+wH+MUSJoXxIf2D/nFdLo5dlb8Wf1j/wCD/OocTipjxX9Z/wDC/nUNbrUa7ZVLpHhiaVI0qNmTbgncAb5r0tyd6a8wwN6Q6HfxqsjQSS7O21dBdrkbmh67qtMOI7uex0a7ubZQ1xHCzRKVzzNjbbx91BulYUrJHHdIeuD765SJYzH9ZbQN55QVRUfG3aA8n6u0BXO2bHH51IdM4h45eLvLnT4wPS3/AJGkPyYIevGm/aLNbSNIlODaqv8ACxFfLvhrSPohde9ByNsg1Vt3x9xPYyYk0iGQDzikX8qazdtF4kfc3fDwHmUnYfgVox8jHIL8XKv+liT6XpNupIthKR++xIqCzNBdX2oLAkcTDEKBRgZOSaZWva7ol4e5uLO9tnf2QTyuoJ28Dn8KZ8GXi3HGEILKySSPIATsfDNHJNNaOhCSezQPYTwxBpGkRKY0aUjmlfH1mO5P5Vd1lGO7AAGw2qCcCQWcOmNe6nMsFouyBn5QfUn5VL9M1HRbgyXWlXEUgjH6wRk4x/540hLdlTdKkF+6yNx76EavDbTQsjNGc7HJHXyooNQhkjQKwPedN/OgurcUaPpshsriCboWJFuSnKOrZA6etHimjEZSj2ZZ/SY4Wisrf6dawr3UkntAfYc+I99ZlvUaKVcjAbcHzr9Au1Ph7T9f4Su5IF76wvoO8ixvyNjIK+Xgawbqi9289nIodoZCC3iOozQ9GnqWgHLJ7RFGOBphHxZZTFWYRuWblGTgKaAP/W49asnsSsLWWTWL+6ClYVSIZ64YknH3CtLbR03UWHzrN1dXCRxRSxxvsOXAOffXQPrMZLJKeUfZc5yPjUzXStLiKGJAZFyzZOyjwxTfUbW3W3EoYA+pxQnkmmM8fDjnG5IG6fdfSIwfHofQ+INNeJD/AKv/AOcVxsy0WrZQERTKQ3lkdPnXviNv2D3uKojLlC2R5sfx5OJXXFZGX/wv51DmzgMNhUu4tbHe+fdfzqFRux26ip49sZLpHU9KVfCaVEFG0IGs1hRJL+WRlGC7wFS3rgDFc4Y1UNnXYmJbK81vjA8q8h8gbnpXQE8nxqpqyRDyH6OI1X6fbs2NznGaa67pz6hBEltfWilebJMmOo8K6QEdwmRnau0YXO6qfeKzKKaphi6dojl1wvczxFBHp7sVxzi5bOfPrjNJeGdTNjJA8hV2Qp3kMwyAdgR61JeSP+zTP8Ipd3Cf/qT/AKaVLDFjY5ZIrqXgLiWPe34l1gbfb5JPnTKbhDjeIEf0406+U1grfOrUighJwY1r1dW8AQcilTnflcj51n4EMXkzKB4u0LiLTNLlu76LSXRftfQCjfAjxplwjcCDtDsLMkLgJH16HkB+/OatPtMRJdOisiryLLKoKlzvvVO8K2N5N2jQCCN5JzMzRYJHt749+cYA8SRWOKhKhqm8kbN5afpFjq2macLpZClqVljVMY5wNiQdjj1otd6fBpmj3As4XXmDOSx8T1PvoL2XXq3ug2k5By8anB6ipfrbJNaLEQAvONsda5aQ5xXNAqKMwWNo7gqvs5Y9BtRSTT4ZYxLJaW0hG6vy52+FeYYLs2QSeVWiXdcdT5DFPLCQLCEjB9nYg+Iro6M5He0RviC0hTSJbeKCOFCpCqi4A+Ffn92m8NXej8TandDka0lvpYk5XyynAkAI8Mg7eeDX6HcWZ+hScq4PKfyrI/6RlnpI1fh2xsFc394izXQHQlgFTbz2bHoaPSdB4ppMzJIuLjH96pv2UXTQXd4ruTA0sZZPM71EdShMOqtE6lSrlWB8CDgj76sHsW4cXULi8vLxGjjICwN9UnxLDz8BRSbdIXyUaf5LHhkzkLgZHMCDnY9K+66hFiSsjKCBkrsRv867PoV5Zsz2579cDps33VwvZlnhELMI3U+0D1HpvSmpJ7PQxyxyX0gqX29VhlxyoY2CqMDcY8Pcaa8SHFiP4xXywRpNYubkuzKqhBnz/wDVLiT/AGJf8Qfkaqgqxnl+XXzOit+LOsv+HUTXvYlCNFyCUBwzLuRvgj0qWcVkBpSRsI+lRJtsMpx6VjHjck2jGSaVL8HrmBOPGlXlCMdBnxpVk62bA0m+tNStFubKYSxHbmAx+FEOU8tUzpmsXeiXifRx9FZD9HukxlefP1iDtv5/zq2eHNVh1ew71cLMm0seeh8x6Hwpnj51mjfsHleNLx5Ux/agmJPLFOo1PX0pW0B7hMD7Ip7DbswzjwpxNY3jQs2wr2kLhtxTpgkDKIypYfWyetdBzNymQKNsDBrmjrBkk0Fu4FxPHDzdOdsZr6txaTSFRdxkKux5gPa+NeNdhUSEsoII8Rmqp4qs5p+JJoUW5ghIBWWJQQDyjbz3O1Tzlki1xVj8UMc3UpcfySHjy7tDqdhEtxG5FyqsoYEj2gOlBjdaVw9dS3tnDi9AzHMTumPqkeWDVcWdtq2kaq7X8FzA8j4QyAhs+e9P769a/JljbmwvLj76nnkfyK1Rc8EYxcYyujYX6Pus2er8IWN1G4J9sMCMHPMcjHvzU+4nguO/t5oHkeFPrwI3KX8vaxmsocC9oumcD2nDJs7C6SxubRzqKqOcpIsjK0vm26knYYGPKtP8K8VaTxJaRTWN5BcxyIGjZHBDCmSVAhO2pfYMWqmS2HLp1yTj6stwcVy0q0ni1LvpmEQ5cd3ETyfEHqaMWjSNGQuBjzplqNwtrbvJIVU5wN6MujudtxGXGFwkdhO7EBQh/KsNcfa3dXvbFG2pQRwGxuoogo2UpGAFO/XIwc+taR7cOI9aueE7u04XBlvXUqHQczL58o8TWUO1ttRbju4u7shZTFbMExy8gMKNgL4dTQf8r+5naaXoHWuh/wCkPaBLMIVa2Sd5JQBhWbnOB8cAn/Ort03Sbe2UMEjDcuMKCAPhVIaLxVquiZFnHZuCxY95ESSScnJBq3OzHjm24mZ9Pu4lstRReYIr+zKPErnfI8jVOKNJWTTmpS0HkkaH2GGUXcjO4H8qF8TWVtdIjSYkTAbmX6y+nrUsu7VXi9ok48SMmgV5Z4QgYZMnYeH+XpTTCb9ETuEhiYi3IaNcDCjHLQfiQ/saesg/I1JLu1EV4bhQeRj7XpTDWtLW7BCOVz7QA86ElapArZUfFx3n/wAMVFbiSJ7dJMFJgeUhVATlAGD1zzHfNT3i/QNXzP3VlJMCmxj3ziq/lgmjlEEsLxykjaQFT+NSqNdjnNaX4PjMqAgEuxwVI2HrmlXyUckhTcEbYP49KVdoW21ovK6hW6svpYh7/uv1d2pHtyQnYN13ZcYPqo8676Bq0+h6v3LOxeNQVdvqTxHofiOvkRUq0ng3itbiad7aDnmYly/IobKBcEDboB91PE7LtZurmCe4urZTCMJuWK75wPStLEozk4rt3/v7f2NxzN4I457a1f4/yiZaPrekSadC5eUsVGQI+h8qdT8QabDaTPGkpYIcZAHzodpXAF1BAsL6iSF/dSii8Bwd2VuLi4ZGGGzhRinNsn0QLiHio6dIizappM5kjDMttIZWjJGeQnGObz/9VHr/ALQLpw0dnqAiXxbPJnbwyKsqTgTs407H0xNNUrt+uuQT92aSHsz07/ZbbT5GH+72RkP38vzpT5/c9SGbwIxX8Nt/1RDeGeJJNSZ7OXUzdRW/KRMEdicnPLk7miGp3um2bTXmoNJDY8oDSSREKp+PWpNJxdokC8tjod9KB0xEkS/iflVRduuv3esT6fFLYmxtI0dhGZufnbP1jgAbDamY5uJ53kcMs3KKpfYjfHXEtvrOrudMMUkK8wV0hKFs+YPXalw1Yd9pqsYzEZJXVSw2OCQfhkYoXBNpMHCDqXC6gZFmhUDJdicb+QC/jUy7OIu80try/wCd4LVQRzDbJIA/M1BnfOTkXYF8cFE98XRLpvA2lz4UMk01s5Az7ErlsH3HNaC4N4ZtW4dtW093gu7SNFS5gbkd15AVJxsTggb+VUnr8VvrENzowmia1SL6SDzb82CVx57nceWa0d2eadc6Np+nrc5aOfT4ObbowXH5EUFN2kb4UmwnpGtcQwRLDcSW95y7B2Uxv8QMg/hXjiBr+9hLXU+BjaNNgKN3NlCJO8C7HxFMtREYhx1JGMmnXoxdkMMItrnTERcc7NnHgMVRH6U+ifQ+JNI1kRgC7sjbu2PtwsVH3oU/GtIWtk13q9scZWBdvjUP/Su4ejuuyw3/ACjvtNuo5QcdFf2G/MfdRxP6zGfcTGz4yT51702+l0zVbW/tn5ZYJVkBHod/wyK+SLsRjpTK4OFPuqwgNc20nPGFlXDMMq3nnpTa5tYy/N3Tq5GDynrXrQZRJpdrHMPbEEYYHz5RRYIjpysAwx41tdDCE6nFEju5f2QPbUqQR61DNY1WzeeKxgjuhLIeWGVYWwcb7Y3NW/d2yEboGIGxIyQKiOpW09hqC6hpkUKXNsxaDnQlemGGxHUEj0rM1KtGotJ2Rc2epGEK7cyAbFW+sPU0C4m0az1aya1nhdZQPYY+0UbwZT1946GpnZXstxB3t+8BupWZphFtGhY5CjPgM/GoxxdfQ6ck1zI3dRow5WLA5PmK6lWwXbKH1KJoL+aAgqYpGT2lwdj5eFKuvEOpDUtbur5UKiWTmApUigO2zap4x1KTa20uwT+KV5D+AFdI9X4wutoDHCD/AGNj83Jpxas4ABuTGP8AhxqtPlezUAz3Ttnb2pjv8BTOL+4vkgU9pxbcD9q1i+jU9QbhIR9y4pv/AKLJcNm91ITt4hppJjUntzaq2YrLmPmY/m1PkuJQPZijjHq/yFdxByItb8H6ZFjEMzn+5bhPxaiUHDlkoHLZZ/xZ/koo5EWcMZSpO2OUYrgVy2C00mRnHeYH4V3FHcmMhpVvBv3dlCPSLJ+9jVKfpOxRqdHaKbvMwzqcAADdfIVezwqpBWOJD54yaoX9Km/iaTR9KSRmuVWWVtsAIeUY+8V1HJ2Ufpv0Z7mAXRlVFKg8u4A9R41P0vr/AE7QIdMSe3W2un72ZYn5zhOjnG6g9MHxqC2FuxkBPXqakWn3UlvGyqkcyPjnWRc5+PWlSwcuijHn49hjh3ia909e6jhjblm72KSRAxGOgwfDGdq252S8R6bx/wAC2uq2ixx3MX6m6tlP9RIBuv8ACRgj091YS1C9luWTmjhhReiRIFH+Z99TnsK7R5+zzjKO7cvJpV1iK/gXfmjzs4H7y9R5jI8aC8dKJp53Jm13sZY/YGSvkfCh11p2ZNgSTUlstQsdU0+C/sJ4rm1uIxJDNGcq6kZBBrnMi56UpxobGV7Bmn6cloGfHtud6i/bJpp1Xsz4ksguWfT5XUf3lHMP+2py7AjamOoWy3NpNbuoKzI0bA+TAj50I6Zz2nZ+aswyxPnvQ67XfHnRrWLd7PUrm0cYa3meI+9WI+VBbzPMAu5JwAOpq4i9mmOEpp7vhLSdTjzKstnGW/fUgYPv3Bo9Zagr4DHxplwZbtY8HaXZPF3bQ20SMnip5QTn1zmul/YhyJY3MbnqR6/+vxpi6NLboOK6ONqE6zZgQSSIcHlIpsjXtqcd8kieBbAND9W1PWZ4mt7e1t1UnHe97nb3YrXoHsjF+og72QqM3GERSPs5+saoXirW7zUr+W0ku+e1SdhGWGMDmIBOOuBV/wBxZ3PM0t1Jh8btncfyrOHFFk2m67eWJJPcylQT4jqD9xpGS0jfYxmh5AzKVdFcoHU7MfQdaVGOG+HrnWJxPymKzTZ5COvovnSpNmljb2aztblMHFuuOhLnP86JWjxg86pCrZzkJk/jVC8FcFahaarDqV5rU0AicOIreViz48GY7Y8xg1cNpeDGObf0pyk2tk7X2Jdbz5wWkY/GiFs6ZBwKi1teqAC2wHiTTyHVYfqrKHPlGCx/CjYKJJDcAs2/l868wTjnyT9j50Ftr0gMSrjJGAcZPX7qX0pkTmnvEhT0wv4mgFoPSTLjJ2XzJwKyp296rHqXaddpGQyWsSQAg5HTJ/OtEC/s3OYVmvG/ewSP+ptvurJnaFdvP2g65LIOVjeMMZzjGBQYUj5ZMoPdnAz409aRU6bketBEmDKN9x0r2bhnH94dfUedMTBQZeVXQFTnxFci5wGFC7a4Kkr67U8V8g11hL//AEYO2BeGL1OE+I7rGh3Un7NO52spSfHyjY9fI7+da8lYFAwYEEZBB8K/MLvORs/Z8a0d+jf22m0W24L4uu/2XaPTr6Vv6ryicn7P7reHQ7YwnLC9ofjn6ZqE3KhuUHeujNzIG8RvUcivQdSePm6DNGUuQY/hUqKmYD7aLNdO7UuJ7NRhU1KYqPIMeYf91NeySCO443haREfuInlAZc4IwMj1GaLfpIXMM3bTxKYCOUXKq2OnOI1DfiKD9jXeNxpI6fVjsLhnPkMAfnirJOokUVc6NCWjB3CocquST5nH+dOJXQTcjdO6z9xodazRwwmSN1dQASRuCvidvvqOdoPF1tw/pVxfKBPKcRQoGHU5wT6beFU9IXdkkuLyNgU9oDqW8fhQu61C2jJHexpgeLjP41mvUuJdY1K4ea8vpeZzljGoXJ+GKFO73EhBklkZjgAndjSnkfpDuEF3IvzXOMdAt1uIZbqO5dYmd4oWDHlA3quNK4LvuKtYm4g1OM2thcP3kcXOO8kXwHoMePjQK00mbSrpXv7URTgBhFLuOUjow9R4UZPE2tpMHGoEADZVVeX3Yxit/p8uSKekZ+XHCXsni6Zb29uIY41gt4lwABgADypVF7PjyVuWG/sl5QPrwHG/8J/nSqaXj5U6opWbE12GtE1yS6Yx20O46mRsflmpLZz3j457kqPKNAPxOTSpVyeyVha3MYHNIrSEeMjFj+NFLa8YKAi4HlSpVt6MD2G6kJyxz8K4ww2qN35gEkrb88hLke7PSlSoI4ex3js4RRv6msncaTd7xlrEuMc17Jt7jj5UqVB9nRGUcmR412WXLKD9bwYfOlSrYUIScsqsBsSRjyNPIZiSNutKlQRzPUj+FcRIQ/J1z0pUq0zl2Xz2F9q+pxyR8P6qJbxhDy2lwTllVd+R89RjoevhV9HjJLfRJtRlhmMcMZkZVwSQPLelSqeUVzKoSbgYc471c6zxbq+r8jILy8lmCsclQzEgGp72I6fHBwdxJxG3tTMhs4x+6oXnY/ElfupUqOZ/SYwL6yqrDVdRsZOayvrm2bGMxykU64gErwadcTXVxcy3Fr3sjTOWwS7DA9MAUqVOTZMwSB5VovsS7IrSbTYeINTuY5biQc0XKpYRDHgDjJ36n4UqVdV6YbcYuS7JTxB2A2ur3815Y8STQySnmKT2wdQfQhgcelVX2hdkmu8IqZ7vUdMurX/hc6ufgV+dKlVuLLK+Polm9tlaXsYjkxFtnwO4pUqVUZFUnQYu0j//2Q==</field>
       </record>
 
+      <record id="employee_han" model="hr.employee">
+          <field name="name">Hans Anders</field>
+          <field name="department_id" ref="dep_rd"/>
+          <field name="job_id" ref="hr.job_developer"/>
+          <field name="work_location">Grand-Rosière</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhQQEBAUEBQPDxQQEBQVFBUUFA8PFRQQFRUVFBYUFBUXHCYeFxkjGRUUHy8gIycpLCwsFR4xNTAqNSYrLSkBCQoKDgwOGA8PFykcHh0pKSkpKSksKSkpKSkpKSwsKSkpKSkpKSwpKSk1KSkpKSksLCwpKSkpKSkpLCwsKSwpLP/AABEIAOEA4QMBIgACEQEDEQH/xAAcAAACAgMBAQAAAAAAAAAAAAAAAgEDBAUGBwj/xAA+EAABBAAEAwYDBAgFBQAAAAABAAIDEQQSITEFBkETIlFhcZEHMoFCocHRFCMzUmJysfAkU4KT4RU0Q9Lx/8QAGQEBAAMBAQAAAAAAAAAAAAAAAAECAwQF/8QAIREBAQACAQQDAQEAAAAAAAAAAAECETEDEiFBE1FhMhT/2gAMAwEAAhEDEQA/AO4LUpary1KWoKC1QWq4tSlqCnKoyq7KoyoKsqMqtyoyoK8qMqtyoyoK8qMqtyqHEC/IXXWkFeVGVcrxD4n4SIuFTyOYQC0MyEHY6SFux0UYX4oYR4NiWJwqg8DUaX3mkgfWtvqo3E6rq8qjKtVhuc8FIBWJgaSPldJGwjbez5j1Gq22GnZK0PieyRp2cxzXtPoRoVKC5VGVXlqUtQUlqjKri1RlQU5UZVblUZUFeVTlVmVFIEyqcqfKpDUCBqYNTgKQ1AmVCsyoQZRalLVeWpC1BSWpS1XFqUtQVZVGVW5UZUFWVTlVmVTlQVhqTETNjaXOugOgc8/QDUq8ivp9VwPNnPkTow3CYh8TsubO2ORrgbygAkiuu4sUNBai3SZNr+KfEqFn/b5ZKD83a9pAczCBkaHN+Y2d62XIc3/EA4uOFjWOhc0l5c2Qg3TmgCvI62ubx05m7V5LnO7TMS4l5PabkuPzGxZ/mWJxCOi1w0toaR4FoGlfes+7a+lBnNvObvOBvYgtduD62VV2jtBZPQbeqdrLV7Yw3wF/1/JNoVRyEbe+xvyW+4ZzhiMPm7N3Z5xT8rW081QkLXChIPEaGqIK57Jrrfr/AMqxumo1HnqL8CNwiXsXJ3OhxEhhlp1BoY8A97M0vaHerQ7U1q2jquzIXz1wjiT4ZmPjOQte1xsZgMpsEj7QGq9WwvPeByNdNMJHyuJot+RjSQ0vGjGGgHV83e2VscvtWx12VQWqnA8VhnA7GSOS22A1wJr0WUWq6qnKjKrcqjKgrpFKzKikCUpDU1KQEEAKQ1MGpgEC5UJ8qEGUWpSFcQkIQVEJaVpCWkFdIpWUikFeVSGp6U5fog4j4h81/o8Zhj7GSSRveBcHuYDsTH0B6E+G3UeS4Zlu1ojIRVZW9dxsPoAF1fOnGP0iYxwxNijY8jUMMkjwXBzi4XQOp3s0LrULA4VwfNtrrX/xc+eTfDDbWR4CjvmB0LfLz8UuO4bpsTYF+NtFB3rWnmvQsJy61oF+GuxWY3gcR+YE/Wlj8jo+Hw8kZhth1Hv/AH5pZMP4X/yvRcfyX/lm/VaaDlt+ch7a13CvM9s70q40wnwNH7iroWFu4sO0O2h6H1XfR8uxjfVY2M4GzoKT5IfDXEGMgn6j8Fdg8Tku2568wPwOq3U3CfRa3F4LI4Hqfm8x0cp3tS4adtyVz24PhglaHxvfkDqawxW0BrRQyuFjxvvnwAXqBavnHCTOikBZpTg4eFg2PwX0PwrHtxEEUrLyysDhehF7g+d2tsL6ZZRaQoyq0tSlq0UV5UUrMqKQJSmk1KaQKAmAUgJwEC0hPlQgyiEhCsSkIKyFFKwhLSBKRSekUgUBYnGZWsw2Ic97omthkLntALmNDSS5oIOo6aFZwCwePxB2ExQcQ1rsNKCSLABjcLrqovCY8LiiIcANS7fehsCNdd9LPgfFdrwvABgZ10381yuFFuaT/MR53TR95K7fDjuM9FwZ139KMpmpWwgjsai1gtFbLIY1x2NLGOmsot8liYzD36qTIRuT9U0hsX+KttVoJoSHLGxLLW5miG61WKZ4KYNTLCtTxOH7tR/fgt447rVcVbbT/e61jnzczQEjh4EEey925Fka7h+Gy9GkHfRwcbXhj2d8n+9NfwXu/IEIHDcLQALmEu/nLja6MOXJlw3Baoyq8sUFi2ZqMqMquyIyIKcqnIrsiMiCsNTBqsDEwYgryoV2RCApFJ6RSCvKjKrKRlQVZVOVWZUZUCBq1HN7qwOJ84y0+jiAfuK3dLWcytYcJOyQkCSNzRlFkuI0rzulXLipx82PFoG5nsaPtPA9iV29ZaA6CvZcXwmNzcRGHCnNdqPDx+9dXiw9xIZppuuDN39Lwzo8Y0GiRp4rOh4jHdBwJ9VyM/DWRi55nNrWhqfYAla52Bie49nJOCD5DXzBAKiY+2nd6ejSva4V1WOwiq8FzvC4pWV3u0b9b/qtviiWMzaqtWJjcSKrQLTyY1h3IC0nGOIOe+gS0eXVVx8L7hfJ2rgLutTQGYl3QUBepWuOLPLPTY4iZvQhYUgDgeoKXsIXAd0tvYnY/UEhQyDLtqFPDPe3OYgZZK8HH2XtnwtxfacOjFgmJ72GumuYD2cPdeL8QbcxrckL1r4R8QHZTYU7wESA1VtkJzAnqQR7OC2wvmOfLG2W/TuixRkV+VRkXQxUZEZFfkRkQUZFORXZEZEFQYmDFaGKQxBXkQrsqhBVSKT5VOVBXSmk+VGVAlIyqzKjKgSlzXO2HJZh3DNTJtaJG7Tv7V9V1GVUY/BCWN7D9ppryd0Puq5Tc006WXZnMnkOPw4/T2ZerA4/Q0uhIpumpK1+O4aW4xryKywuY47d4OFfitthza87Ll6Pbq1psFwrKZ+0Dnds0C8wBA3Bb9f6LHZw/sTIbMrpDZLu84nQm9T/AF6LqAwdQCllwwJoAD0WkyutI7JvdjFwIa1oNC/SunVHEHXE4eivkhDdAsXEHuvHiFn7ayOBkbUpJsb6joV0EDmyYbsSQW6/MNddDZ+1YNG91pcS3vm9KK2eC2FLXemGpbZVeIwFMDBVDahXksYREaHoN1vCbWDitAo7touOnM42HLOx3Qm/Zel/Cnhju1xU9HI+OKNp17zgXF9eNU33XBcWaBGCd9m+pXsXw4wmThmFvQvaZOv23Ej7qW3Tm6wzvbjf10WVGVWZUZV0uVXlRkVuVGVBVkU5VZlU5UFeVTlT5VOVBXlQrMqEFGVGVWZVOVBXlRlVmVGVAmVGVWZUZUFeVTlVmVGVBw/N+ALJA8DuON3/ABVqPx+q1ULqpeh8T4cJ4nxnTMNDvR6Fefy4cxPfG6szHUSDp9FxdfDV27+j1O6avpdG/XUrID6GixGNRPJsFht1coxUuoo7pY2NyOLiQaS4qLM3R1EdVqsRCYo6Y57i7TvOLtT67K8hb4aLjLLkNb2m4RLYWBicG8S5nEg0RuSK9FseFRhunir3hjvd22j3aLWYl/RZk76WuldqoiMqyOHcH/TMXh4LLc161eUBrnk+tNIvxIXueHwwjY1jRTWNDWjwaBQC5X4fcvQsjbimFz5JYw12bLUZaSHNZoCNd/RdjS6+njqOLqZbuiZUZVZlRS0ZEyoyp6U0gTKjKnpFIEpTlT0ikCZUJ6QgpyqcqfKikCZUUrMqKQJSMqelNIK6U5U9IpAlLg+csN2eKDukrAf9Q7p/D3XoFLQ858P7TDF+xh7w/l2cP78Fn1Md4tell25RxbpNFVO7r4BIx2gVc0Jc4d5zRX2au+h1C87Xl6G1rnBvzOA/JYWJxsZO/wAq18WBfHI8zfrxpkAJbrY+be+v5LZulgy0IcpzXVeJ1Gy3mK18erWqxWMjf4+q15eLBYVm8QYNQ1kTGmjqCXadBsNVqsNg2s1Bc5xN27Wh4BTrwplPzTNlnJGu4/oseQ7KzEv1WJiZaCiMbfL1/wCFGM7TAvFEdlipGettZJY/3K+i7Ol5x8EsY10GLjsZm4gPrrldGxt+7SvSaXXh/Mcmf9UtIpPSKV1C0ik1IpAtIpNSmkC0ikyEC0hMhBXSKT0ikC0ik1IpAtIpPSKQLSKTIQLS8T+JPxIdLj4cHh3AYeKZoneP/JMCbZf7rSB6m/Bd/wDE/m//AKbgXOj/AG87uyh8nEEuf6NaCfWh1XzZhGASQ19mRlel0ovCZy9eYSPrsVcyRVRvDm0kElGnLzbN+Xp8L5RYWqxmKcKHe7u2wpbRo891RjA0biyrY2xfurQzhz9SOqxntyjzW6xDAB4fmtNiSNfZX81lnftQ5/UrVY3F7p8fjK0C0mJnLleRhs2B4/NhpWy4eR8UjHghzSdfJw+00gkEHxX0z8Puc28UwbZaDZGHJMwG8sgG4/hI1HqvlWRq6Lkzm+fhk4lgNtOUTRGsssQPy+ThZyu6E9RYXTjw5suX1cha/gPHIsbh454HB7JG35tPVrh0cDoR5LYKyoQhCAQhCAQhCAQhCAQhCAQhCAQhaTmPnLCcPbeKmYxxBLYwc0r6/djGp9dkG7Wh5l55wfDgP0qZrXO+WNodLI7S9GNBIHmaG2q8b5q+OGLxGZmEaMDGSQHAiWZzehzEZYzXQXV6HS15y6YufneXOc93ec4l7nHxc46n6oOt+IfO7uKYrPXZwwgtgYfmymsz5NSC4kaVsKG9rlvTcaj1GoTUodopHpfCsf2kTHj7bAfQ1qPdbDRw1XE8n8U3hcf4ma738zfx9110Ute64c8e26ejjlM8diSQx/Nt0cPDzWNiMcHHcLOmNiwsR2GZIDoLHkAoifLBxnEgBuCtBjeIXde6zeJ4AM18Fz2JfZ0WkZZ2+1GJlLiqhEsmKC1sOF8Amxcgiw0bpHH1DWj957tmj1+lqVNOfmiOUno0gfUnQJmrpudeCMwnY4eMh/Zd6aSq7TEOFE+QAAAHguaXRjNRzZea3vK/OeK4a9z8K9oD6zxvaZI31sS0EEO6WCDX0r1Dl74/wvOXHwuwxoXJFmnj8yWgZ29dKd6rxEbqiR1OHorKvsnB4xkzGyRPZIx4Ba5hDmuaRYII8lcvkfg3MWJwbg7CTzYc3dNeSwk6HNEbY7fqD47r1blT482Ws4jEGdO3htwv+OLdo8wT6BNJexIWHwvi8OKjEmGljnYdnRua8X4Gtj5FZigCEIQCEIQCEIQCoxuNZCx0kr2xsaLc5xDQPqVzXN/xJwvDg5rndtPXdhZqbo1nP2BYIteB8082YjiUxkxDtAf1cTS7s4hrWVp3dRNuOp9KAD0bnX42tcySHhvaNdYH6SRHlq+8YmmybGgcQPEXovIMXiXSPc+RzpHvNue4lznHbUny0+gUOSlSEyrHldr6LKcVjZbKIZRP5pCdURusD2/EJsqJQyQsILSWkGwRuCNiu75b4z+ldzaYC8u2cDdzPfULg6VkEzmOa5pLXNNtI6FUywmXK+Gdwvh6q2wcrwWnwIo+xWJiCWajour5E5tbjof1ga58Zyva4XRoEEX0Nrsm4SJw/ZxH/Qz8ll8P66P9E+nz9zDxdmtuAJGxIGq1PCeEzYs/4eKWfXUsaXNHq7Ye6+lzwqH/ACof9tn5LJY0AUAGjwAAHsFedNll1d+nj/LvwhneQcW5uHZoS1pD5T4jbK31s+i9Gi4fBw7CmPDsyNAJ3LnOd4ucdSVu1y/OnGm4eJziRmA0voaVpjIp3XLl5Dzw05rkP6yR2YNH2W9S7zO1LjithxriJkeXEknz6ne/Ja2wVeKWpDlTiN/oFe1qpxHzfQKUHiKtVLdFaEGfwjjU+EfnwssuHcassOh/maba76gr1vk745hxbHxJoYXOoTxjLE0Gq7VpcS0X9oWOpoXXizSmKgfYGFxbJWNfE5sjHC2uaQ4EbaEK1fKfK3OGJ4c9zsJIGB2ro3DPG8+LmWNa6ggr3Hk74uYbHubFL/hJ3bMeQWPOmkcmxNk900TV0iXdoQhQElmaxpc4hoG5JoBeNc9/GYyZ4OGksZ3muxOznbC4PAb9867EdCud+I/xEdxN/Zx548K0D9W4NBkfvmkom60pt1pe9VxLiglxskklxcSSSSS5x3LidSfMqHGlDSlkKlBS5DkrSpkcgWY6KGt0RiDsmbsgTDHvEeOo9Qr6WJI6nAjoVmOcDsR47oIyqCE2cAalvusd+MA21+4IlnYLiL4HCSKR8Lm7Oacp9PA77G13vAPje+NrW4nD9sAK7SN/ZvPmWEZbrwIXlj5C7fVWskPZltAguzXRsGq0PghH1Vwbj0WLgjmgdnZILHiDsWuHRwNghZ+cL5n5K52k4bLeroJCO1jvzH6xng8C/Ve3v5nja3MZGhuXNmJAaGb5rUJkdBxLijMPC+WRwa2NpJJ02Fr5/wCcubHY6Xq2O7DSTbq2Lh69Fmc+8/uxzuzhtkDD3QaBkIP7R1elgeeuu3H4mWm2N/NIVjSvsklIwKA+1eGqypVVJq72WS1qonb3/UBBD1Yw6KuRNGdFAek1pLQSpCF1OWUJa9RqOmo6rBu3K6U6IM3/AKxL/n4n/fn/APZC1eZCDZApHFRG5LIVCTxJC7WlYwaLFDu8VKFg3Svd3gEz1WzVygTONU7RollHeTgIEMSQwhXJUCMhHgmdGEwKhyCtraTAaehUEJM+hQEhr6rYnGu7Jsbndxmw9NQPOui1+eqPU7fmqy4ndErpcZ+77lY7iTqdUMZatyKUKmsT5PVWNYmpBWI/X3KmOOinpSgreiNS9qlgUCXGiklKmQ6pJVIWPdTMdURbhKNT9UE5UK21CCyF2tJpjqkl0eFMupChK9poD0WE495ZIf3yPJYs/wAxRDIOwSxbpM2gVkLUA494q1VjdWoISOCdQVIrCYhQVNqAr2qmIWT7+yue9VRDV3og7DlrF8OGBnGLbEZyZLzse6ZzS39T+jPHykO31HmuQYzui9619U7ApKSJ2VjdEwCgFSAiEhCFDkAFAUhCCHjREaYlK3dSEm6KuRPPsqyoDRbhKzdNEUsY1Ui7KhTaEEYzdqYbtQhQlDf2ipn+ZCEDeCyI0IRCG7qwoQiQFBQhSgjkO2QhQK/FLD9r0UoQOOik/ghCCApCEIApShCBgob+ChCBghCEFcuyqjQhA0W6iLcoQpEoQhB//9k=</field>
+      </record>
+      
+      <record id="employee_jve" model="hr.employee">
+          <field name="name">Jan Van Eyck</field>
+          <field name="department_id" ref="dep_rd"/>
+          <field name="job_id" ref="hr.job_developer"/>
+          <field name="work_location">Auderghem</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="work_email">jve@openerp.com</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhQSEBUUEhQWFBUUFRQVFRYYFxYUFRcWFhcVFBQVFRQXHCYeFxokHBYUHy8gIycpLCwsFR4xNTAqNSYrLCkBCQoKDgwOGg8PGC0cHB8sLCkpLCksKSksKSwsLDQsKSwpLCwuLCwsLCkpLCwsLCwpKSwsLCwsLCwsLCksLCwsLP/AABEIAQAAxQMBIgACEQEDEQH/xAAcAAABBAMBAAAAAAAAAAAAAAACAAEDBAUGBwj/xAA9EAABAgQEAwUGBQQBBAMAAAABAhEAAyExBBJBUQVhcQYigZGhBxMyscHwI0JS0eEzYnLxFBVDkrIWJML/xAAaAQACAwEBAAAAAAAAAAAAAAAAAQIDBAYF/8QALREAAgECAgoCAgIDAAAAAAAAAAECAxEhMQUSEzI0UnGBkbFBUSJhBDMkQqH/2gAMAwEAAhEDEQA/AOjFRfxhwTAm56w4jPSpQ1I/isl8DDBh3gRBCLNlDlXgQQMOIYQ8GyhyrwA8PDQ2asGyhyrwAYhEwwMc27fe1FMk+5wpzrSoe8UwyBNcyM36jSotBsocq8AdJMwA1P39/KATikksCHpRw9d44JP9peLmAgLIF2YFt2pblGDw/H58mbnRNUFO+Z3Jfcm4sawtnT5V4HZnpzPVuTwBnfiZBfLmPRyB6g+Rjzlw/t9iJc4TM7qF3/NzVqTesbNg/bTPTOKpkmWpJQlIylQPdKiCSSX+MvQQbOnyrwGJ21odo4nh/bDiDMdWUouEhkU1BKgcx8RpHVezfaOXjJKZks0VmDG7pbN8xTmIap0+VeBYmXaHaFCh7KHKvAhQmh4UGyhyrwAzQmh4UGyhyrwAzQmh4UGyhyrwMFUKEqFHG6UjFfyppL69IsjkUDcw4hjeHEdjS3I9EVhCCECIIRYA4h4Qh4AFGI452glYVGeaoDLVvzFJpQal/lFrjPEfcSVzLlI7orVVgKVuRHnztV2lm4mcfeqcCzJKGfVn6X6QmxpFnjHtKxa5k7LNUETCQnRSEOWSkp5Fn1jVMyiXfxESz5YBfT7rFnDy0i7EdHBiI7FeXNqyqHRQp5gXHMesZLCS0rT3mUCG5g6V+vnFWdLQ9CGPMunbwixJk5AWvemo+lvSAZUm4BlEaVbQve33yiWZgSnLvT1+xAnEEliXuUK5G4P3QjnFqRxNnKq/pOxY0PQ/IQADOwTHMKPcbb+EbP2Q7RKwBKi5lqUl0/JSebFQ5gN01s478RKvyqCQocyCkuPD0i1j8UMmQ7MTz0PpCGegez/aSTikBUtaSakodlgPqnyrGWjzb2Y7WzMJOStNWJCgTQhmPpHeOzPamVjJYUgjMwzJ2P0ixMrasZuFChQxChQoUAChQoeGAK4aHXDRxelOKn29ItjkUDeCEMbw4jrqW5HoiDCEEIEQQiwQ8PDQ8AGG7U45MqQpS8pyh2IJdrOBUh2jzpiZ6p01UyhUpRUWYCpeg25R3z2lZRwzEFTjugBm+IqCQPXyePOhLOzxFkkXkyX1YvYpPoRFiXIUD3UuDcMwP8+sVOHJUtQAck0A+7R1Ls12XSkBU3vFrXEVTnqlsIaxpnC+xM7EVSnIPExm5vs3xAS4UFHZ2VoKG2gvtHS5EpgwDRZ9yYz7WRo2aOFYvsfOlnvS1Urb7+sQJ7MTlAd0kfEw/beO++7e4eK6cIlPwpAh7ZkdkmcJxXZmdLHeSWoXag+6RTxaVh8w0A8o77Ml7geUarxzs9LUSyaKqRsdxy5RKNb7E6P0chlq1s3zjfPZbxpMrGJStWQTBlBc5c2gOznwrGr8X4X7pVAWL9CRQ9D/ABFTBglVC1m5HSNCd8TO4tOx6sQtxBRqHs47SHFSClZPvJTJU9zsr72jb4tRUPChQoAFChQoYArhQlwo4vSnFT7ekWRyKBvBCGN4cR11Lcj0RFhCCECIKLBDw8MIIQAaL7ZMSE8NKdVzZaR4OonyBHjHD8PkPUerAv4ktHXfbmg/8fDnT3qwepRT0Co4xJDKERZJG9dk+Ed8KFB96x0rDSwAG0jV+yeDaSlRuQ/QaCNqkGkedN3kejCNol/DxkQA0UMNaLiUmHEUgSIjmpaJsrmIZwiTQIgmWtGF4iirxmV2jG4tLxUyaZz7tVhQogb18e6HjV/+JlHMOPIxuPbNGXKRrmB8Bm+T+UagcSVG73J+X0EbKW6ZKyxN/wDZRjEy50wEsVhIHg/7iOwgx564IpQnSimiiodbtWPQMgukPsIuhK90UTjazJIUKFFhWKFCh4YALhQ64aOL0pxU+3pFkciibwQhjeHEddS3I9ERY4goYQUWCEIIQwh4ANF9seGzcOCm+Ccg9MyVp+ojh2Cw2ebLSfzEP0eO7+0ZUybJmYdITkUhJcgklQVmDF6fC0cl4Dw9sUAQxS9OgimU1jb4LoweF/k6JhJiZaNkpHkAIqzZuKxQbDp90j9ZLKPQaCLmG4b71OU/DQkbtp0i1j+LJkZU2JolIDknQJSKkxijgbn9GJE7iOHoWULZmCx6fWM1wzjk8rRnBYuFOG8uRpWMKe005cz3aZS3JbvKCdwaJBa2+ojKYSbOSVBSSCj4klnHNxQjmIsbazRWkpZM3hJSQ+sUuJ41MqWVM7aRVwfEQpD6tGKxHFFLJADgfT5Qa6DVZguIdq8QKhKW/Sx8OZMYr/5BjHCzKdBuyVBvONhV2jkyj3j3v8FkeCmr4Rfl8YRNDBiCKEVBhtr5QJP4ZqvGQnESAtLm52NlCkaFgwxPJx9/ekdNncPyLVl+BYdtAdaRz33OWZMejrLev8RZSwKquJsXYmRnxkgXGZ/JzHd0iOLezjDf/eli2VJPpHa4tpZN/spq5pfoUNDwouKRQoUKGAC4UOuFHF6U4qfb0iyORRN4cQjeHEddS3I9ERY4goYQ4iwQQh4YQ8AGE7RBPdCg+YAeSn+TxzPiGB91xAlmdDh9dB6AR1bjISPdlVgoh+qT+0aR23QkTpSkt8JDgXsYx1MJM208YIyPBT3IuTuBIWcxSCrc384o8BV3RGxSg4iiKL3+jFS+DBP5dqu9Q9YbHJSlPdHes9W+dYy65bRheKzGuQOWsSllYI5kWAog7wHDJaVqWkkjvO1O9yL86xJwxPdPjFWV3Z45/OIxJzRLxXgiZq8ywcwIqR0BsNvkIpo7OqE4TEKy2zJAZCgAzt+q1Y26V3hziOYgi8WNtopSS+DC4uTQRpXC+znvsQskOELISNCol6/2hx1cRu2NnfOK/AsOUSZqzQKmKVm/sSb+h8oksIkGryI+x2GB4pNaokoyPuQwPq/lHSI5J7KuJKnY/EKT8Cs6z0UslMdbjVSVomWq7yFChQotKhQoUKAAViFCXCji9KcVPt6RbHIpGHENBCOupbkeiIDiHENBCLBDiHhhBCAChxxBMhTaFKn2AUHPk8al2p4cFYfMgURlPlQ+YPpG+FL+Mco432gmyJ03DDKZZJSHBcJVoK84zVlimaqDwcTK8EXboI2zCm0ajwlNAeUbPhVUjKnY1MtT512jWcbLImKJSVBVQaN0L2jM4qdoIhRLc11h5ji7EfA8XLCSFAuKVoRrYxhMbipalqKSaGjAmvhryjPYng4XY1Zuo2MVBwwSwwEStgLWu7mX4dMJQnN8TB/LWJsTaMbgcQbRdxJ7rwk/gizWuLKYlvDrAdpOJnDYCdTuiWUo55vwwT4l/GB4hPQFgzFBKM6QSSwuNT5eMar7SO10qZKGHkrC3KSspqkBNQHFCSW8otir2KZStdmd9hOBIlT5pHxKSkH/ABBJ+cdWBjTvZTw4yuGS8wqsqX4KNPSNxjcsjCwoUMIeABxChoeAAJkKHmQo4rSnFT7ekXRyKJghDaw4jr6W5HoiDHghDCCEWCHh4aCEACjRO2vY1U2Z76V8RZxu0b5CKYjKKkrMlGTi7o5xwNZHdVQpdJGxFDGx4RekYTtOUyMfSgmoSvlmcpU3kD4mL2CnxhnGzsboyurkXHFTUkKQWQPjo6mOoeH4eAsAnEgEhLApCQ5uK3brGWmoCk1rGFVwAZnFOjwIuiovN2MqvBzSSlE+WQADUOavsTtGJ4giahiZsovlpVu8dxpS8P8A9IFWVfXKH82iqrgVauz6/tEm/wBDUbf7f8LHAlzJqsxACaVD1OoqIznE15UARFgEhCQLARQ4rjnPIRFfZTJmie0rEth0o1XMHkkEn1yxoHDeGrnTEoQkkqIFo3biuJRiJ6gsZpaO4P8AL85B0ag6iOn9iOzkmXhZSkgE5fiYOa6xrprCxiqPG5nuC4T3WHlS/wBEtKfIARehQo0FIoeGhxCAeFChQABMhQlwo4rSvFz7ekWxyKcOIGCEdfS3I9ERYQghAiCEWCHEEIEQQgAeHENGJ7T8bGFwy5n5myoFKqNr7X8IANT9oi0TJ6EpUCtCDmY1Qp3S/Oppt1jF8C425yLooevMRgcHjFKnErJKlHMSS5JNTaJsXgu9mFH1Gh3jDN3k7m2mvxR0zCzcwibJzjSezfaIpWJc6itDor+eUbvLTmPXWEizAYogFy/GJsThQBQvFFc7IFFRhyBWzIsdisoNY5/2g7Q1MqUe9+ZQrkG/+Ww8es/GePqxGcSSRKTRc0V1bJL3Ud7CMFJw6QTlBSXcBVX0OYm/1fVocUUVJBYVASkABhYGt+bir7x1v2f40KwwQTVJJA5G31jkhmPYUJrQM+4I6j06RvHYfFkT5Y/VmSrxc/MRog8TNJYHTIUKFGggKCEDBCEAoeGhQABMhQpkKOK0pxU+3pFscilBCB1ghHX0tyPREWEIIQIghFghxBCBghAA8cy9q/ECZkuU4ZCSsvUZlUFOQHrHTY457RJ4PEF1DAISeuUfJ4hPIazNZw87LiAKeFtPWNzkgFIjnswNNB2+3aOhcPGaWD0jHVWKNlJ/iXcT2eTNRQfekQYfG4vDDKUmegWYtMHLZfoYznCcYB3VRkJuU0EJEmarM7fkBhhsQVbZD5O8U14LGY9zPBwuGFVB/wAVYFSCfyj7rG8ScONo0ztr2gSs+4Q7IUCpQLglvhAFxU+IiaxISlZGA4likrKUS0GXKQMqUNQbqLH4j4384VywzVO1gxqGL+HlpESByFQHo7ZmYnTX9onKGG4LVCU/MuwNS8TyM7d8wJiu81Mw1oR0bfS9DF7hXE1SVpUn8pBr8ooKcsFMCKgMANNvlCnLYUua5bsXZy2n3rDQHZOGdsMPOUlAUyyBQgs5o2ZmvGcjgOGxmVaWLsoFmyl9xsY7pw/iCJyApCgoa7g7EaGNEJXzKmrFqCEDBRMQoUKFAAMyGhTIUcVpXip9vSLY5FKCECbw4jr6W5HoiIUEIGCEWCChxDQ7wAJSmDmgFSTQeJjiXbLFibjpxSQQVAJL0okBx5E+UbF227WGapUqWWkouR/3FA6kF8r2DVYnZtGKgp35E+DCv3pFM5XwJpFHEDv9dqDyjfezCnlgHaNLXLJKXYWenl0jcuzacpCfKMtRmqlkbHKwuojIYZDQMuXGP7QdoBhZYIAUtRZKSfNR5QkSZU7Y9ozJT7qWxWtKsxeqRanO8aGlZuLhgasGNWH38oZSlLKiouonPmsSXJfryAix7xwVB3o5sz7CuW+383JWM0ncZLJcu+pFTTdX38okTKAuAoEUIBob62hBTMX7qhV/Jhv0G8VZswlwxSLgakkfm2DEUhkQytwAkgmjEhzdqM+zvanOKOIxABo4LtWrkXf5ecHMxelTokEPrRm6Cph8PJYOSCok/wB1qN0vEhBYZKviNToQH8njK8M4vNlLzS1KQWc1AcUpQVuIxp5hRo1S1dC2z+cXf+PkTYOL1fvVp0D+fSC4HT+zHbaXOQETlBE4ULhkq2INgd7RtQMcClJGp6FiTX6WjcOyHbYySJU8lUstlNSUdNcvLTTaLYz+yLidOhQEuYFAFJBBDgioI3EFFpAGZChTIUcVpXi59vSLY5FI3hxAm8EI6+luR6IiEIcRVx3EZclGeaoJTzuTsBcmNK4v7RlHu4dOQH866qbcJFB4vE20gSubjxjj8nDJeaqp+FIqtXQbczSOdcf7XTsRT4JX6ATUf3n83yjD4jGLWorWoqLuSqpPMnUbCAlqKlq1o37sPERTKbZJIp8QmW2JtyApz1ijmIVdv2v4xc4uAFIHJR01J/YRSUnX7P7RFDLKxs7VY07rGxbwHhG59nB7wIWNmPUXjSkKCgxtVnoCdr3o0X8B2gm4Y/hsUmuRQJHJi7jziucdYtpz1czo/FeJjDyVLLEgd1LgFRJAAHnHNuIYtU6apUyql2GwFG6QXFeJTMTM95MYOlkMO6BcAbPu94pFaU/ES4Nkhy2hIsk1asOMbCnO5aHfFGcaNehIoL/dIIzBmORyoBiKZUuzurW9oppJW4IypJILUL3ZSteg53aLSAlLh8rVrcXADWsD/wCIiViseeQSHckBnbKNCWGgqOZYxQmTiaJzUtcVrW8STZhKqk3r1Nz4Q8mSwBGYljuKt+zQxAIktUu+pJZmHpE6jo+gBYMKljXxhLSRomwbcVoX1v6i0WMFIUtbPQEOwFg1qfPUiAZLw/CfmYufgfQBhnLDy5xamAAMQHf4SR1uG8YtTJfdYGtHDkMA1A2wiKXJbTSvm1360hAQJAI1Fw3yLneI1IDXfq7p6K+kWpgsEi29Sd+n8CGWh6tVq6A3FaUgAyPZ3tbOwqgk9+Ua5TVumx6U5ax0jhPaSRiAPdrGb9BYLHJtfCOOKFcpGU8y79POFLQx1ejG0WRnYi4ndJkKOedkuPT1CYlUxSggS8uarPme/TeFHIaUd/5U+3pEorA3UxDjsciTLVMmFkpDn6AcyaRMY577ReJlU5EgFkoAWrmtT5X6D/2jr6btTXREPkwXGuPrxM0rUSkBwlAskbDfQk6+EUZCa/7O3+oaXRzerDycPFjSl+bAN4c/nFbZYABlq49LbA71EDK1LXPjQbtRvpEhQSOfTpZ9NbQEh3c6fz+8AGtY3ELmLSXpQNYMND4PFtNR9LuRcP4esPxDDhMx0pbMlJZmuND5m8DJDWFDTepHPq3rD+Ak7sNJAqNBzqbgdaRMhQDqUXULJua1DkW5uRCCGehAFbNXQOS4tcRKkBJaxsNK7geVeUAgcxUAPgSH5rIoaU7txV9YGVLADJYC7DbT/fKDChuG+nPe5iRz+kU01cOK+bPAAg+7/l0DPdn1qeUEUqf4Q5NbM16De8Ryylw4IAd2Z9XYHqa84POxFz+5blTT1hAClBo5FybgO30b5warXfuNyrTz1MAwZgGDU8Henj6wZLly9dvJq9C8AAsHLoew8Lqd+kZjh8r3YoLsT1ZwD0flU8oDhfDKJmVscqWzXso71tZ/neChQubmpZ605nnz8IABUkHagZ/I6fdIiVfMKa8/WCXNLsC4swAdt67/AF8pk4Yt8LVcVILWAFHgAiTNAbnQWBeju3SFNSDzrvta94kQwou7bkM9mLdf4gZhDli+hFaC1Tv+0AEGVyQXKiRf9/CHKQCaZam70uOlYnQAEuE3e7BjeoIECqS5Lamoq+hsd39dIAMn2UUAZgZqS77PMZtoUW+zcts7jRA8iuHjkdJcTLt6RJG6G8ch7QYkzcXPWG/qFIfZHcHS0de18Y4nh5hIJN8xvu5qTHYL+uPREFmDhk79RXT7eLpQq7dGbe4ApoPOKMsvcsK1sObbmL6lEAfXw86fK8RZIrTlnrycEUfryLcvGDkFki1CSz7X0g5mUoLvQswoKa/OGSHYGxBDvflABjeMo74DhyGZ3NCdhWh6RHIU41CXYNctdRb9tIfjSFlYVkdNgaBjUkcnv4Q8hFHcJJCSX1bqx+cCG0laxMZjB8xpvb9PJ9ojq5YpPMtVqEloJSSW+Ek946GrsNCNd4iOUM6CGZ20JofNoCJYyHVreTVFxex8IBaqbZqm96+dhS1IeWlLAAEaHSwcE8rbRLOUas4ctXZLu+2lOR5wARS001rU7UoxGpoYSpbs2lb6nx1b1gveUN62oPB//JNOsPLND3XJ3O1Q1q0bxgAQ7pKXTZqaFWvWo6NF/B4TOxVVFQLsSHLUq3P6tEODw5UpnAAPeIFUgPQHWw6xsCZgSAALBgl6Afual4AAlDNRg/6gALb+lIhxCCB3lE83qH5DwiWYAWIAatAQSbgC1q+kAnEJA6ixINByIMICIy9d6GoILav1Hr4RLImAsAD1JJGgFYUpIs1HL0PzGnPlE6yCGAAFBsddb7N1hgRk92qgz8z0fyitlsUBROjOdQWIFLteJTMCU2Icjukj5kaeMJMsAABPIsWPMgiAAMNOYnMTTqOteu+8CqcnMasXrSlAX+h8KRYUkC7l7Fq2a71q2kMhI1FK89K63v56wAZfsur43YUR/wDv1hRT7Kzipc9mA/D2I/OSz/eusKOS0kv8mXb0iSyOgvXxji0hPxNUZlN0ct0/kx2aapgTs58qxxCTPHuRXm1tWqfXyjr1/XHoiCLAIZ3NGo1Lu/3vE2XNROgFT8g9v9RXwyDctuX35eEW0qYAh6UpZqEsBESQxkhqdXYuT02H1h/eU3NrX3ECVaCnja4FfKkSnD91jVmb/dxTeARHxZjhkmjgpPOue7jciMZIJsK7B1cie6PmIzKJYWgBbMoMU1SKWLp2L+ERI4AACUqNywoW8ymtdtTABilqSTZSamopzDVf1hpc1mIXuWIPk3V9vGMhP4OoA/iUFnSpjoGYFh/MR/8AR1ue+mjklj5Nl3+UMCsFmoKySAdNK1FOn8xZE46qdhRxoH0OtBt0ixL4OofnTUA60FNMtRTX/aPDF1qmuvw1c2oKQgIiylj4i5s1L6trQ220hsNhnKUhBJJNzy9NyeXOMgnhsxR+JNrZm1fdntFnByPdpO5HeVfugNkGjb+UADyMCmWgjQFyRYlzVxZnp4nWLKZZJD/DSrnWgYHVmu0Agkl2IY3YEaMzXtsbwwWGoL6X38/4hAAmWxqKNTkLfPaHXLFWLjmCOZtb+YXu6gUIvY02+sJSjp+qlAKcwL1cnrAA4BU7pNX6PzrZg14aZIAAdNQx/VqXu5vSEqWAL6VYJAubUL0beHCMqtgXZjozaWsB4wwBmyqEAhOnOjAgBqa/xDSyXskgGtC926wap4u4bus7kudmdiG8aRFLkErIA5l9Rro+j0g+LiG7pB0fcE+ZuKiK+OmqDISaqYXpvR9vqmLYWAlwnSxub1G8YvD5lKKmv3bltSfEv93iSBm1dj5SUJWAR+Ryaue/y6w0H2VQHmMNJd7/AJ7jSFHH6T4mXb0iayNu4h/Tmf4TP/Uxw+Q5CQBZn1tX5x3PESyUqDXCh5giOP4fg81s3upgsKoWbCtGeOsVWGpH8ll9kELDCjBjY2et/D6RLlYFOZuQ8y5YbRIjhc4f9tfXLMB9BEkzh80AfhTK7IXfc06wtrDmXkkQJuyQ9Xv8uVfWJJqHlhPLSqulLaQ8vATSotLmsLfhr7x8qROOGzCQfdTC/wAQyrHN7ekG1hzLyBHJJo/pSvN7f7idK72UevVrcniWXglA/wBJVrZFMKNdukJGEmju+7XU3yq+ZFBWFtYcy8gRf8ckClTYUNbsSSdDtBIGVLHM526ActWg/wDgzFCkteYOB3VVY3zEDeHTgJhFUzcw/tVzeHtIcy8gFmLGr110YFyXoNmO8NJmlu9mABe45OwAqIGZgJv6JjP+hTcyx+cGMJOVeWpxbuK6XbpeFtIcy8gEucRUZk1FfhcXVexp4PEoSMqnN71cEnvGrtApw8wsFS5liaS1AeIILm0OrCrytkWCSH7irAhtOkG1hzLyBDPnBNCkkM7OQQ1XFC9h5GJcLNlFNSpwO8GAZwXBe5AYRXXgZqiT7uYC4zAJLFIcDLyZqcjuImk8PUouZUwafAp3ezNat4NrDmQBSsNKIZKmFGfu3Ac5SXb76AiQE0Zw9h5X+/rAL4bNTTKrLWmVZL+IpqPCC9zPllwFlh+hRs/Itq3h4Paw+15EOKfqpoa1NfkPlEBnEqChYvv1qIuJM5J/oqUOaGLbOE7eNDDjDZyc0lYKv7T4F/u0LaQ5kBQTMFCpKVMSQS1dGcCpYRdQFFSlZS47oINKhiGN7i2sQpkTULLS5hGncOvhUU61trE0sz8yzkW1D8JerFg4ejD7vXUnrYJq3ULK9wOJTC2QS2KqBVCHUXDt/kH2cdYgxxDhNjlzaAAGmZ9fDeAkpmuVZJlFOB7tTufibu2FB5bQ83BTVVMtelPdkO1tOcKnqxea8gZjspM/qAaBBpaucwoLsnhpife5krBOS6VAfntTp6Qo5nSUk/5MrP69Iksj/9k=</field>
+      </record>
+      
+      <record id="employee_jep" model="hr.employee">
+          <field name="name">Jean Pierre</field>
+          <field name="department_id" ref="dep_ps"/>
+          <field name="job_id" ref="hr.job_consultant"/>
+          <field name="work_location">Grand-Rosière</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="work_email">jep@openerp.com</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhQPDw8PEBAUDxAUFRUQFhUUFBAUEBQUFBAXFhUVFRQXGyYfFxkjGhUUHy8gJCcpLCwsFR4xNTAqNSYrLCkBCQoKDgwOGg8PGiwkHCQpKSwpKSwpLCkqLCksKSwqKSksKSwsLCwsLCwsKSkpLCwpKSksKSwsLCwsLCwtLCkpKf/AABEIANUA7QMBIgACEQEDEQH/xAAcAAACAgMBAQAAAAAAAAAAAAAAAQIDBQYHBAj/xABAEAABBAAEAwUFBQYFBAMAAAABAAIDEQQSITEFBkETUWFxgQciMpGhFEJSscEjYnKC0fAWM0Ph8SSSosIVNGP/xAAZAQEAAwEBAAAAAAAAAAAAAAAAAQIDBAX/xAAnEQEBAAICAgIBAgcAAAAAAAAAAQIRAyExQRJRMiJhBBNCcZHB8P/aAAwDAQACEQMRAD8A6zlTpSpFKyiNIpTpFII0ilKkUiUKRSnSKRCFIpTpKkEKRSnSqxD8rbGtEfK9VCTKofi2DQuG5HqN/ktf5g5m+ztlcCHsADQb0LnC7ae8dQfQ9Fz3Gc4vdAyP78d6jfUkk2b6n6KmWemmOG3ZGzNJoEHroR0JH6FT0XFuGc2SQ4d3Z0XNa7X71uGt/iJNG/Bb3h+Nsgw8FPzsyMzm7db2AyO882/naTMvHY26kqUMDjGzRskYQWuFivyV9LRkqpIhWZUiFIqLUiFZSRaoFJCRCtIUSEFRCiWq0hRIQVFqgWq8tUS1ShQWKstXoLVGkSzdJ0pUilCUaTpSpFKBGkUpUikEaRSlSKQRpKlOlF7qBJ0A1QRcta575njwOFdmd+3kFRMGri4EHNXRrTRJ9Oq8POXPUcDWsie1zz7zqOgH3QT4nXyC4zxnFyYmd75JHSvNDM49wHwjo3wHeq2+mmOHt7puMPmZb3W0lzyB8Id4DuFLAYnEErI49+RjIma0Ghx8dyse3Ck616Kk01sr18Nxfu11/RZpuLIaCw2B02Ow6m73KwOG4c8H4TrsFlMLwyS6H9hVti+OOVbLyfzi7BFwzdpE7V0ZBBYb+Jvf10G665w7GsmjD45BK065h1sA+m+y+f8AHcLkYA7K4gb9a8uqyfKfM8mGeKccl5XN+6b667OG/jSvjl9M+Tj+3dqSIWP4BxhuKjL29Dl8DosnS0c9mlRakQrCEiFKFRCRarC1RIUiohItVpCiWoKiFEhWkKJCCotUSFcQo0gzFJ0mhVWKkUpIpAqRSdIpBGkUpUikEaWu87cxDBYZ7y0vJGUNAFHN0JvRbJS4D7RuYX4vGye8exiJZG0E5RrRfW2Ym9fJRVsZutZe6TFShjRrsBewvqt04RycxrRfvP6k7elry8o8KppkrV3XuHct0w7KpcPJnd6j0ePCSbvliouR4jZdqT9FkoeS4RVN+iy+GGgXuhIBVZurW6YT/CMO+QWrTwKJo/ywfO1nnV3qmSlNxROStdm4SwWAND0/5Wic08tmImaMabkDT19F03EBY7FwB4LSqY5XC9L5T5TVahyLzk7CuyyEOjedSda6WfJdmgkzta4EEEAgg2CD1C+d+NcMOHnc1ugJsd1HcLqfsl4g+TDSwvNiJwy+AcNR87+a9DHLbzeTDTeKSIVlKNLRirISLVYQlSIVFqiQrSEiEFRCiWq0tUSFIqIUS1WkKNIMrSdITpVWJCdJ0ginSdIQKkUpIQRpfOvM3D8uIma1paHTu37g4619fKl9GLlvG+X+0x2c6i36aVmLzfjs4f8AaqZ+GnH5VYDAdjBCPDX+I6r2Q/Re7HQfsXDuoj5BY/Dv6Lg5JqvQ47uMnA46L2Mda82Fo7rIwxCr6qcezK6NjLSfCe9W3VKTlppn8qx00ax8zNQspiXWsfKNR3LDLy1lavznwsPi7RvxN19F7PZNiaxEkewkizdazMcL176cCs5Pgu0icKuwVhOUo/s/EsLF39oz07J1evT0XVxWzpzcurHT6SpTpKl1OJAhIhTSIQVkJUrCFEhEKyEiFYQokIKiFGlaQokKUsinSE1CQhCFAEJoRJITQpCWquObG4gVYjoE9LcMwH1Wy4vFshY6SV4jY3dztgtX41xJsM0eIZLE7DTkNe5rrILR8WmmUDfuVbpaSpYmPM5g6V6brXnBkbnAmqJHkFkOJ8cZHHPIHA5G03K4G3E0NvFc7kxhc9xmec7jeRu/+wC5eWbdnB15bh/iSFhNyBe3C8xscRTwubYiCM29pa/XLTcQ3tAauq7Mgmulrx/bcp9wuBGmV9Bw9QaKpMPpvue3ZGcUBF2sfjeZo2AkuCxvBqkgBN3lBu29R4laDxPGntZGg3lcW9QNDubUTdNSN6/xn2hqNjnd5AcR9AvS3jWUgyAhpI1oivmFoGFx0cYIlbJK/LbR2r4Wk9zA0HMeutBZP/5Ux5Q1rwHC8jy14LT1Y8AG/AhTlx+yZS9OrYDKQDdgiwfosNHC13GcOxjS7swZHOAJaD2b/vVQ+IdeqwXDcb2kboWuMWe8ktuc+Pb4Gn3Xb9dvFZfi+Gdg54Z45DHA+Hs5ACRmLGl1106m/Na45TW3Llhflr7b+yZri4Nc1xbuAQSL2sDZSXMvZ3xOWXiUhkJZG+F+WPSrD2uaT3uy5tfFdOW3Hn85tlz8P8rL4/ttGkiFNKlowQISIU6UaRCBCRCmQkQgrISpTIUaRD3IQmoXCEIUgQmhAIQhBpXtYxMseBjdDIWftg19AEOYWOGU30ulo/IUjH4qpGAOui3+U28Eb7Vqumc+cO7fAyD8JEnoNCfS1yLDA4XiELhdZy3N1c0kiz3WuXO65P8AD0eLGZ8Gp57/ANPTzRgOxkMDHyTMsuaZcjng3ZogDTdYGHhxlLpC9rPeALCDbhV6EbC+i6JzBh2vyOOjr0P5enT1K13E8H9+x7l7gnT0OxVMstZIwksjD4HlnM8Znjsw7PlGYgnvogAGtLJVvFeAxtjkewOc7xIEbbP6eC2DC8JJ0L9O5pLj8m2pcZwVMa0tytu8pqyQN3foPHXXaLna1mGM6jZ+U3tGCjawe61gbXeAOveVp0vL0QmxAe3Oxzy5gqsmYEkWfiI0rurzW28qwlsJaPwql8Xvua8Ag/36Kt3pEmsq12fl2F2VxBsUNHkbDqCD+aubhmWA2MED1s7dVsI4MNw6x+8LI9QRahJhGjy65RlJ8Lux6UotuvKZrfUY12CDcoaBTRl02L3EFwHlTR5kjosjzxiAzh+HvUiRrSPB2hH1+i8804zsAFAEaDYAeCs4vxBr8VBC5uZvvOrcW6NwHXvTD8ares8d/Z8sYb/qcNK0b1t3EEH8l0Janyphw+YvaPdhZ2YPQvsg15W4ei26l1fw81i5/wCMy+Wf9oilSkkt3GikpUkgiQokKZCVIIJUpEJUg9SaEIkJoQgEUhCAQhCIKSMOBa4ZmkFpB2IIogriXM/BXwYt8BuomPnjeQ454mtLmtDvxaZfMLty1/nfhva4OWRjC+aJjnsDRbzQvKANTrRrwWXJjubdPByXC6+3NpuIOmw4J+JoF+IHX++5Lh3FCS1pKXBZGvZEd7zwv0N20VlPiF43YbsjJ4HRc+eO+3Vx5avxbjheIgClg+N46Mu/aHQAkNHU7C/ALyQ47TRYTmuGw2t+u9/MbLPGd6dF1Jt0LlrjsfZ1YNCl4+I8aiM2UuPU2Nmnp5rmXD8XJE0tzEjbc35X1V0GCfPO1ziTqBqXZQO4Dy6rS4ssbLduuYXiFtFaqvFYixoFF8Aa0FmgoDTovBLN0WNrSSKWOzSt815sY+8cw7ZdMwHc2638F7sFFbr2Wa4By3HPNLJK3MwBtCyAT1JrcLTDG3qOfkzku62bgWGDYWv6yAPPy0H6+qyKGtAAAFAaADYAdELtk1NODK/K7KkqUkirKopUpJIhFKlJJBFIhSKSD0IQhEmhCEAhCEQE0IRIQhChDWeeMFbI5wNWHKT+646fUfVc54tH7zq2IXZcdgxNFJE74XtLT3i9iPEGj6Lj3HYjE50b9HscWHoNP6iiPNY8kdHDkxTTkIJ2Xi4liw67IAHer67RoHXZY3GcHFixm8Suaa329Dyrie3bN4rPcHxEbdc7b7jofqsNDwGJ24yn92xfgslByvCRs71e/UeVq2Vx+15hGxt46NG3ptujt7s9FjYuW4qGVvZkbFun/Kte7swW3t9VhuXwjwyWDxNfNb/ypERh+0P+oS4fwjQH11Pquc8Bw32nEwRfde/Wt8rQXOr0B+a68yMNAa0U0AAAbAAaBdfDj7cHPl6NCaS6XKEk0kCISUlEhAklJJSIpKSSIXJpJokIQhAJpIQNCEIgIQhALmvtWwAEkcw++3I+uhHwOP5eS3Hm/mRvDcFPin0XNaRG0ms8h0Y31cRZ6C1y6NskvBY8RM4y4jEPfi5Xak/tXVGQO4MawV0F9yrnjvFfC6rWIJyDTtDdHzWUZAZK71rzpDfiNPMLI4HilV3jcdf9wuPLHfcejhlrqs7BwNxO9LJwcHLfvBYtnMHu0DqoQ8xENp5s+GyysrXbK4lhYND0Wu8QxmtfVLG8dLvLu71i3uMhs/7K2GGu6pllvqN19muIzY3tSKY0dmB3ZqBPnquwLlPs6wNU8j3C41+9lNH06LZOTOZB9pxvCpXXLhpSISd3wOaJGN82B4HkB4rt4p+l5/N+Tckk0ldkEIQgSEIQRSTSUoJJNJBcE0k0SEIQgE0k0AhChNO2Npe9wYwalziA0DxJRCaxPM3NEHDYDPiH0NmMFGWV/RjG9T47DckBaNzZ7bIos0XD2faJNu2dphwf3R8Unf0b4rkmK4rLi5ziMVM+d4FlzzsPwtaPdYNtAAFfHHflOmV575ul4g8Ol90E5mxA2yKMfCPFx3J/QBbZyvic+BgicdBEIx5N1Z9DXouWYiYve5x6/wB0ui8lvzQQMOnu6ehI/MFWy7W0x/EODkh0jBq3SRg3Hc9o6jvCwmXVdJx3CnipoxbhuOhFajx0+nksDxPgjZwXxjs5eo+67TZ373c7qB3hcuWG+42xz9VrTQVZ2aoOIMTyyQUR/d+I8U5OIt6brCyt5U+qz3L3AnYpxr3Y2kB7+g0stHe6vlv50cs8syY17XH3IN3O+87wZ4b2fla6lhOFNjYyGJoYwbDoBuSe8ncny7lphx77vhnnya6nkuFxNiBcBkiY3IwdzW/rr8yuSca406HjeInBLT2jWkjQ/wCSwb940+S6/jwBTOjdT+g/vvK4LzHL2mNxb/xSuPypv6Lrw+3O7xyrz/HiKgxD2sn2a46MlHSugd4denctwXzHw2ftIsp+Junp0Ky3COfsbgXARzmSMf6ctyR79L95p8jWuytcJe4rp9CoXN+C+2yCSm4qB8Dur4/2sXqPjHoCt74ZxmDFNz4eZkw/ccCR5jcLO42eUPYhNJVCSTSUoJJNJBahCESaEiaBJNAaknQD1Wr8e9pOCwYdcv2iQf6cNPN9xdeUepUybG0rzcR4pFhmGTETMhZ3vcGj0vdcY497Z8VOHNw7W4NpsAtPaS10OdwoH+X1WgYvGulkMsr3SyHd73OfIfDM7WvDZW+P2nTsHMntvjjJjwMJndsZZLZEOnut+J/rQ8SuW8d5nxOPfnxU7pe5llsDP4Yhp6mz4rFF6rEutH0/orTUTpY8ql89NyjqbPpt/VN8q8zgiVkOq61yNwsS8Kw8rdHxvnaSPDEP/Qt+RXJcPuu1exvEB2Bni/BO7T+ONrvrr81XIZvB4nLo8aH+u48jr808TwJpdnYPddvXz0+hCyLsGLcz1/3/ACK0DnDnjK88Ph/y2ktnlHU9YmV0H3j413ql67hO+kOZMHh5XGNjWzvHxOGYBvQlrmiyfAaA9VheDcv4ZslPbNO7MKa1ji3S8wdsBrW/is3wOCPEV2W5GaiQKa3Ld+pW4cOhELczmRushtFpIBYXDRw2B8ugXNbbd1t4mou5blqNrJomxS/CA03G4hoOUaCjqLHdse7LSzdmwu3J2/T+vp4rjnFuK4iSd/ZyvawNy2CW/BVuB6EloHiQAuhcn8zHiDCydvZ4uAASM0p91llaPwnqOhaRrut8e4yymu3sdhHPIBO5zO8hqfyK4BjX5pp3d8steXaur6L6UkeI45pTsxj3ejWE/oPmvmOBxLWuOpIzHzOpWuKsXwTljg5u/wBCO4r0zTBxDh8uoXhTa+tldK+VWYbHuYQ5rnMeNnsc5jx5OaQV5JH5ulItTsdB4L7W8ZAA2RzcW3/9RUnlnb+oJW7cH9seFmOXEMkwjtBZqSE/zN1H8zQuEh6k2UprG+ldPqjAcTixDc8ErJm97HB3zrZehfKsGKLHCRjnRvGz2OcyQeT2kELc+De1zGwU1724to6TCn+A7Rv6gqnw+kad2SWkcue1vDYyWKB8cmFlfTRnyOhMlfC2Rpuu4ua29Oq3cqllnlC1aF7Q/aUeHOGHw7GyYgjM5z7LIwRoMo+J3qAPot6fIGguOgaC4+QFlfLvMPFnYrEvxDvikcX+V7D0FD0VsJ7qY9fH+d8Tjie3mc9p+4NIh/IND62sC7EEqtACttfSWYphIJoFaTxog9D6IfsgrfqoEqZUCoE8Puuq+xrE/wD3oxuOxl+eZt/+I+i5TCdVvvsokeeIPgjcI+2geHO6hrHtJLR1fTnV0F3rVJ6RXS+JY04mcYPDOLXVc8rdom6e4Dt2hB9B5hYvjPs5jbhqgvMw5gNCbyHbv8lueE4cyABsbco6ndxOWyXHqTvani8S2KKWV+jGNL3eTQVSdVG3BuBYZ32qKNlnMRnbWjf2gDm1ppemp7l0zjfFI4YZnOJrLlbl6ENc0igdPerodlg+T8QyYzYgRND5HAvJ1fq7M2MC8oFkdNa1KxPM/C2RcQZiG4cFuhlYSxzHte4x3TSQfA3pS5rd9xvr1Wb5E5S7aNk89lo+FulOcScxPhdUto4nyUwuZiMM84fFR2WSDUG2i2uB3Yaoj9aK9fLEzfs7YQ7NlFtNVmjLvdPmLo+NHqsvOfd+Q+YW+PjpjlbtpXMHMgPC+JxSDsMXHhpQ6M6WHNyiSI/eYbb5XquGgUAu6e2GGMcLlkcwGQOiYx1e8M0wBo+VrhhWmHgJRtNRpXSadqIKY3QNAStCgStFqNpWgtjmILSDRDgdNwdKI8V9N8r8W+14PDzn4y0Nf/G3R31F+q+XM3xeYXafZLzPGyDEQSuDcjmSNvapGkED1Yfml7xVyb1zljOx4bjpOoheB5ublH5r5kxB94eS+gvaxisnCpgN3vij9C8E/QFfPeIPvlMfxIrKVoedUgVCyaSSkpAQo5rCkSq+p+aBFQcpqL1AI1t3s4xPZ8Y4c66DnviPiJIJGgH+bKfRahGszwLFdlisHIPuzwn0MrQfoSg+mm6n0/8AVab7UOLGDAOiYSJMRIIBXRgOeQ+rW5f51ubPi/vuXNPaRiGyY6KFxrsmB4F0C+R3lqab9VlkjDy9XL+BZhsLFTrLm9octZg5uUiqJ6nQV0TxPCftEmZzi5r4zG4nKHe+MzSGhoHukA66r38PjaIWMf8ADmFllk0AaurO9XSpfgyJmvjzdnmboS5ttreiASAehC59zW74+mvv92I5RxMzHzYad5bJCS+N1Gs/VpDWkljheg710HB8QbiYIpWfC7p1a5pLXNPcQQR6LBsiaJjNqXUc597KANhRAG9VV76lWctfs5J4rJDnCf3tHZ8oa85aFWAw6CrtaYWzqqZavbEe22WuGsb+KeP/AMSXLiRK697dpv8Ap8Azvnc70EB/UrkBXTj4VgSKaFZJJBDkIGkhFoESolyZVTiqgHwu81l8PbmNLXFulGuqw7fgPmvfwzE00hWxvaK7d7apSMFhm9HYjX0heQuF4g++UIT+mIxVSFIFCFCyTVNCEEbUH9PkhCACUiEKBCNeiY1G8g0QCQRuCBYKEIPqThkuaOFx3dGx3zauTc2/tOL4q9swbrrWWNrRXy+qELDkW4/Le8NIJMoa3s6ZVjLdkij8PTXe91ViMSI3ODmCTM0USG2KLxvXWwdK2QhW1Jza/wC8M5f0bXtiJj1ccxaGXrQrqG3vZ+gVWBlJx7Sa1a9umbai7qT1QhcfHld6b2NJ9uWIJxPD4/uiGWT1c9jdvJv1XNShC9HHwxJCEKyS6oCEIGVBCFARVLyhCgH3B6oidVoQg//Z</field>
+      </record>
+      
+      <record id="employee_jod" model="hr.employee">
+          <field name="name">John Doe</field>
+          <field name="department_id" ref="dep_sales"/>
+          <field name="job_id" ref="hr.job_marketing"/>
+          <field name="work_location">Grand-Rosière</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="work_email">jod@openerp.com</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhQSEBQUEBQUFRUUFRQUFBUUFBQUFhQXFxgWFBUVFBQXHCYeFxkkGhUVHy8gIycpLC0sFR4xNTAqNSYrLCkBCQoKDgwOGg8PFywkHBwqKSkqKSksKSwsLCkpKSwpKSksKSkpKSwsKSkpKSkpLCkpKSksKSkpKSwpKSwsLCwpKf/AABEIAQQAwgMBIgACEQEDEQH/xAAcAAABBQEBAQAAAAAAAAAAAAABAAIDBAUGBwj/xAA+EAABAwIDBQUGBAUDBQEAAAABAAIRAyEEMUEFElFhcQYigZGhEzJCscHwB1LR4RQVI2JyssLxJDNDguKS/8QAGQEBAAMBAQAAAAAAAAAAAAAAAAECAwQF/8QAJhEBAAIBBAEDBQEBAAAAAAAAAAECEQMSITFBBDJhEyJCUcFxI//aAAwDAQACEQMRAD8A83hEBEBGFRcIToShGEChKEYRhAIRhGEYRIQktvZPZapWG+4inTtDnAy7kxvxfJdBR7I4Zo75qOvmXMZe3wgEx4+qjI4WEgu4/keCNt2oMripMyJyIVrC9lMDvd41jyJAjLg3r93TI8+Rhep0dhYFmVHem0ubUd0z6cFG/AYJ1vYszGTCPkROt0yPMIQhej4ns1hHghrHNiDNLenKfiJB8tVg4vsSZPsKgf8A2PBY/wDQ9bJkctCSuYzZdWkYq03N6ix6HIqqQpDEoToShA2EoToQhQGpJ0IQgEJJySIQQnAJAJwCkABGEQEYRIQjCICMIha2TgxVrNa6d2ZdGYaLkrew+yMN7ZzgXOptiKbyCS+xgkR3Yc3neFX2LRDKL6riBvWHGARPnfyWX2Xxzqj6zjlvGD1IJ15DyUJdlVx5NxbQcAIyA0FvRU2PeQXSbi9zrx8imRvCBynmLOiZTi6H2ndgjTgNDnHHnyUAjEuENBmPdJib3AuJiQoquOJIhxygRxtJt9OJQqnu2tcWPP1BtpZRvYJPQZ6QAeEjP7ugl/jqvvBz72s4+M/eis09r1SPecYOsTExBn5dVTY+CM8sgIgicgeaayuBE2zzHP8ATrkgvHbTyc7cMom59AfXil/OnERvC1r3mMxObf3WW/ei3GJyA4ffJRj4pGUQeeufVB01Pa26DvSWmQfiBnjxPVZeL2JRrDepxTcfy5STaWaDp5LKNYtsJAIkkER0jLNTUseZ3rTIiJB6+nogobQ2FUo3cN5v52neb4xl4rOhdXT23G8CQRMQbGLz1nnwWXtWgxxL6Td3PebNuO83lGY5KcjJhCE6EoUhsIQnwhCINSTkEEQCcAkAjCJJFKEQEQSMJQp8HR3qjW8SAiWnt+r7DAgCzvZwePfuZPTeWZ2IoxRLj8Tj6WS/ECsdyN43eGx0k/ULT2RSDcPTa3ukNF+ZGnO6jwjy0WOdp1MHqb8PVJ1Tee2/9swORtdPNSWuhwMNAga3vrn55Jlal3oiLjdvkYABgeN0SjfmQTPeF+kifVCq0uceYuBaLDThF09rIDpOTj8zYD795RvqXufhniZIEQoSY9pBbc717wDqYE8EH9OJm2ZuZMKRrbtIjObi+YJ58PNNe+0AC7r3jjYRqgjc838iQCToZ5C5TXgTY6ax4g+SfUqTMETaNTkLTPX7KiqgwM8rxOdxEDmiEWUHOWzy5fNQlwEzwPpfPQQnvMkEwInQAxzAvqq7wIzN79RcmfvVSD7QZEiLGPCJ1UDsRqLxe+Xj6+aFarl0HISTkqz32Pl4qBaqATLcjccuR5jJNhNoGWzzP0T4Vg1KE6EoQMhJOhJBCEUUYRAQnAJIgIkgFe2R/wB0HgCfSPqqYV7Zebug0nWUGZ25YSxjuDgDnqNdNFvbMqf02Otk03mAfdjyVPtLhzUw9SIsQ4WnLeNj0J9Fb2eQ2jTGoYLW1Av5wo8I8rzWSRED3Gm3p6IvaQ10/ERBj15ZqH2sCJBuLnOQIOmSbUqHdGfxAExu2AvOuSJTPw0F5mLjI2nIfOfBMqaZzunOYBAPK565KH+Ic7elwkxrzBNrxnopg7dcDvADd0JPw5+o8SoBbQdDI/MYyHA5c5UVVp72d3DTre1lNTrtAbJuLujd/NyJA/4KipuaQbjMAXnjPLh5qEq9VvvXMcb8OGWaiNt2RwmLHMzHkdFdrtEWkSL3EZZeQz5Ks1tmm13HgeZN0QpucJBHHiM7a9TkoajsiTOZAEWz/VSVsKYEXvyIvefvgq1SiWgeP7AKwjrgESMx6eHiqjnQIH39yrBfMi8WUDwkoWMDiAd5mrb+djby81ZhYmwqv9Z4OZLvqfot1SGwlCMJIk2Ek5JBBCICQCIQKEUYSQGFe2b8XQfPRVsPRL3taM3ODR4mF2+wn4Wvv4b2RYWyA8hveOU74uHcj+yzveK8N9HQtqRMx1Dl8TjWtmTaLgxfXLrfwUOyalOs4spvI3WmRY2yAAnIQPRZfbzY+IoVA192H3XNyPXgVR7F7IqVMQNwkbufC+YPHRTFoxlnNJi2127djNMBxJiZkkT1A8lMdmUhaAbEjeJMcLSfvyVzG4V1M9/ugwC4Tum+X1hRuYSLgGIPAAHS+d+PFItnlE1mOJRfwNPds1oI5Dw00Q9g2fdAkGYaJjL5j1UpbNwC0EEOztxy8DZN9jYgZi4sbDW3MNnwUIVjh90nutEZ5X8Iy/VDcAyA7wv5yfpZSveW31yO9mZzN9FFXLBZz2NmD77Zvr3Z4RCJJ7RfutMcQDIHGRbxlRP3TbdHhYZaqB22KLf/ACX4RPpaf3QbtehIh5ANzIiD/wAc0Qe/Ct0ka5mZ8R9yqGJwJbqHAcbHSw8Z9Faftqkbh7dJzuOMfead/GMd7rh148ZUjEqDiIiMxeL5qpUaIEa8PvktvFYQPzzOULJxWHczO4ynIjqFOUM/Yzf+of1d8it5YuwMN33vP90dCbfVbasg1JGEoUAQgnJIIAE6EkQpSQRASARQWdm1N2tTccg9s+a9C2PsxlGi91TWTPif0XmwXfbTxLquCp7ubxTJ8Rf1BXPrx1L0vQ2zE0/yXJ/iDtH2lZrWvD2Umb0zq4m3WwWr+FmzRDnamTKxtvdnvZURWcSd5wDuAgOMfJdp+G+BNPD7zhBqd4CMhp+qzmcUVtX/AKy39p4YFhBC4/G9nyJNNxbxg2jpku7xzO6ei4faYmd48dZHkVnWcT20xExzDl9ourUzHtTyEibZLPrbTxJze7TXhkeoWhjdl73u1GjpLfkVi1dm1WZPt1ldEW+XPNMT7S/qOneJM53N09mEPkpMNinAw4StWk0G6ra0wvWkSxTgyFFUw5hdFUoDgo/4UAKsXTNHJ18M7mq289mR8/1XVVvZ6kDqsrFBnEFaRaWVqwGB22cj6/rqtUVmvFiDeP8AlYWNwQFIuF53cuoVvB4N5pgz3ufDmtInLC9MNChRDRDeqfCqUsWZh4IPnKuK7I2EkYSQCEkYSUiBOAQATgiSRCQRCAhegdhKja1L2biA6kciJlrjIt1kLz8LR2HtY4esHi4ycOLdfHVUvXdDbQ1Nl8vSO1XZ2m/DOpxDC5rjBNnBwgwdInzUuzAGMa0ZAAJuL2qyrh2mm4GXN18boUn281xWd8e7lsC4hcx2g7G060mXN47piVu4SqtB9EOURBb7XjuO7B0WhwBdvH3XEl0QsnZnZtlMOFUudmW7sggxnvEC3LJetbZ2U1wNo5yuUxHZ0k90OPVafUtHEqfTpPOHF0MBUmAJiLzIz4rpMBsYyJ1XR7J7IlneqeDRkOvFaDtnwbcVWZTDmamzN0GdFym2sWGEyeUBeibfobod0BXA7Uwkm7RyMT1SOJTbpzdDEtquLQ182tLZMkNAEm5lwsFbZg6clsua4WLXCCOoK1cFgAxwe0br9DAMdJt4qSpskOfvvku1Op5dFtN4xwwjTnyxsRhCwNzLS8fVaVPJWNoUp3RoDPkCPqo4WmnOYy59aMWwaknJQtGRiSKUIGwkikiEITghCKlIohBEICigE4INHYVUiuy9r28Cu/o1LDw5LzvZX/daeEnyF129GtLei5Nft2+n6b1B60GVbWWDh8SIlaeGxIOqwiXZaMwmrUic0KVMDhxTzUssfaW1S0GBc2F1OcM9szw13125KI0p6LP2bjKYa0Pe0Pde5uVtYOmJzmL2V68k12ub7XWa7wC5EskQRIXX9o277Hk6LiGY/dfuv1Ej5Ktu1scLNLCBOqUBCs04hQ1nRKonDDxnvRwUCkrOlxPNRrv04xWHl6s5vJIIpK7M1JFIoGpIpIIUUAnKQkQgiEBCmw2HdUe1jAXOcYaBmSoguw/DbBb1d9Qj3GFrf8ncPAHzSZwtWu6cK2B2QylXaxzt+puu392NxloLZzce9mpsFXglrs2mD1EhQdlWmpi8W5wvTd7PLXeJP+n1Um1qXsq4f8L7HgDlPl8lw2ndPL0tsUj7Wvh3cDOh/RauGeVk4F4zkH5HotqkFk13RhLVxFlBgqAed4ieEz9UMXiGtzi0eJ4KHD7VDrNMnkcuqRGZUmTO0PZCjiQ0uEObkbeSxf5zUwXckuAGZJPgSb+a6HFYnu997Wjm4D7C5jalNlZ4DarHATMOH3C2WrumEVbtZ7VhbHvZ8ljbRoBzQ5ubb/qpccKDXbrajeFspyzyUP8AFMMtDgTunIg6HyUTCszMLmBxXcuq+LxljGeSL+60HKWieqoaqNOu6ymrqbahCUIpLueYCCISKAIFFBAEUkkEKKaE5SEnBNJUNTHNGs9FIshel9kMAcPRbve8477hw3hYdYhcl+H2DbWqh9QAgElo/wAY06keS9I+LqqW/Tq9PT8lR2zGUqlU0xHtne2PMwGu+Q81i7ZwYqMc06/YhdZ7HebBzb7p+axMXSgkOEH59Fx3rMTl2RDktl44iQ6ZYYPPgeWq6LCbVAFuvVYO2MEWO9ozMe8OLcyjhcUHtG6Re8C3SFSVOpapoCs7vG3Dqnv7IYUSQHga7lRwnnY2UWz2u4ff1TsRinsGSROGsSz6vZrBgzvVmn+6o48dSVlVuz9GT/UfGnf+dlLtDalUmGsnwlZDnVibgdIWu5r9WI8Iq+x6e+Qwlw1Jk+F1bZhmshrQAI0RpggXUJeXu3W5nM/lAzKrM7pY3tk3aGM1MhgO6XAGAYsCdExlQHIrdwzhSbugS0iCDBnrOa57aWzxd+HBbF3UvhPHcIuw8sui6dOIrGHHq0tblKUlg/ztzY+JpEibGFew22qb8zunn+q1w48r6SDagORB6JKEkgiggSSSSCuXAZqniNpgWbfmsqpiCcyVE56vhXKzXxxOd1E+qoHFAuUj1L8JawvxG/6ln7eS9CxNnTovI/wqxobidw/EQPBwLfnur12q6QQdPsrG/b0vTc0W6DpEqPamz/aMsYcLgxl+vRVcHX3bHJbNN1vqq4zDWftlwGIcTvMcIc33hnbiOIK5fHYd9F+9TmJkt48SF0vaTtjgHVxRbV/qSQHtBLWn8rnDME8FSqUi4Qd13HdId4x7w8lzTWayvMReD9jbea4AtgmDI1nWeC6RlVjxcDhpdec4zZoDt6k4sd5g9eKFPb1ekIcN6LS10+majET0yxNZ5d3tB7GtiAPBYeLrt0+i5iv2r3vfcRyIIVLGdqhHdl3DQeZTZMp3Q0dsbSDRAzNgNSeSk2JRgSfecfv75rkX7S3Xh9Yy4/CL7reJBynhnquw2PimVADTIPT6jRbRTbCsWiZ+VzH1Yaeh/RV8C6Gm0TfqOIUG2sQLN8T00+qr7NdxM8OQVl8cOT29S3KrwMg8kdHDe/VUGV1s9rG/1Xf4s/3Bc8uis8PL1YxeV6lji090kdCtHDdoHj3ocOdj5rABUjSrMnW0NuMdnLfUeiv06rXe6Qei4hr1NSxJBsYUbVsuzSXMjbNT83yQUbZMqxKaUEldBBBEIDVBqdnMaaWIYQYm3jmPUBe9txIqMZWb7rgN7lOvgvnJjogjSCvc/wAO8d7XDOByMHpvXI8w7zWWpDt9JfEzDSxjSw8s5Hz6LmPxN7Tvo7PDKRLXVXbhcMw25Inw9V25w1t12Wh4Lj+2XZY16LqYzmW6wRkRy/dZw77xurO3t4dhCd8Obm0gjqDK9Tq9uxjHUvbsbTe1pDqm8BvuhsCTE3Djc/Frp52dkvpvh3ccDEOs13R2RWqymYuwyfeYcnDix2RK2mImHmae7TtnDsNoVmES10uvl397xb9f2XNYjGFy2uzu0wyKboh3uPjdM/lfzWfi6lOnVc9rd4ky0RLWnVxmxMzA0zPBc9tLnh3fUi0ZU6OwnP71TutiQHfF4cPmsraWLZTdFKHOHxQIb0581a2ptOpUBDbTmSblZAwu60kiePCdBzV60x2x1NTxRn1CSSSZOpOq3OyNR7K4cJDYO9wiE3ZmwKmIeLBrczpA/Wy6ars9lLdpU8yAXnlo36+Cta0dM9HRnO6SBNRxcdfsBOwFLvkFWMPhjCs4fDQ4nksna43tUP6j54U/qufXQ9rD/Ud1aPJs/Vc8t69PK1vfIBHeQhJWZDvIhyaigl9qUlEkiF5FNlOCskkm5pIOzQJel/hBtYCoaTj70i/PvN9QR/7BeauC0ez+0DRxDHC1wJ4XBB8CAomMwvS220S+kGU1DisODEgHiOI1Cbs7GirTbUGT2g20Oo8DKtHJc71Ys5HtbsajUxVP2bGubWa/epkRJpxLgCLG/jBXMY78PGi+GqPZM9wkiOQORHVel/y5jqgqEd5s7pkxfMxMTzUWKoCZjPPgVJivEPI8NsupSLmVwT+VxzkdcrKpjcJF16N2twwGH3jmx7I1zO7E56nyXDY+IM/OFrW3Dl1KYt8OTxL72W/s/Yg3AH6d53U/YCycJQDq/wDa3vX14eq6nAsNR4baLE89VS88tNGsTGWl2XrDCNe5zA4kSBxDrNB6xCr0NnG5cO8TJIWlicKPatkTAEeCvswt/wB1l26orEcshuE9U91DdBWpWwigxbAGnkiXlHap01T/AJO9ICxIWnt981vCfMkrNhdMRw8S85tMmpIpQigJJwCUIGopQkpFwJwQanKUmpP/AESlJwsUDtExpTgU059UHtn4V7Y9rQNMm7bjxs71E+K7hzF4V+G+2fYYoA5HPobO+h8F7s4rG0Yl6GjbdWAAumlpjROb4JuIqBrXOcYABJ6ASfkqtXFfiRjIoCjTP9R5Du78LRInlJy/xK4w4emwb263eAjeIBd5m60NpY41ar6js3EW4DJrfAALBxlQklaxGHPa0XlXwfeqnK4K7HYmEh3l8guIpEtcCNF6F2WqNqAObykcDqs7x5baFsRtntfxGH77VpUMPCjxLe+tLDe6FR0TPChWp2Kytsd2i8j8p+S3sYLLne0tbdwziTpH1+iImcRMvGdqP3qzyOMeVlVIUj7kniSfNNq5LpeKiCdCTQiiACUIooGwgnwggtBElAIlSkCUQE1OCANyQqIhJ6CbA4k06jXj4TPUajyX0P2X2j7fCsdMkDdPUa+IXzg1eufhDtuWOouOnd6t/wDkj/8AJVLxxl0enti2P29Ka1ZvaEOOGqgHNpy8ytP7Ko4lkyDkfqP0WTtxl4y7Hb1Wqwf+PcHiQ4u+g8E2sbQoMNhyzHYym7NtT5FwB8iFYxC1xnEywraaxatZ74n5hQqtutzsdtL2dcD4XGD10WI6+Smw003B2ocD6pbHSNOLcW+cZ/j1Vxl0rWwjAQsXZz98A6wCugwgssHbbpn7Rb0XE9vsTu4YjKxjxt9V2m1HXtK84/E7Gd1rOMfU/QK1e2etO3Tl50AmV/qpAFFWNwt3kk0IkIhJwQNSRSUBQkkkhhYSKCBKsCigE6UAQqFEBMqoDkV0PYna5oYpjpgSD1jTxBcufenUKpa4OGYII8FEpicTl9QNeC0EGxEiPPRQ1c+qxuwm1vb4NvFkN8Ilp8reC2K0yLeqwl6tcTy4Dtn2dDMV/FMiKrBTqDLvtgtcOrRH/qOK5DHu0Xp/bgzhJ4VG/wC79V5biLuWtOnLqxi3BYZkXUWMqQrVMWVHGuupxhE2m1cZ+cf16p2ccTTaeQXS4U9391zHYx4dh6d82jgulpjOB8uqwdszlR2qJd+y8e/EXETiQ3h+w+hXr21nQQfkvDu1mJ38W8nSB9fqr07c/qbfZEMghV3XcrBNlWp5rV56WEnp0JrygCCcggakkkoQnKCSSkFP0SSRIBQ1cwkkiEkoNSSUj1T8HMU4+0act0+hEf6ivScUIARSWF+3paHthzfbQf8ASP5Fn+oLzTdukktKdM/Ue6DnuWbjSkkrSwjt6V+HNQ/wzerh6ldi2nL78AUklzvQ8MXtI7d3o0DvkvB9qPmtUP8Ac70MJJLSjk9V+KpUNvBR0Uklo40rk1xSSQJNSSQNlJJJEP/Z</field>
+      </record>
+      
+      <record id="employee_jog" model="hr.employee">
+          <field name="name">João Gomer</field>
+          <field name="department_id" ref="dep_rd"/>
+          <field name="job_id" ref="hr.job_developer"/>
+          <field name="work_location">Auderghem</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="work_email">jog@openerp.com</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhQSERUUEhQUFBQUFBQUEhYUFBUVFBQUFBQVFRQUFBQXHCYeFxkjGRQUHy8gIycpLCwsFR4xNTAqNSYrLCkBCQoKDgwOFA8PFCkYFBgpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKf/AABEIAOEA4QMBIgACEQEDEQH/xAAcAAABBQEBAQAAAAAAAAAAAAAFAgMEBgcAAQj/xABEEAABAwEFBQQHBQcCBgMAAAABAAIDEQQFEiExBkFRYXETIoGRBzJCobHB8CNSctHhFDM0YnOy8VOCJHSSorPSFRY1/8QAFwEBAQEBAAAAAAAAAAAAAAAAAAECA//EABoRAQEBAAMBAAAAAAAAAAAAAAABESExQQL/2gAMAwEAAhEDEQA/AMgDk3IEu1RFjy3gSEklRTZTjCkvC9YqFPYmAM1LYm5I1BJs6mWeCtSd1ANNTkKZiuoyUaxRVUmWU5YdzqV8Kb9+agnQWhjAe1NaHDQOAw0rrQ5tO413cNW226smXZPDW0bUOALQK65ZiuR+jEhstS5jzWjHOYanC7WhNRxrr03KQ+zOYwYgQ4tyrua7QdMJHmimxbQ6TQYQCAKbwQQacKZLsdBT2n148ak/XFMMZQV5ZeJrXyCkGpIcRUuFGtA3HdThv8d+4hGLvAClARpx4fBPRQ6l3HjvOvyUyz3UaVeQOAB3HfkDTEQadNydNlLnhrfVpU1BrQby0EnXSuqCAxmXrOI0aK1A45JyMZEUpmpcNjzIcHDeBTvUHLIe/fvSobOHGu4ZGuo8v0RUV9gaRUa8tPJCZbJ3s8yflorTPEB3WgkZAchz96h3ld1DUClKct2aCrvj3FT7gi+08UzbICD5fBENm3AyAHU6K+Iu4b3PBArwjyKtEcfdQW8odVGjWz9q7tFVtsZKzKfZbZ2biOaB39PjkqrEDAn4nJhLYURN3KHaWb1KickzMQD1yd7Bcgsm213dnOSNHKuBy0z0h3bijxgZhZikKkOzCSxcw5LzeqH2FOltUywp5qgn2SznB1zTwyINAQ0Oy0zcNfMinROMZ3W1+6CnLIwuq0by3XLIbvMqKZu1oeyVxriLTHGDpR1MZ03Z+aebGTGKnNjcDq5ggnKh5An6KmXXdTgXNGmnhUVpw0CMturuYaDWvx/NFVMSsFARyaB7VTlQHTVeut4aaNpiFQc8geFRrT5oza9nTWrR04+aHjZZ59gnPdoiYbstsdTNzTqRqddx7wyPFS7GO8SXULszQg58RrT3ohd2x73ADAeVa5K02H0elwGIAHLP9ApqyKoLNjBaQDnUl2uXkPciN1XTjdm1rmt41rTdodPBXu7vR81o7xqegFRwyR+x7NRx+qKKauK7YtkWjMnXQZHLhXVe3rsix7QGjTwVtNnDcgmntU1rGHbUbJOhccss8x5hVKzOMUrXcCPivoi/buEsbsqmnmsK2msHZyEbqlajFmNAsfeblvFUNvOFP7KT44Gfhp4jJO3rGis4vvuuQO0SVKsW1EearDlph4EtqQEsIJETk+cwozE/G5AnCuTq5Brd7RCWIjiFjV4WYxyOadxWv3dacTeoWf7c3fhlxgZFSLVcjKU8JppTx0WkLYU80qNGU+wqCyywd1uvqg5cKDJELosh7RulA8VHEDeD9ahOMs1WsplVjRpXMjT4KWI3CjM2ihBGYzO/hWjWjxWWljuqwB9ab9CaVyXGKh6KfsvZ6truAHWhIrTw+CXfliwSZaHTyz96jSNZoQdUdsFnaKZDyQKyOzCsFjUBOOEcApVnTEBT7BRGkthzUoRqPEFLaoiNLGoczERlCizR1RYGOWQbf3fSVxHGvmthnbQrOPSBZ8zz+vzWoz9A+w1oqwt+6T780bvNmSrWxvdke3oflVWq8G5Ksxnu1MWSpjlftpou6VQX6rUSkhLCQltREiMJYSI0qqBeNeptcgu+xt6YowCc25KXtjYe0gJGozVL2Ut+CWh0ctGmIfERyUrTH0/Gck5etl7OVzeeSZiKrJQ1T7CmnBLjQa3YLOHwxuwkYGNrhHEjPmO9TPRKtUZJa5xaKEOI3BobWm4Cppv1J4KXs9ERHF3qtoKivABw6mu7mkXrBXOhJLTkRU1AyI3Aku8ATwWWxrZm21LQaYaAdQKg7t5y96l7UHutdSnHn935+/VArktFHhpBGQwgihpkAPKv6KxX7ZcUeM6NzNNc6DpzUXwFu9qO2YKtWGXNWOzPSkFbKKfJTI0PiloFMglqo0mxyKTHIoTU/HIoJDkzIxemYDMlDrVfTAcINTTcgTalnO3BdiApqQB40qOv5q9OvJrsjkVXtr7AHwlw1bQj68VqJWe7PPwzkfWRVxtgq1UO7JKWgcyRzV8kNWDoqzFO2gjqwrOJx3itQvqOrSs0traPPVWM1GS2pCW1aQ/GlJLEpoUHtFyXgXqCBDLhcCNxqtQuW2CSIHiFlhCuGxV4ZFh1GY6JViNtlY6ODx0PyVcjK0HaWx42HmKjqFntKFIVJOi9jK8YckW2c2Zltj3tiApGwySOdk1rQaZ9TQIjTbpm+ziLS2roq0dQ5dzKu72ffwSrY4BjczWUk1zyGEFuQ1GhHMkpi4Q0xiLEHPbHRwFSRhqG0yGQ39U/AXSuwEjuPDAa9W7qV0A6jrXDYtcN0l/ezyz4EU06f4Vk2hoyyVJpTw4DJEjZ2wRAAVyG7p+QWaekPacvHYxZgFtTXIU1FBzT1fA520IY7u6e/wDyp9j29YMn+6qqlgu9oGOd1G665nwSrbeFgJDWwvJJDQ7EGipNAauNAOdVcZ1o1i2zs8lAHUPPJE7JerT6pBHJY4+4nMZ2oY4REkAmhzBIILmEitQdcuaK7O3g5rmgE016hTF1s8U1Qh953+2H1tdymXO7E3wUG/Lrxtc5gq8Cjepy1UbUq+9pp53YWVZTeSRTPgNB1SrvuZ1A6S1VOvdyArz/ADoh1+bEvkaD3nPocQqO6TvaCaIzs3siaPdaG4nubGyPAQ14wNw4yY6YTp13qscpUt3yAVa/GOozoKUy3KZZXulspa4Udhc01BA30pXdml3bsvJESXSFzXatdQnLeXDU80VngDW5UCi4yHZ+7hJaHF3dayrnHcKcfNXFnqZablBuW7gJrY0j2qj8LqkZbwiBFC8cHFVFdvRmRWZXuykhWqXizVZntCykhWozQlLakJxi0h0JyMZpqqfgGaB/AvU7hXKAEVNuS29lM07q0PRRKJNFRqkzccWW5Zze9mwSngcwrlsleXaRhp1bkfkhW193U7w3GvgszharkLlbNjrwfFFasDsJLYcX8zcbgWniO8FT4irFsxPR0rP9SB48WFsgp/0FVIul2TYJWSsdTH6za+sN4r4KxXJYSbS0DPE5rjllhpUUOmtVVL4kbG2zM9Uss8bnU1xvrLU86PHkFedgrwbPgmz7pLQOB3j8uvisVuLTtTMWxvI3A0/RYu6yOLi6lc9+a2y+4u0hfmKYT9Z66LPIrKNKfJIWKu243PdilqWjRtaCm5EmbKxyuHrtzGRaxwrxrUK0susOUuy3WGpaYd/+NjFlbBpGBSgPeNakknmTXJU+0XO2EjAKAE0BNaAnSquk9AOAVavSSp+CQq47NT1Y3oizHUKqmy9pyAKswdmo1DpsIca/qnIYaZZeS6zSqQ4Z1UUxK1C7Y3VG5m1GSDWzQoK/ZrEO0kdveAP+nihkTqyS/jKO2cEVduqfE6UVWui045JCN73fFVg1eMazPaqOj1q15RrNNsIs1qJVWolxpFU5GVtksqVZRmopU2yBQS6LkpcgryVhSVLsrK5IJOzt4dlMODsj8le75sglhqOCoFqu8tzCumyl59rFgdqMiosZ/NEWPLTuKn3TauzljedA4Yvwnuu9xKm7W3b2cmIaFBYyr2i47Vk9sDuMcfTusa0+8Far6PJImXe1kYq4/aSHKuNxcKjkA0DwWYXDO20shZKMXfbE8jN7SSA1wG8EbuIKuGyM/YWuazEUYWuDK6gscDTrQkrNai8S2yjXCuXSniOKrNoFQ5wFA0/PIDwoEQtE27d9ZodJLhgcePHdVRpMu+atEaipSqqN12xG23hRuqgYvy8RE0kqtR2gPGJx10UfayR8gyPgqpIJC3AXuFN4yPuWpErStnrc0S0JVztFvY1uJxDWgVJJAAHMnRYhdVpcwgdo4kbzUnzWoXNGJ4R2wxUzAcMhwNOKlWUajtIlaHREOH3gajlmkwX4WnBJk7nv6JVmjbG0NYA1g0Ay/wApFusrZBRwG+h3g8lGk02+oyKh2iWqDQzuY8xk14dESJyRNDr0t3ZWV76Z98N/E40HxVJ2Sm7xRvau+BhMA1qXO5A5gdVWNmpaSkc1Watt4NyWc7YwZVWkWrMKjbXR1YVYVndEppXjguC0wdaiFlQ9iI2ZBJXLqrxABUmxuoUz2SdhjIKC2WaAPZQqBA11mmDh6pyKlXRLkiVqswkGain77sonhqNaVCzsswkg7ir7dE5aDG7dp0Vd2ou7C/G3Q68irCodyXq6zzNkaKgEYmnRwBrQ+S0KS2s/aGWmI1je4PGeYr6wPPWoWXNKIWK9HxigNW64TpXiOBUsSNznflXX61Qa9p6RYep9/wCqnWCTHZoX7nxRu82itOhqPBBb3f3qHT86LLby6HEotNPTqh+zpGY4IxJd5J5HNUV62vBOZTMdijdqRXzQraWzWmOVxazFHXVpJI5FoU/Z67JZmtLXhtZMDhTMc0RZ7nu+zNFXAk/hNFbbOYWNDmNNSKcPNA7o2QmL3NfLhpTCQ0UIIqCa+Sst27NNbEDM9znV71ThbTF6tBuUagba72azNxaNdXAIQNpRO/BZftXDN9D3WjTN+nvViva7LO9jo2xtIJcSaDulwoS0nfw4JOzVyQ2aLDC0NaMuZpxOpPNRUWGMvwl7cLhrv96cmNBRTrXkckNl48kGc7QyVtknLCPJoQu634Z/FKt1pxWh7/vPcR0rl7lHLsMwK0wvsjqt8FU9po6xlWOCarB0QO/21YUVlsmpSQnLQO8eqbWmDsaI2dD4kRgQSF4vVyAJHNRErJamnVCSuBQXOxFu4omxUOz25zd6NWK/dxUXRq0MzDhqE3bSJGGu/I8ilxWkOCblbToUVTLRFgcR5JIkRe+LAaYhu+CDYVWa2vYm0dpdlnO9hliP+2RxHuKg7QR6FM+i60YrBKz7loqP98bT8WnzRK9LPiaeOf8AhYb8V6xW0seCtBuy8GmOp0NM1mcjaHojtz284C2vRWpB23nMlvFN2S34aAgEA60zr+ajx2upoeGa9lsbjmytfioq12S8MZDhI4GgFMQAoMxkRzKLxAuFHyYm60JrXkqBAJgMyARyCOWCJ7vWkca8O6oso9OAcmmnFS4BRvgolhsjW0JJ+uKmSvRpFtIqgN/Wrs4nO0yNOpyHvKOTv1Wf7aXrie2Jp07z+u4fE+SJVPnyckW05tKXbhoVHtr+6Ftha7rtFYwmL3FWFRbgnqxTLc2rSgy63tpI7qo6m3uykpUIKsn4URhQ6BEYkD65IxL1ACXL0heIOS2OSF6EBWw3kWo3FbA8KogqTBaSN6C2RMDxQ6jVVq9buML6eyc2/kiV3XjRwPmrRa7nbaYctSKtPAqL2b9FDzgtbN2GJ/iC5vzVimtgB72mjuvFRfRtsjNAy0vmAbjjaxrK9+mMnG4bgaZDVRb0loSOoKnqzoze1iocQ0Kg2aXCapUN4lmR7zDqD8l5LCCMTDVutN46hAVhmxEZ/qrVclpacjrp4Kgwz0+Sn2W+sJ1RWguDa+qDUaqZDHQfqqvYr9Yad6njUIqy/m0pXQ6/D65LOLqxRsy1+gkPeAq6dpWn2+GhUS07Ql9GR58+KLo1aLWXHC3U68hvJWW3q7/iJd/2jx4BxA+C1C7LKWtq71jmT8llN5y1mk5vef8AuKsZpFrbVqGWx3cRXVqE2sd0hVEzZi3jRWedtWnosxsltMb6jirxdV9h7KE7lUlUq/2UlKGBGdpf3lQgyqH4EQjKgQKa05IF4l4msS5APK8XpXiDgvV4lIOXBdRKAVQ7BNQrS/RlaMcjmu9RjMee4kho95qswAWl+hWzF01pJFWCANPCrnggHnRrvJZrU7TbFf8ANY7bM20EmCfJj9QCKlp65kEcFFv6jnYm5g8FZr2sTY6tlaH2d2QJz7M7g7l/NuVUvq4ZIe9HWSHXLNzR4esOf+VFoS51VHMpaag0XPn3hNvNQqJsN4g+sM/JShgdqgSehlciDkcDRo9OOH83vQ+zwOcjVhuquuaim7JZMZyq7zorzcFxYBiIzovLgu1rRorBQAZKVqQilAVhF5T/AGjvxO+JW7E5FYt6Qbm/ZbSQw4opR2sDjva40c082uqEifRmxWiqYvRlAhdgttHIneFoDmLTKrSjMqVY7UW6KPJquaqhy3TYjUqGnpE0gehUmuSjQp9xQeYlybqvUEUrxekrxB6lJAKUECwlAJATrQqh6OznAX034W9aVJ+uK130MGM3faGVwyumxV0dhDQGEdCHeaz28LH2dnYz2gMTvxOzNemQ8ET2Dtrg6kZAkbUhtadozUtrucNyzWpxWmTWoucYpQMedPuyt3lvnmNyGmyvg/djHFvj9pvOM7x/KicccdqjzqaHo+N497XApNXw5T96PQTDdwErfZ/EMuiy2BWnZaC1jtITgdvLRv4PZx8jzVZvLZC0QZvZiZ99mbf9w1b4rTJbhDndpE7s5KZPZmHDcHt0eFKsl6mIhlpaGE5NkbUwu8fYPJ3gSmmMis90FyKWe5aUqKLVrRslZ5s2tEbjmHR0oeZbofBCLXs1JDqMbPvNFaD+Yat+HNNTFUs9gpTLyROGzDh5DeijbE0jLgnf2McfdmmrhF3Sbq+CK9rXRA5bAa1D1PsjaZVqVFifhyp9VVM9J91Ca7mTNp3Zg5nCknckA5FwY5XJ0oa0k5UFfJDtpLrfJcQbho8QiXDya5shHXCrE+nz2+FzdxSjajSiIpp8LTqFtzC1ymvu8bj5piSyOG6vRAwQmSnyEyQgdhTr0iFqXIgbquXLkDb7I4bimzGeC0ea52ncoM1yN4IuKLhXoCtr7ibwTX/14JqYrbAi9yWYA9o7Rh7o4u/Ia+SkWi5Gx+sact6amtIwhrRQAUp47+f5qBd4W4vrU1UCy2h0bg5hLXNNWkZEHqvTmu7NBq2yF/NtnqubFbGtzBHctDRxbvNNaZjdkrrd94B5MUrezloasdSjhxYdHtP0F89WaUscHNJa5pBa4GhBGhBGhWx7HbUw3jG2z2ugtLfUd6pkpo+Nw9WTiBrqN4GbG5VjF0PhqbMcq1MLj3Dx7N2sZ9ymWO2MlrG5pY+neikAxU6aOGmYqkME1mykxTRf6jR9qz8bB645jPkib7JDaYwThe3VrmnvNPFrhm0qNB8dxPhOKzPoNexkJMR/AczH4ZckSu+9MTsEjXRSfcfTvccDgaP3/km29tBrWeMe0B9s3qPbHMZqbH2NpZ7Mjee48xq13kUTTdruFju80BrjqPYd1A0PMIRNclahndeMyxxzPNjvaHkjbIpIdCZY+Bp2jRyPtjlqn+5M3I1ociMnMd8Wlaxjapb4i00cDUcdfelRszVntlkDspRXc2VozHJ43fDoq9fL47JR08rWRkEh+tQKaNGZ1b5hSxqV7LYDIx4/lz8SGgePyVslhBwsplgcKbqUa2nvWeR+lO72NayN7nDG10hcxzC6mfdypuGRIyGqul2bQQ2iQdm/Ps64T3XCpaaUO+gqrIlfPO11yfsdslhp3K44ucT+8zyGXghDmbwtc9NuzmKCK1NHehpHL/Tc6jXeDv71kNnmqqy8XoKdc1JLFQlzQdRVR33cw8uik0XqCGLvpofNNTWV3CqIpTUAXsDwK5HKLkVIs+1fFEob9Y/VZ/iTjJiEw1pETmO0KavK1shbxefVb8zyVUux0lA4khvsje7py5p+2zUqSakjX5KYag2+2Oc41NTv/JM2c508R8/kmwvXDeNRmqiX2a7AnGZgGiVRAgBPwvoQQSCCCCDQgjMEEaFM4Vzn0Hu+vBBuPo49I7bU0QWkgTjJjjkJgPg/lvVxtFzUcZIXGKQ60zY/+ozQ9Rn1ovl6GYtI5LWtgvSdJ3YZ/tNzSTR/IBxyPQ+azY1K0eC98LgydnZOPqmtY3/gfu6GhT892Nc7GwmOT7zMq8ntOTx180qG0xWhhGTho9jhmOTmHMFRxYZIP3Jxs/0nE5f03nToclFPx3i5hwzgNO54zjd46tPIqRNZATiacL/vDfycPaCTZbcyUEUIIyex4o4cnNO73JH7I6POI1bvjJ0/A7d0OS2wV+3YP31Ga96vcI44vZ8Viu3e0kNpnc3ssUcZIaC97QTvOFrxTOqs3pT2z+z/AGWB4jkdTtsdQWjItjyB19Y03AfeWORXY6o/4hlSeEpPPPCosWO64bKQ6V8D4xGTQiR7mktGJxLXucHBoplvLmDeQoIvKk3a2aZ2IAkA1D2a1IPtEak0HGh3GZLpE1mbCyePEAMXdkzAJcTk0+s7P8McaEO2InicJGuikDSHENc8HI6d9rQamgyO9BsOyu0DLysboLTQyua6OZugeHAnGymgNK8lhm0NyPsNqkgfngPdP32HNrvEe8FaXd+z9qi7C1WNmOgDg2oxOY7VjweIyrxHJS/SNswbxskdrs7a2iFpEkdKPLNXsLdcTDu5lRWSxPqvHBRo3FpoagjipbjUVCrJAevSmnE7x5FOMcqPV4vV4oPcRXJK9QVxet3dR8Vy5UWmb1m9Gf2hQb318T8ly5BBCUfryXLkEizeqE8Fy5B4dV5JoOvyXLkDe5Trp/et6t/uXLkJ2+g7v/i4v6Df7Wq1NXLlhuhF4/xUPT/2Rp35rly1GK+YPSH/APpWv/mJPkqzY/33+1/9pXLkU4P4g9fyVtuD91aOsX/htK5cpVjavR9/AWP+i74lTLq/jbT1b/axcuQr5x2l/i5v6knxTMOi5cqkckb1y5ELXhXLkHi5cuQf/9k=</field>
+      </record>
+      
+      <record id="employee_jgo" model="hr.employee">
+          <field name="name">Juan Gomez</field>
+          <field name="department_id" ref="dep_ps"/>
+          <field name="job_id" ref="hr.job_consultant"/>
+          <field name="work_location">Grand-Rosière</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBg8PEA8QDw8PDxAQDw8PDw8PDw8MDQ8QFBAVFBQQEhQXHCYfFxkjGRQUHy8gIycpLCwsFR8xNTAqNSYrLCkBCQoKDQwOFA8PFCkYFBwpKSkpKSkpKSkpLSkpKSkpKSkuLSkpKSkpKSkpKSkpKSkpKSkpKSkpKSwpKSkpKSkpLP/AABEIAQoAvgMBIgACEQEDEQH/xAAcAAACAgMBAQAAAAAAAAAAAAAAAQIDBAUGBwj/xABBEAACAQIDBQYDAwkHBQAAAAABAgADEQQhMQUGEkFRBxMiYXGBMpGhQlKxFCNicpKiweHwJENTc4Ky0QgzNGOD/8QAGQEBAQEBAQEAAAAAAAAAAAAAAAEEAgMF/8QAHxEBAQACAgMBAQEAAAAAAAAAAAECEQMhEjFBMpEi/9oADAMBAAIRAxEAPwD1cCTEiJMQACO0I4CtCOEAAjtGIQCEcIBC0ccCMI7QgKFo4QFC0cIBFaOEBQjhAUI4oFAkxICTEBxwEIBACEcAjhHAIQhaA4QhAIQhAIQhAIQhAIo4oBCEUBxQhApEkIhJCAxHARwFHCEBwEI4BCEIBCY+N2jSoLxVXVByv8R9BqZz+N38pJ/26bv5t+bX/mS2RZLfTqITzuv2hYj7IoqP1WaZGC7RqmXe0VcfepNZvkZPKOvDJ3kJqNm71YXEWC1Arn7FTwN7X1m3nTjQhCEAihCARRxQCBhFAgJISIkhAkIGAgYBHEI4BHCEAmi25vH3TGjRs1a13Y506IOnF1bymw2zj+4ou4+LJaY6uxsv/PtOD7u18ySSWZjq7HVjPPPPT148PJDFV2ZizMzudXbNvQdB5Ca+tTvmZnusoqJM1y23Y4yNNiqVphKxBuJs8YJqnMTIyxZ1OstTwtkeTaG/rN/sDfmthKgo4smrQNglTWpT87/aHlr0nHGoJkhxWXgJ8QzUnn5es9Mc3hnhHulCutRVdGDKwBVlN1IPMGTnm/ZftxhUfBuSVKmpSv8AZYfGo8iM/Yz0iaJdslmqUIQlQoQigEIRQEIxIiThDEIo4U44o5QQhHA0G9b5Ul83f3ACj/cZzq07zfb1nx0R1Sp/uSaVDaZeT218P5UnDSqrh5sA8oxNQTz0991oMXh5p8VRtedFjMppMawznD09tI97wo1CGBHKW1VlNPWNuLHRbAxHdYzDVRke9QNna4Y8J+hM9ong+Ce1eh/mU/ownvBmzjvTDy+yijino8hFHFAIoQgREkJEGMGESjEQjhTEcUcoIQjEg4rbuMqPimRlULSVlS17kGxJbzyHzmKGF8zNpvFhQlct/iLxehACn8BOS2rW4Dn3rsxsq0wPTU6DPWZcvfbdhrU035ta95g4yrmBrecTX2tVpYhqRDjhzJ77jXVhyA5Lfnkw6zrNnsKtPizuL5NqJzeneNlSxagqJz+Pp2uZZtvbq0gVJ06TS1MQzU++d2p0iwTi4HqqCSBYldM2Ue4nGvJ3cvEqjSNKQdbgFKqVB1U/QydCc6S1k4GqBisPxMFUVKfExyVRxAkk9J7js3a9DFKXw9RaihuElbix1zBF54HXp3c9LAW0udcp6L2T0XviqmfdkUUHTjHETb0BHzmjjz/14vDk494XPfp6HFCBmljKBhEYBeKEUCIjEiJKETEciDJQp3jijEIcYkZIQNLvOg4aZ5hiPYi/8JytZOc6zealemjX+FyLdeIfynLPXVQSReZuT9N/B3i1OL2cjm5/CXm1KmQMvD/CXUsVxi4p2XqdTMbalMmk50ytPOtEjgMc/eOSc/FebbDCm1IU2pqVBBAtkG6gaXzmoqeFjlfObbZtVHyHhYcus5nRqWsbE7KFwVAW3TLLpBFtkJn4ziAmBROfznP1MsdFjKTlkVRmbZ9P5me57vbIGEw1KiNVF6h+9UbNj88vQCeSbAwz1cbhkReI95SZsrgU1YFifIAGe2TTwzu1l58rrHERGOKaGQSMcUBQhFAiDHeRElKiQMmJWDJgyCQMcjHCpRyjEYpKSl6jpTQavUZaaD1JynD7wdsmAw4ZcNxYuqAbcAKYcNy4nOo/VB9YHS71YqmtNFZ1V3qDu0LAM/CpLcI52Gc5DGUsr3Nuds55Rjd6sViMUMZWqF6oYFeSKoOVNV+yvl59Z6ts/GLXopUX4aiBhfWxEz8s+tXDlqaUGq9rKNOVpTiMcWp8BGZOV8gZZiMKTwVVZ1dGsyhj3brfMMt/rqMvSFbF4dwFdqtEm3xBai+oOXnPP41zbhcdh6wdvDbn4dfnKsPxJnYj8ZvtqVKK8QR3qnkTamumX1mqwNEvU4nfw8kA8AHU3zM4LttHqd7SVuZ8J9Zr6a+IDzm2xtVUREXpxH1M1eC2xhcPiKT4rjNPjuy01DOQM7WJGV7A+smM3k4zz1O3te7ezFoYekAiq5poajBQHYkXsx1Nr8+k2s5rYnaLszGMEpYkJUOlKuDQdj0Xi8LHyBM6WfQ1p863ZQhCEKKEUAMUcUCAkpESvFYynRQ1KtRKaLq9RlpoPUnKVF4kxPPtu9smBoXXDq+Lfqt6VAf62Fz7D3nn28HavtHFgotQYamcimHujEdDUJ4j7EQr2bb+++AwFxiMQveD+5p/na/7I+H/AFWnm+3+3Cu91wVFaC6CrVtVreoX4V/enlrVCSSTcnM+ZkSZBn7X2/icU3HiK9Ss3I1GLAfqjQe0wklFRpcsKsWe4bn0PyjZGErUxd6KPRqKNWWnUYD3AsfQzw0T13sL25/5ODY53GJpD5JUA/cPzjUymqS6u429BgGK8mHF76GYe2VAAB05aZX5WM6Tend8qTiaCFiLl6a656so/ETjcVtVWAu1uo0IPSZssbi3cfJK02LpK+lzbloAZiN+bHmfTrMnaGIVc0YaXOc1JBduNrgai/OeWnpll/Vz4ktr6TT75YbuqtBSLN+TKz/rGrUOfoMvadbsPY5JFWoLKM0B1Y8jbpOH3vxxq42ueSN3S+iCx/e4vnPTinbNy3rTVs1x6Ts9ze1nG4ErTqscVhhYd1Ua9RB/63OY9Dcek4gNKic5qZn09sbtM2XiuELiRSZvsVx3Bv04j4frOnVwQCCCDmCDcH0M+Q6Fa03ex97MbgWvhcRUpi9zTvx0W9abXX6Qj6hhPL91u2ylVK08fTFFjl39IE0SerpqvqL+09LoYhKiq9NldGF1dCGRh1BGRgTMIQgcjvl2gUNm/m+E1cSycS0hki3+E1G5A9Bnly1niO8O9GKx9TvMRUL2vwIPDSpjoi6D116kzYb/AFdqm0saW5Yh0HkqeBR8lE5hzY+v4ygJkSYzImAiYiYExSKhzlwMoOstUwLOKb/cjbH5HtDCVibKKoSp/l1PA1/Y39pzl5byhH1zOb2/u3TrXZVVX5+EEN/OX7j7a/LMBha97saQSp/mJ4W+ov7zC37273CUsNTYitiiU4lNnpUrHiqDoT8IOouSMxGclna42y9ODx2zFBJL4amoYrxPWopexsSBe5F/KdFgN0sKqJVZ1xDModGGdCxFwVH2vU/ITy7aGDFMsAMgb58TEaWLcXiGV7KfedHuPt9xx4RibENUpXOasM6ie4u2WQKnmxmeeM+Pa55V0W08StMOxPhRSzHyAuZ4XicQaju51d2c+rEn+M9K7Q9pd3huAHxVn4PPgGbfwHvPL51xz65yTBkSbmSCxcNj5T2eaQlq1eRlZhAvDdJ0O62/GL2e16FTwE+OhUu9BvPh+yfMZzmRJqYH1XsLa64zDUMSg4VrUw/CTcqdGW/OxBHtM6cJ2MY81dmcB/uK9WmP1W4ag+rtO8hHzTvXiTVx2Mc6tiq/yFQgfQCaPELcTZ7bxi1sTiKyjhWrXq1FHQNUJH4zXtKMdGuL/wBXjMiuTW5HT1k3ECpoxEYxIqI19cpIRMsA384AxlqHKUMZOi0D2PsM28Fp4vDVGAFP+0KToFtZz9AZrt4MZUxeLq4ojwIycIYcSrTDcKqR73PnecFsDaLUK/hJAqIabWNrrcNY/s2956BtDblEJilAzqjDLTVRrwsGex0FgRmeslVq95LBr9cweK7Z8WjEfGbjI6TVbARkr0KugauaYysLW4W/3Ee02O8BZi1gQaVNe8BN2XiZV4T943vcnxWzk2VKGFwtQ2PdqlUWyBY+Mj6zN9d4ua7QNo97i+7B8NBQn+s+Jj+A9pzSiSxOIao71GzZ2Zz6sbwpiaMZqac2pgSL8h1/CWWlV8yfYTpyZOcnaVS4Qogp1jkRoIR6r2Lb0rRc4FwAMQ5em/MVQtuA+RVcvMec9nM+Vt3No/k+LwtY5CliKNRj+itQE/S8+pqNZXVXRgyMAyMDdWUi4IPS0I+ViZAw4svORJlFOIXLzGYkg3EoMbiUUHsxXkcxAcZMHykbyKmsOGJTJwKGMlSMVUSKGBkFyCGH2SD8p3WxaYZKNY+IFQ1/ia9zeitza5Kg2HRb9JweonYboYm+GKm96buuRs3CfFYGwt1vf7Ok4z9ES27icqlreMi5ybQEAg6m4NmPIzG3rxv9joKp1WiPOxo5yG2G4mOntcJn9wcqbcvM3nN7SxzVAqnSmOEfIAfQTyxm679RgCZFMSmkLzJUT3ck55czlIOJJMyT0yH8ZF5UQMuTSVsMpZS0kU30kWH0AhVOg6kSUqBDa0937FttmvgqlBmu2GqAJzPdVAWA9Awf5ieDkzsuzHfSnsutWqVab1Fq0QgCW4gQ4IOZAta/0grl6nUe8hxXlhylLpzHylRImYtccxqM5ZxexiqU7iBZVEqEtPwj0H4SoSKmJZIKJMwKaplY1jrGQU3HmMoVepm63VxPDUqoTZWVXN9BwH4jzNtbc85olMzNlV+7xFJgSLNqBxMPMDrOcvQ3u1NWuPUH9IXt5KwzA+yJyeJa5J+8xPnbledLtx7BrWGqgA8QBJzUHmL5365cpzFbW3TKefHPdWp0RJ1GsPPlBBYSIzN+Q09Z7IsRbACUvrLiZQdYRIjKW09JAjKMtYQqt2uwlxN9PnMVM2mWYRAgDMwRjr9PKPh5n2gIGXeVHKTvINKiLKDKSbSzitKKphWQrXUekgBCj8A/rmZNRCJgSJaVVq/ISVNOsiq6kguUsrSlmhVgliNZkPRh+MpptcemUkxy9JKNztqvcJ5i9tLAD4bfdufD7zRILmZeKxPHc8h4R11/q0xqYkxmoVYx5DnJAWkKeefXT0gzTpEiZUNZYNJDhgWyio0nKHMKswg1MyjMXCHWXOb5D3lQcV/SOO1pG8IyLyLQBiYwKmMoqGTZ85VUkVlUD4R6fxldat0jRvCPSYzHOUX0EubmZJMroiwhUaBVWaVgRtJKsikotJNoY7RHp7QFbwqPf5xHkOv4Syqbe0qo5kmEX3iivAwqUiTHeVsYAzTu+yPc2jtGviRiU4qSYVx5rUqngRx+ko42HmBOCn0F2IbFNDAPWYWOJqArfnTpjhB/aLwjw3aWx6mDxFfDVR+co1Gpt0Njkw8iLEeRlAFp6j29bv8ABXw2NQWFZTQrEf4lMXRj6oSP/nPKwTKhnOBYCRL/AHfnoJWCOZufKBkcUcqNQ9ImqEdPaFRqLaUO0k5MrvILqT+G0rGZiU5GSojOEZq6SuoZMGVMZaqAEtAkQskxtIExkKRuwkC5OQk0Qi9tSNeQHWBGu9zaSpDKUhc5eogSERMUV4VK8qcyd5UxgZOz8K1arTpoLtUdKaj9JmCj6mfXOAwa0KVKigslKmlNQOiqFH4T5z7H9k/lG1cOSLrQ4sQ3T82PD++Un0pCVxXa/ghV2TiDa5ovRrL5WqBGP7LtPnImwz56z642lgExFGrQqC6Vab0n68LKVNvPOfLm8ux0weLr0ErDECk5TvQvACQPELXOYNwc9QZYjUlb8svPISai38hYQ7yFzCnwzHqOQZeZXW0iinjvIESS84mkRGW0JUZZRgZRMiBHFKoLWlLteN5FZBbSS0HYg5c1IMmuntK6usCuWKZUZNZFSJivHINKAtK7waC6wj2P/p+wn5zG1LaUaSBuQ4nJt+6PlPaLziOx2ko2VRIVQWqVixAALEPYEnnkAPadrCNfvHtYYTCYnEn+5o1HXze1kHuxUe8+V6rFiSxuSbknUk6kz6A7ZGI2W9iRfEYcGxtcXJsfcA+0+fG/r5yiLG0QaSlRkV//2Q==</field>
+      </record>
+      
+      <record id="employee_lur" model="hr.employee">
+          <field name="name">Luigi Roni</field>
+          <field name="department_id" ref="dep_sales"/>
+          <field name="job_id" ref="hr.job_marketing"/>
+          <field name="work_location">Auderghem</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="work_email">lur@openerp.com</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhQSEBISEhQUFRUUFBcVFBcXFRYVGBUdFxQYFBUXFBUXHCYeGBkjGRUUIC8gJCcpLCwsFR4xNTAqNSYrLCkBCQoKDgwOFw8PGikcHBwpKSwpKSksKSwpLCkpKSkpLSkpKSkpNSkpKTUpKSkpKSkpKSwsLCwpLCkpLCkpKSkpKf/AABEIAKAAgAMBIgACEQEDEQH/xAAcAAABBQEBAQAAAAAAAAAAAAAGAgMEBQcBAAj/xABDEAABAgMEBggDAwkJAAAAAAABAAIDBBEFITFBBhJRYXGRBxMiMoGhscFC0fBSYoIWI0Nyg6Ky4fEUFSVTY3OSwtL/xAAYAQADAQEAAAAAAAAAAAAAAAACAwQBAP/EACMRAAICAgIBBQEBAAAAAAAAAAABAhESIQMxQRMUMlFhIgT/2gAMAwEAAhEDEQA/ANahBPhySGpQCUGPQyn2qPDUhq5GMWvLy8mIE8uFUekmmctJD88/tUqGNvcfDLxWZ2x04RnEiXhtYMi7tu87vJC5JBKLYW6fYxP9sKm0Ed/iDf1XfwoDmekKPGcTFdrVFCDQeFyuNH9Nmy8Zky6ESL2nVdTEUzuwCnm7kmVQePHKP2bykxMDwKrrC0hhTcPrIJqMwbnN4hWSqTTWiSqI0GdZqt7bcBmNidE0z7TeYS9QbFzqhsHILtmHP7Q37TeYXRGbtHMLhlm/ZbyCSZNn2G/8Qu2cNFi4GJ0heolhnmNToSWhLWoxnqoM6QNOf7I3qoRBjOFScerBwNM3HIeKI7ethsrLxI78GNrTacGjxNF81Wvbz48aJFiGpe4k765Ddktk/BsVZ60Iz4ry97i5zrySa+ZxVZFZQqxkGviuAY0mv1kiWW0CiO7TwG8bzySm0h6i30BTipz4B6lt91a02o3GgzAL7yq217G1G0GAS81Yx8TQ1oJpA+VjtewktrR7cnA4/W5fQkrNNiMa9pq1wBB4r5vs5gYRXEn+nojmzrcithasOO+G1t4ApS+84hdDkxl+MB8WfXZrq8spbpNNZTRPEMP/AFTn5Wzgwjg8YbT7J/qoH20zUl5Zf+WU6P0sM/swlt07nB/kn8B/9LvVRntuT6NIK4lFcXChQSkkLrngAk4DFEgWZH05aR0EOVacB1j+JuYOVT4hZZYVmOmYzWC5vxH1T2n9uGZm40Wtz39n9UGjfKiIdBZcQw57iGhrQK+ZKTJ+Snjjug/sKwocBoDGgXY5nxVpEYg8aZs12thxCa/aYaHe0gBEkG0NaHrpb/SyNeBcVUlsygLCVFntJS01c8MZuYXHxyCk2ba8OMCGvDxgaijm8QlNasK09Gd2k4g723+9UWaGTjHR4QiAOY86pBvHaw86qk0ss5zIjiLrrlD0YnaNNLixwI3X1BHiCt7Vkz06N+doXJn9A3wr80y/o/kj+h/ed81cWVM9ZBhvHxMafJS1akmiPKS8gu7o4kz8LxweU07o0lcnRh+0+YRavLcI/RvqT+xsrhXC5eCEwW1Uums6YUjMPBodQgHZW6vqrpqGukhhNmzFMm187/Jc+jF2fMM0NZ4H3gFq2gkq2JAo4AguPlcssDaxK/eBWkdHM9qw3A5OrzFUmXRbw/ILY2jUIOBoAQKXJ98ICHq5Epox3RXE5DDfxTU2+LqhoaONKjlVC3aKVFJiX2Ex7SCLnY76YL0DR6FDNQ0A7czxOaXBe9or5ZeCXEm6pcpfyEoK7BvTV4Aadg9PooQkoOpGdTB7NYb6EHniiHTi0GN1A44g0uQ/KRQWQX7CWHeDeK+FVkfiT8tZG9dH05ryMO/u1byRKs76J5/sRIJ+E63O71HmtEVvC7iQ8iqTPLy8uJjFkcFKam2p5gSwxbVWaTywiSUyw5wX/wAJI9FaBIjQg5rmnAgg+IoirQN7PkaCyjnnZEb719UVaJTghxtR1we2niDd5Eqstqz+qfMMpTVjvHLDyoo8Z51GvFQdUHx4qd7KoPF2ahNWcXFsRj3gA9toNA4bRvCkGUZq1MeI3G4g5C7Lah7QzSwRfzUQ0iDD7w2jejQyjCAbkPSotUstg9FkYj3AQorw34nOF2J7oOJpTmpsw4NurgPop+enWwmm8AAcAs+0g04aA4QjrO25D5peLm6R0pqG2UPSHaPWR2tBuaKeJN/snbHfWUI2UPI0+aH2NMZ51jUuqalEFkw9RjmY1BHHMeafOOMaIcrk2aR0ZT9JyH/qNLccwK+3mtiXz5oTP6kxAdkIjT50PkfJb0+eaM13C6TQHMtpklcUH+9WpD7WGSfYmiRDCfamWJ5pQo1iwvFcquF4R2CYb0rWL1c1FeBdFIieNKO9K+KCWwqw2jd7rVOlqK17obcdUGv4q09As0Apq7DX+EqVvZXFaB+KSxzXg0IoRleN6LH9IdGUbUupmbkN2nB7G8E/NVOpwVfFCM1sBycXon2tpFFjntvqNgw5KthsJOfz4Lg+v5BFujFiUAjRBf8AADlvO9OxUehUpN9i7JsbUZV3eIv3bk5Gki1us2/NW8QgApgdo0yF3HclyjaBUnZV2PNasSmF9R6j3C3GSmdeGx21oPksmiWY19COy4YOHuM1oeiUZxghh7zdikUcJD5PKJe1XAU62TcU/Dsw5lOsQTROtGa5EtUDBUGslhdR1ljEtRxTDppxzUcJTgaE7BXleto4zHSqe13xSTXtH900HohyYGo1hzvPCv8AXyUy2pmjdY7akoWjWkSTmTh8lNKLUiqMk4jk93Hb/r3VL1RIvKsp+LXs7BenLHsoxogb8Ivcd3zKu/zxqNsTyPZJ0Z0eDz1rx2R3QfiO07gi95pglMhhoDWgAAUAUWcIpVxo1oJN9ONdqYxF2R4kYE0rfuyHzUiCBTZRMSbddodq6tcGqygwKYoAkJg1xVzZFrGDED2G8Yg4OGYVWCuEpclYSdG0WfOtjQ2xGYOHLaDvClAIG6OLTqYkAmvxt9HeyPAEoIpmWe0qTDstqkw2NUhrQmAEVtmhN2jLhsGK4ZQ3nk0qxDUNdINpdTJuaD2op1BwxceQ81iWzjHosEOBDu7RA0cjrHlvdDjqos0kn+qglo7z7h4oPa24DmqYQUns6LFwoZc4AXucacSUe2TZogww0Y4vO07tyqdF7J1R1zhee5uGZ8fREJKKT8ICTsS5QI8IPdQ90Grt5GA4Z8lKjRchjgok1EDTDhjFzqng0a1T4oGciUYwaL8cgE2YkQ4ADzPyXIHavAr975VUpoQsJEUyZPecTuySTIjePEqY7C5N37UDCLnQVpZPQKE3uLTwLXVC2RZBoLLl1oQL8C5x8GFbHRLas6yshw95UhjDtVdDgDaeZXnzQbg4k8Vpxbtadqy7pHtPXm+rr2YLaHiaOd5URhGtKKASIlAAT3RkFiWmNtO1XurWJGcb+JvKOKBYMWtPddHc74W3N91IsWzOuiAU7Db3n28VXS0E3NF5N3ElH1k2eIMMNGOLjtKr+KoxukTYYoKfQTcUpyiizT7wwYn90ZlKAOQjWrshh7lUz4+vMmt7WsofFwp6KwnZkMbQZC5VdhisSI92ApTjfzp7oWEi+g1peabAAB4X3pxzk02JU92nHHlilOccsduSxhIae52weaRqOOJ9l50N32uQCU1tMUtmhv0VylZiI8/DDoPxOA9itRogDoqlezHiUuq1gO2gLnerUfoUcB7p4uwwXmlUliTZJMGJdEZj94ZObtBV8yCmGFdpBMasrFIxLdUfiNPSqwK25zrJh99Qzst91tOn84IUq6puoXHwFB5lfP8ABmKlxOZJ5o4fI4KtFIFYjn/YApxP8qouYhzRJlIRP2nH0AV9Di0BrkmSdsFipiLqjfkNp2KG0FoLnd52PyG4KWGXFzsactyqpyYJQgkK0Y1VaWbJ6rG0yFeJN5KrpGV6yKAcBeVfOZX+RosbCQ2S7Kg41JXNQ46x8gnXMp9EpqI92wcSgYYgs3ldaAEjUO3kmpp+qDTIV9gls1E2ztMJiWJ6qIQwHui9vI3LSNFOkyHHAZMUhvNBrXhpO+vdPksPhxqVocL88fdSIE0RjU5kitTd6Ke2ihxTP//Z</field>
+      </record>
+      
+      <record id="employee_hne" model="hr.employee">
+          <field name="name">Николай Петра</field>
+          <field name="department_id" ref="dep_ps"/>
+          <field name="job_id" ref="hr.job_consultant"/>
+          <field name="work_location">Grand-Rosière</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhEQEBUSEA8PFBQQEA8SEA8PEA8PFBAQFBAVFRUSFBQXHCYeFxkjGRQVHy8gJCcpLCwsFR8xNTAqNSYrLCkBCQoKDgwOGg8PGCklHCUpKSwqKSksLCkvLCksKSwpKSwpKS8qLiwsLCwpLCkpLCkpLCkqKSksLCwpKSwsKSkpKf/AABEIARMAtwMBIgACEQEDEQH/xAAcAAEAAQUBAQAAAAAAAAAAAAAAAgEDBgcIBQT/xABBEAABAwICBgcFBAkEAwAAAAABAAIDBBESIQUGBzFBURMiYXGBkaEUMkJSsSNyksEIM1NiY4Ky4fBDc6LSFcLR/8QAGQEBAQEBAQEAAAAAAAAAAAAAAAEEAgUD/8QAHhEBAQEBAQACAwEAAAAAAAAAAAECEQMSMQQhQVH/2gAMAwEAAhEDEQA/AN4oiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiIgIiICIiAiLw9YNcqWhymkOK1+jjaXutzNt3ig9npW7ri53C+9TWntO7aI5WlsMeE52MlyHZZbmkeZHesQg2uaQYXYZQQTk2QmRo5jM4gOXWQdIKgK5wZtnr7gSyFljdksQu5md8L2m4kZw3Xtxvmsw1M2wslqbVQwOlhY0vYHGIzMc44rZ4A5pHiN6DcF0WP6I082Vs0gcCMTMFuRhYQO/P1XvtdfcgqiIgIiICIiAiIgIiICIiAiIgIiIPE1q1ljoYS+R7Wk3wghziT3DP1C501q10nq5T1xgvfA1ojb3m2Z8SVuzaTLTwU0k9ThJLejiYWh7nOdkGj5QeJ+i5ulkxE2yub/wBkVblmtxF+NlZ9q7/Gyk6OwuoYL5lEGz35ju3KccpYcTTa3EZK3ZRI5IM91N19FLC5kmM/bNeGtObg2Nlhc7vcDe5bd1C03W1zMbsMUZcXcXyOxEkDP3Ba1gc1zTE8tIcLXabi4vY8DZbp2R6/FzvZ5IxlnGWWGIkC5cBm524Cw3BBupjbDeT2lSUY3EgEi1+AN1JAREQEREBERAREQEREBERARFGTce4oOdts2tPtlb0DAeipSRiN+vJh6xA3WF7dpJ5LAsNu/wCi+/TM3SVM0nOV9gDcXDrHPjcgnxXxNbxRViRlyoOjyvw3BfWGX8Ve9nD3hoyA4/UqdWZ6850Fmhx+I2A7OJVtkZPBejNAZpcMbSdzGAchx/NejWaNbBEGCzpH5vI+HkPzXF3x9M+fy7Z9RjZC9HQNcYJ45BI5hY8HG02tzvfK1r71dboJ7mF9iG26uXvdq8+F2E3IuGkEi17gbxbiupqX6caxc/bsXRM5fBG4kEuY03aLA3G8C5yX1rxdTcPsNPgJw9DHYE3t1RkDxC9pdOBERAREQEREBERAREQEREBebrLW9BRVEv7OnmdlzEZsvSWPbQRfRlS0XvJC6NtvmdkFLeftcy28jl1/AHebk95JUCeH+f5vVydh6S3K/oqw07nGzWkm17dnNS11JUWuzyGe4BfVS0j3EsjBc4jrlu5o5XXo6L1cbJ+smwHg1oDifI3WaaCkhpGhjmxix9/AY79pDt5Xy16SfTT5+Fv283Q+rj4IyRGTK8ZuDSS1p+Fo4dpV2j1Nc92OoADf2W9zvvHl2cVmVVpmOJl8TesODm3cvDn0xNJ7romDmA+Qn8Iss1tt63TMzOcfJpenaG4QALBavrYLPc23Fw9VsOsxWLjJId1/sZQDbwyWC1LmvlJBBBIII3WK+vhOWs35XLmOlNl9X0uiKRx3iBrHfeZ1T9FlKw/ZNo90GioWOa5pvK+zhb33l1/VZgtbzhERAREQEREBERAREQEREBeZrHT46WQcm4vwnF+S9NUc0EWO45EcwpZ2cdZvxsrmSn0GJa58ZyF3PI5gEZd2ayym1RjviLLkjDcXvhuDb0X16w0lPS6VYA9rXOuxrDe7mm5AHPf6L3oyL5LH62x6fjnNtseCNUYS9ry12JgYGg+7Zji5oI42Jvmr2ktBYo2xtfaxOLLMtPD1+iyOSpAGa+DEXZ237l8bq3+vvPPM/jyNJatxHB0MbGFhabhozF8+/JS0lqw2YWMkg97OM4ThcLYf77169Q0hw7lfo60HI7xcKS2VdZmp+2MS6ttGM4ndb4Re3lwWEu1YH/kaekYDaV0TQDc3bcl1+eTXLbldILGy+bU3VnptIe2PabU7LRkg2dI5rm5HjYOd5hfbx1bpm/IzJlsqNgaABuAAHcFJEW55YiIgIiICIiAiIgIiICIiAiIg0ltzp+gqqeqtkHxuy/hyNc4+gXswyHe05HMdxzCtbfKXpWUUfzVEgLvlYWWcT2C9/BeNqdWv9jiL8WEmRsTniznQskLWE9tgPJZ/fPZ1s/F3zXGQ9KR72/cLq2KEE3Ejmnsfl5HJXJ4GSsLXtDgeBHke9XtDxQtIa+KM4eLjYmwtmeKySPS6+SelJsXzOvwAcG5eCrGbZNtcZ77lfbpOGnDBhiZisBfFjN/zK8vR9HHAw4WBuIlzjvc4ni4rqxOvoqZ3OsA03dYAcyTYBbM0dS9FEyP5GNb4gZnzWG6qaO6acSuHUiGJt/ifewPcM/JZ0tPhj4zrzfyvT5a5P4IiLQyCIiAiIgIiICIiAiIgIiICIoySBoLnEANBJJNgABcknkgxnXrVtlXG175GsFOJiXPIa0NfHhJJO5akj1mifWPpWPb7MxkcVC8WwuLAcZvxxlxI7GhU2qbRhpFxpqcn2WN18W72l43Pt8gO7nv5LXl7ix8VNZ+U47xu5vW4qLSRidhl3cHcu9e9E6N4ucJ7clrXVbWgS2p6o9bdFM63X5Mcfm+tlkjtFn4XOA5AkLztZubyvV89zU7GSTmJgxdUWXk0UoqapkWeF2PFbKwDHOy7cl8LtCcXOce8kr4KjWF2jC2qja1xjlYMDtz2Odhe0cjhLrHgV158uo59bfjW3tR9DGloIY3/AKwR3kJ3l7iXEntuV7y+HQumIqynjqIHYo5mB7TuOe8EcCDkR2L7l6DyRERAREQEREBERAREQEREBCViOte06hoAW9K2aYXAp4XBxB/fIyYO/PkCtIa17S67SF2yS9HEbj2enLmMLeTze8nbewPJBtzW/bLSUTjFA01MrbhwY4NiY7k6TO57Gg2WqtaNrFfpCN0Mhiiif70UDHDE35HvcSXDuAv6LCy5RuguYlF2WfmqNcp2ugbwsn1e12kgsyfFJGNzszIz/uPXvWLM5K4FzrM1OV3jdxexuFul2zRAxkOadzm537Fg2vk5wNYODg4js3fUrw9G6WlpnF0TrYvfYfdf3jn2q/pjSjJhcHrOtdp3tA3+qzzyudT/ABq17TeLL9va1P2lVujYmwwmJ8TXPeYZmE+867sL2kFuZJ479y23qptjoqxwimvTTONmtlIMbzbc2QZX7HWK5y6WxB7fqr7gCOw7wtTE7ERc36l7Tqqgcxr5Hy0zSGvhfd5bH/CO8EbwN2VrcuiqOrZNGyWNwcyVjXse3MOY4AtI7wUF5ERAREQEREBERB4et2t8GjYOlnJJcS2KJlscr7bhfIdpOQWkdbNr9bWgxstTREWLIXuMjx+9LlYdgA7yvh2mazmtr5X3+zgc+CAfuscQ5w+84E92FYi7IdpzKoPeoWVUBUEbKllJCEEVcCtK4Cgo4Z3UwhF1GN3A7x6oJrcOqGzpjtEXqY8TqpxqC02BjBaGxgHeHYWg97itNTyYWk5bjkc+HFdTauscYBiORjjytbMxtOQ4DNSrHKjuI5Oc037DZXaZ3w8l9OsNAYKueM/BUTDwLy5p/C4L4r2IPgVUfTxXR2xuuMuh4MX+kZoR92OVzW+llzpa+a3zsGv/AOMeOVZPYchhYfrc+Ko2QiIoCIiAiIgKzWvtG8jgx5Hg0q8vi03XMgpppZXWZHDI955NDTdByXUTYiZHczhHzO3kr5s953lVxYziIs1u4chwHeoufcqioKqVAFV4KCYQqjCpIIOaqtUiFFBNpUJW8VVqm4ILFQLtPPC63kusdXJg+igkBykp4HX5/ZhcoFdDbH9L9PoiFpILqd0lO63Do3XYD/I5iLGstrmhuirOmA6s5Idu/WN/+t/oWCytyW69rmjsVFI8C5hlikB5NLsDj5OJ8FpcoVfpXXHkfyK6G2L0mDRYP7Sed/hiwj0audaI7u8jzXRmxmqx6La3jFNOw/jxD0cFUZyiIoCIiAiIgLG9pMbHaIrRI4Nb7LL1ibdYNu0eLgBbjdZItJ/pCaelx09C24jew1Elr/aOD8LGnsBBPeRyQafkk4DcPU81QBSMWHfvUVRVVCiqhQUBV1q+dxzV5hQTUVIFEFG/RTUCpNKC3Itq7CNL2NVTEjfHUNF8zcdG/LsszzWq5dyyXZbX9DpaDPKZssLv5mFw/wCTGosb107o9s8UkbgCJY3sIP7zSFzO+MtJa7exzmO+80lp9QuoJn5LnTW6k6KvqWcOnc8d0gEn1cUK8qm494+q3tsGqr01VHfNlS19uTXwtaPWNy0TBuPet3bAvcrf92n88D/7Ko2yiIoCIiAiIgLT232rhBpWdHecCV4l3BkJs0tPMlwFuWErcK5w2t6XM2k5xfKEtgZ2NY25/wCTnKwYHIoKTyoKCqkCoogtyHNXWKwTmrzSgugqStgqt0B7lCN+due5TcrLkF9+5fVq/KWVlM5t7tqqci3H7VoI8iV8bHXH+b17Oo1OH6UpGnd09/wsc78kHRNQOoey49VonafDh0i4/PBC7x6zT/SFviUdU95+q0ztipbS08o+Jk0Z72ua5v8AU5I6rB4G5DtP5remwKntSVUlv1lYQO0Mhj/NxWjmfCuhdiNNg0QwkWMk1S/vBlIB8gFXLPURFAREQEREBcqa+3GkqsE3PtdQb9hkJA8AQPBdLa16Z9iop6m1zDC9zRzfazR4uIC5NqpXPc573Ynvc573H4nucXOd4kkqiwSqKiKCqEoFF5yQW2K6FaZuV0OQTCkoAqYKAVbc1XFFyC2x1j2H6rI9Q5A3SlITkOmI84ngfVY49qvUtY+NzZGGz4nte37zCHDwyQdRvzafFah2uPuKVv8AFmPkwLa+jdIMqKdkrM2yxteLcnC61TtVt0kI+Xpj54UdVgR39w/sumtmMGDQ9EOdNG8/zjFf1XMT7kENFycmgcXcB52XXGhaEQU0MIFhDBDGAOTIw38lXL7URFAREQEREGvtuGkBHoox3zqJ6dgHMMkErvSNc6TOuVt39IHS4NRTUwJ+yikneLZXkdgjt22ZJ5hafcVRRFRFBUKEpyUrq27MoJsClZRapAoKhSBUVVBMKhUbquJBQq002N/NXiFbIQbt2O6Z6WhfA49amkLW/wCy8Ym+RxDwCw7aZVYqzD+zjHm5xJ+gXlbONPmkrmXdaOoBhkvuuQTGfB9h/MVZ1nrelq533/1C0fy9X6gov8XNS9Hio0jSxEXDqmMnuZ9pn+BdWLnLYxTh+loj8jJ5PBsRZ9ZAujVagiIoCIiAiIg5v24Sl2mH3+Cnpmju67vqStfFbG27QYNLE/tKSmf5PlZ/6rXCoIiXUBxVob7qTyqAZILoCqqRlSc1ACkCohVQSVLKiICoQqqlkFA4g3BtYggjgQbg+a+t0hIud5JJPMk3J818xZkrjnXsFRtHYJDevldb3aYgdmKRv/Vb5Wlf0faY9NVP4COBoPaXPP5BbqSgiIoCIiAiIg0x+kRoXKmqxwx08ncevGfAh4/mWlF1Dta0A+s0VMyMEyRYJ2NHxGJ2It8W4vGy5dKoKiKigjIVJii5SYUEmK8FaCm0oKlqpdTBSyCKrZVIUC5BUlVYFFoV0IITHJAc1CcqrT9FRurYFpJrXTwG2KRsczeZDbsI9QfFblXL2z7SfQV1LLcjDO2N9srtfdhB8HrqFKCIigIiICIiAVyJrlTtj0jWMY0NaysqA1o3NHSE2Coio8ZERQRcqsREFwKTVVEFQqoiCDijURBcCqiKiy7ejfyREHo6LeQRY7pGEd669hPVH3R9ERBNERQEREH/2Q==</field>
+      </record>
+      
+      <record id="employee_djj" model="hr.employee">
+          <field name="name">佐藤さくら (demo_ja_JP)</field>
+          <field name="department_id" ref="dep_ps"/>
+          <field name="job_id" ref="hr.job_consultant"/>
+          <field name="work_location">Grand-Rosière</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBhQSERUUExQVFRMVGB0XGRcXGRcaGhwcGB0XFxUaGRocHCceHB0jHRcWHy8gJCcqLCwsGh8xNTAqNSYrLCkBCQoKDgwOGg8PGiwlHCQpLCwsLCwpLCkpLCksKSkpKSwpKSkpLCksLCwsKSksKSwpLCkpKSwpLCkpKSwsLCkpKf/AABEIAKoAgAMBIgACEQEDEQH/xAAcAAADAAMBAQEAAAAAAAAAAAADBAUBAgYHCAD/xAA9EAACAQIEAwUFBgMIAwAAAAABAhEAAwQSITEFQWEGEyJRcTKBkaGxBxRCwdHwI1JiFSQzcpKy4fEWQ8L/xAAZAQACAwEAAAAAAAAAAAAAAAABAgADBAX/xAAnEQACAgICAQQBBQEAAAAAAAAAAQIRAzESIVETIkFhUjJCcYGRI//aAAwDAQACEQMRAD8A4i32fLWiSFDKCwBIDaFRop1PtaRUvH8PhrIKjxqTy/mPL3V3nDsbmwzuCe+t27hWbYKqC1pdCDMgFtTtNczxLEs17COGGbKw9jaGMa/iMHekTl4KFx+GRL2AAZBlGs+XIijNw0CPANfTpT2LxR7604yE+OAVOgkRJ5kcjRsTiSzq4yAiY8JmPDvyJ60Ll4I68kfG8NCtblRDLIiNdYnSsjhgn2B8qrcUxQ+8Yd5RibYmFIjxsOehaI12oB4iVuMw7vM28KdNOvunzqcnWiVemYwfB1N7JkTQ7EoBtO5MUrZs28ryEkKd8u/KKJddWJdjLEzAEfAcqWv3iVgII5c6JZ6f2UG4Opw7OLa7qA3h3J9edZscFBsO/drCsozeHSf2ag54B8RXp15aVfwHaQthjh2ywXDgldTlDAa8t/fUfIDhS2E/sc9xdfu1CoBr4fMUReCf3ZrmRQBl1OQbnrVE8RzYDEK7DMQkDIYkMDvPhEQIpzHYwNw8AspbOh9g9QI8hGlLchaj5Id/hEW7fhQFmPNZgLJ+tGHBjNrwpLTAJWTHTeneJ8TzJhPGJUXN7cwxAEzOvpygVrjOK5rtgi4ZVSP8NZiQSJnn5760tyDUPJpa4WyYkqwAIshtI0BOk09gLeUtoT4f1601w+4MRxG+QxZRbULKhSBrpoTPrWe1XDWV0yEKAknQ+Z6GqJp3bOngmlCkGwXClSwyKWa4+FvsR4Y8L2xHTbnXKfdc1zBqAQ5F0wxQCACQQ0gRodzXQ4K+ndJkGRvu98MMnhOqTADA6x7qkcOH8bCAOQy2sQPCm3heIBY/lWxcvk5b4WR8XlBsciQ8zlgEEbEEg0y9gDJ4pzA+UDbcz0iiYpyDhYfMwsuWJXLux2j61ZxGKL27eVtUsPmENqDcXQtzEwflzoe6yVjOX44oS9bUGctoSY0Ek7amkjeXU+Q0/fvq3x/DG9eTxzCKskGFVVzEH+mW+VRsZhQtxxIhUkDbkN+porRZFJaB220knU8qYw6knLqZ5DfXlU69f19PLrt9K9K+zPsyC4vXNWgEDynUe+NfeKWclFWX48fNka19mN91zMVQcl3PvqFx/s2+F31A3/Ka+icigQBNcv2i4AlxXBHtgg+/nWP1pJ96N3oQcddnkeDxSnCXgS0jKV0BkFgCCZERVrilgLhLLT7bhf8A1xoszo5Ma7xXJLhyFdZhlbIfUMI+nyrruLYtzZwKtczhc7FQpEmMusgzoCOk1st7RypRgn2L9psKLAwcktntloWCdTGg8uta2rIbF2bWS4CVBIbIh8URGYxW3bTErfuYNUOTJh1khdcwJYnkToaY4TfycUtuL1wwqglkDGAByL9KCuuwVjst9jLEcTxq7BIXUqdiea6VR7aBRcJbvBlsZlyBSJlvaJ91S+wGJN3iOPdmksM0wF3Zo0kxWv2n3f7wnSyP9zVVNXs14+l0c5a4yBH8RPZdZzCTnifpWMPxUJdS7nBKK4GombggH3Vz9jhisVGXckT7p/KqGG7OozhchIyu2k65YjX31dxl+RleTCv2DjY5e8V8wlUKbjctM01a4yoD6iWt5JkaHOHn5RFRuIcCQdwFQr3gYk66wSNPhW3/AIuCqmG1zawdcsT/ALhQqX5A9TB8wf8ArHL7NcLsrSe72U6yo6eZqI2Ha5daDqIn9PcKt4fggs2xcAcZswO4kdCdN6d7LcGD2r5Ut3kBgdOs6kTpTdpVZbFxk7iujnsNwG5cbKq5m0HIDziTXr3A+OdwmW5hzbAGhDKwOw3Fcrg+GXGym0xAyiWUDN115E+dV+J8MuLhCDdctA/xGmfFvptG1ZZzvpnQxQcdHV8Y7R9yPBkGYaFtQNY1ApDv7rp3hxC3BqSFtqB10zTRMNwpb1lOQNvKwHONQR13nzo2A7L20VFAXKkwAPPfnzqm1Rc4Ozx7jOAU4y8UYBHYXBPXUiJmZmqOIvi4LMsP4SMkyOcxt5SKc+0DggbGWk3lJMb+J38q5bhnBldzmByDMdN4TN06CtkOTimmcrLLGpvkuzoL2DW9eS4b6LkQJrGsc6rYPh6JifvP322HiNxPOdc3X5VymM7IlAvhuSQPwnnrppS9rsfncr418Jb2CdiB+dFJ/LEcsV9RO87K8JW1irjrdW/3oBIX8Pi0JIOu5ql2z4zhLV0jEhmYoBCgk5TmnSdB161zP2X4M2cRiVkmETfTck7fCur7Q4O1dvS6AsEGpk6a6aCq5utmrGrXtPMreKzPbci3KtoCGjRSTMdZNN3bguX1cC3s/h8QBgLExprJ202qdh1GW3vq55cspjej32W0bZYnVX2A/pjn9auSic6ayfCHeK4qbmDIFslVYR4h+JoLdfSrGKxWa3aYC14e9IGZhAJQAlYgmZgc65u9dQvhdSNDOg0MtGx1qpi3RLdlc+Ym25AVT7RZYEk+QPpU4xA/U8DGOxMpZaLZAziAx0BIgsvnHlTPCsO1nPBWHh5XUCVEqW89dvWpnFVVLdlC3iKkx5TBOpMbVR1GJKIWeLYYgK0ABFJPMct6HFbRdhlOLprZ0HZq8oOSB/30rHbS/DKmQlACSVGuY7etS+AYkC7JO5I9+uWfWKZ4vfv9+AArJA1JjXyOn51ia9x2oS9tF3gnG3NlB3DzpIMKY2kSa6ay5A1Poa53h/elJz2c0RAzE+hH51SwyXFJNxlIIEbiPP3c6Vosba2cnxXED+1BmyjKqEFnKwAGJ1989a5LgmMAw14ZUzm1cOfP4jmmTP8A886e4lxu3iMZiLitlVFZQSrEHu1iZA8yaj8Mw5+73TDALZkmDEMyiZHrWyMEo9nCyyk5ukdPx++CmGUJaJTJJ7y54oBiTEsDpTfZrEgY29cYW1XuoyB2T8W5B3PQVO43xbL93/ijw5TbItkGIYfCdNac7JcTL4u9ca4GcWsrAqRsWmIUggASaDiBWZ7KHNjscT/R+LPGkwG5gUXtLcujEKEK5cq5pMc/Wlew7f3rHwQwzgSNjppGg+lPdoMSVvMc2UqiwI3k+KTmEabb0mQ2Y26PNbQ8NvMROc/g8l0nXWj8QsKwsQwVockZDGhGWZOs6z6UBCvh/iDwknceUCjXbisVOdfCCNwZzGZ3q5TgZ3gzGuMXMcPmZZAMjKQNCSJ85mnMbZB7kq4EIWiCIIYCAYjXzpRwGKHOJWeY50droMGRoCNxzM/8VPUh5FeDP4H+JWwVsPnBIUggzO8DXLBiKLjGdcXeNq9lBtFPxAmbaiPZ5zFT8Zj8lsMfwiPUmTpUz+3yxYkAFjqB0AAqxJPQtZE6kPYnFMjBlJGZVb1kCuh7L9oQzAXD8aS7M4FMbYNowL1knIfNGMhT6EkA9aC/AXtXTbuKVYeY5efUdaoyQS2bsM29Hq/DMRaKlhAO0jep3aTjGiKkd3mysxmPZZtCB5getSeEdmiIkzMQAT+tG7c4j7vgZVRk7xLaHzK52uH0AhZ5knyqiCuSSLcsmoM8+4JeYYfEjNbytbfQh5kspkRoD4edFwjD7ldTwglbSzmfUZwTKxHIfCpuB4gvctZLBSwgFttTO8TVZcOxtd2GUg5df8pneNa1ycU+zmxjllpFbj2LzthT3lv+DABAfXKNSfCOUCPPWqnYrGKmIxF5jabvEVcpzACSdpQ+Qn1qJiS7vbbMoNvQaD3ctaa4W7W3use7Y3AAZA65iBGh9KRuFbHWPMtxB9icatu9jZI8V3KImDBI05xW3a7FkX9GI8K6A7xO9JcG4a1lrksGLt3gjlJjnV69cwzZ/vF0pm0gRtH+UnzqtyVmtQagrPMLvCwoDQdTGpHkDWw4eCs5efSn+Is2S1mCgj2fBGhH0rOHxQVWcxMQNBpt8TWqLbOd/YqvCgFzOAq/E/CtVvWV1CS3xjkDG1L3LxadfdQu7ph1fkcxmON5hpAGwoF/B+AEeVfrIp642g8tv0qBMdlONthsQtweh6g6EfP5V9F8L+7cRsLnUNA0P4lPQ/sV8ytbjavYvs/vPdwWew0XkDWmE7kKTabpuP8ASaNX0yW07Q2narB2sUcMWZbKOUa8B4TECJmQsyC3KKV+3rHqLeGw6REG5ptAhEjpq3yry6xbuWrrWrylXG4O8jf4zVHtHijc7gM2bLhraj08RA90iq4wUNGjK+UVKyG+HlA3Pn1oGWnrTQoHkfkaFjbGU9DtTUZwKZcpBUa85MiNafu8NtNZVkZc8kMpMN00pGK2tjYj+b/upRCl2dm21wE7EdetXsUgdJKgk/igTzG9c7w6Q12SSc3Pfauiw7t3YiMsNmEb+1zrBP8AWdKFLEmchfvaJIaTqMx01FMXLb91C5SJkgwaVxOqoDm020EUXErKrGbNDE7QNREAe+tys5ftESNdRlNGyEiRuPn0NARzOv0p6w1OE/LbESNjQ7eZZAPh5g6/Cj4YQWXyOnoawyRNQgIJXffYxxILi2sMfDeWR/mtnOvxGYVxFldKY4FxA4fFWrw3turfA6j3iR76gS/9o+IDcWdRHghT6xJ+oFQMWZaf6VHwUVnHYk3cY9w7uWf/AFEn5SPhQLOoJ6n/AIoWaMkeMEvsxloWLXQc6ZIpfF+yahnAqNBTiJBH9In3nQfAVpg7UgVh70lgDAHz9KhBuxzPM7/SrdjExh3EweQ01nNM8/hXNYRoPtb7D05nyqpfd7aMnKJMQRqNNfyrFkj/ANDoRleFIiG5aMS+1FLq65UYsQDoOfrSZwoyk5dqOcGwCgHLn8iPyrSo/Zg9SP4iRmfZZfU/rTuHedN6HcwFxNwT13omGmdAT6fLerALsZyQQ3uP5UI3J3/mj8xXqNr7LLWTx3bmZkWBC+B/xSNmUnTpXAdoeyd7COyXBKtrbuLOViPoelIppui2WKUVbE7AoV4Q00bCtKg/vSv19Zpyo0w3+OT/AEyKLhV8I9/1odj2lPQj86PhPYHpQL5O8a/k1uLSeL2A61RiRSmJXxCeQolAW0Qq0ggzEgH99f0od7EEzRrRCJG7VCBlYLogJadSdutVLHELCoUu3GXMdVExHLYUjhrBkE6Vvh0tuXDLLrrMaH/qqMsLdmrBJ/pRMceDcadDRrryEOYyIGw+s0s10ZJ5+tZv3RlWN9+dWpIxVL5Cvgo1NwA+UmtrdsHc6eQmaVfCMTIBajYe2eenTn/xTjHsP2bdoWxNprd1wzWoCz/iFeZnnGldRxfCLfRrVzKysND59ejDzFeC4XENaZWRirg6MpjL6V0WL+0XEsCJRRCqSq+LMPaYGdCYHTWs0sTu0bYZ1xqRC4hgWw2IuWXHsmJjQ/yn3iKETNGXHPdLM7FjJGZiSfnW1sgDy6+dXr7Mjq+hRNIo9icg0MxTXe6UNr8mBUDfVDPBuz2JxJIsWWuFd4KiJ2mSKW4x2YxtsnPhb49EJA9YmrnYTjTYfiFhgYDOLbdVchSPnPur6D4phNMw32NLNtK0GCTdM+Pb1h1aGVlJP4gR9aaw5GaBrG/mTX0Z2j4JbvWLqXAMrIdTrGntdCPMV8528LDEEkqpIlOfX30uOfMfLj4aY/nJ3OUdNTW+HuwSoUEEGkspXZR75FMYO7qTlgkHXf5608laZXF1JNE1bYyGSekAfPnX6+gKrMzpz5ekUUIIifnW3dgiJHxpOcRvRyMDebKoCyDz8RM7RpyoNhtQPM6061hTpI+PnFTvZbTkaeM1LQJY5Q2URcJJPJfqf02rFtTlDcySf0H0+FaWjKx502ugHID9zTCG+G0gctvU8z8aJdPL49BS6byNANBRchO+3l5+tQhl38MjYbdaNhkgdTWoWdAOvuFZFz9KBAth8rhv5TPvGo+lfT/FL5+7XXAki0zgdcpYfOvl6dP36VV4126xuJVVu3v4YAARBkXaBMSWMeZPpUIbcb+0LE4lcjNkTmi+GZ8zuw98Vzl28vNfkfnWcVJAlAQPLel7KLyZ19NY9RUSS0Fu9hu8K+cHY6MPpNHtoDqNOoO/78jS9tJmdf6l/Sm7aaR86gEQ+5GUn8qI2FASTMmI0EfWhT4aI/sj0FJbFM3MOAF0Op6RSuJXK0UziPZX3UtjPa+H0pojDGGvCN6a+8LzIqOtPWRpTEHBjF86NYv5vZBb0qNiRS4aNqjCjosSz2/EyMOXL8U9elIrxKDIXkRv58/Ws8PYm1dkz4V3/wA4oTCgiMNb4i/kIpy3jlYQdKQs1+cUQFVU/lbStbuGDbiD5ipdptaeRjQIZNiN2B9d/iKJmER50HC6u3pREHiH75VVOfdGvDhUu2f/2Q==</field>
+      </record>
+      
+      <record id="employee_dzc" model="hr.employee">
+          <field name="name">趙生 (demo_zh_CN)</field>
+          <field name="department_id" ref="dep_rd"/>
+          <field name="job_id" ref="hr.job_developer"/>
+          <field name="work_location">Auderghem</field>
+          <field name="work_phone">+3282823500</field>
+          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAkGBwgHBgkIBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAdHx8kKDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD84QzQ5Ojf/2wBDAQoKCg0MDRoPDxo3JR8lNzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzf/wAARCADwAM4DASIAAhEBAxEB/8QAHAAAAQUBAQEAAAAAAAAAAAAAAgEDBAUGAAcI/8QAPxAAAQMDAgQEBAMGAwgDAAAAAQIDEQAEIRIxBQZBURMiYXEygZGhBxRSI0JiscHRM+HwFSQ0U3KCkqIWQ7L/xAAZAQADAQEBAAAAAAAAAAAAAAAAAQIDBAX/xAAjEQACAgMBAAEFAQEAAAAAAAAAAQIRAyExEkEEEyIyUUJh/9oADAMBAAIRAxEAPwDWNk6043p4KlRxM04htCVjGrE5G9HoBxATHYVijoZHCSoeVE5p0pIlJSZic9KeTI2xS6ZHuM5pMBgtyZkfKjDRjJMUax5sYAG1CD9PapsODsNkjQFgT+8qae0AYG9MI+09KkGAqM0IljSgQeh6UPXOKdO0nM9KApBEYzTFQJmIoSMzJnaaF5xtlMrWlKR1JqmvOaODWpIcv2gR+6Qf7Ug4XeNO+OkUqVA9ayiOeuGFRGuFbQTAI9CaiufiBZJUQGH94AMD51N/8C0bWU606ttQipYPp61iLfnnhLqkpcU43nOtEj6ir/hvHbG9UoW90haY1IUD9qd10G0XIMdK4dO9A24FtawdQPbrRDtGT0q7TQjp3P0pQRgdaSMR0rj26fyooZxEda4mYrh/KkM7detACKPWg6CDRE13uOlIDp8lLMRkmhz164ogoBUSdulAFelJ1SRPtToHlJE0gUk5CqNJTsD9KaNDu0k0K9YAiT/ajkY2mlOnEwfahkjJBJCjj1mjgRMmgUZVt7T0ok7d/WpYPYaBCjnttT6sEimGkmQY3o7x1Nu2484QlCQSoqPvQgbOccCG1OOeVCRJPasbzFz1a2gWxw1JffA+JQhA/vWe5t5ifvXVNtvKQx0CTGPXvNY11XiKBBhIGwrRY72zKUv4WXEeYOIcRKvzN0tyTgIOlI+VVpuSEq1KWVHYJMD50KAJBGqDtP8ArNAWAkp0EKneT0rVRSIHUuLWnyDUTg5gCmiVjfT6iKNCUqjUYkx2ikcagkKVkbGd6aoAPzJSrAHywak2vEXGXAW1lOMwaiFo9s9qEqKPKiIJnak4pjNhy9zXfWty1auXKzarV8PVPeD0r1Wy4gwplKkK8ygDgz9TXz8h7w8yI6Yq84fzHf2yAUPwlUDG5ArCWNp3EpSPdEOJWMEH55ojgkV59y1zjrcQzdrSUr/fUnb51vWHEutpUhUyJpKXwy07DPr2pM9emN6KE5k0JjagAVT0+9d5fCIOrWVCO0Vyk4ocCdqYw0kyCDtQpVOoYmdjSjYYx0NQ+YL5PB7G3uFJEvqAT7QZoWwbHfCJUCZijDJAkE0KXesA/OjDyoIgfWqGIG5MEn50pY1CSCB6V3iqnI+lC6spzBIoqwFW220opUU/D70CHUAYBMdDimnVaiDGwpbdCn1+GhIKiCQCYwKzkMdD6/EbAAAUqJ05FYj8ReYCkjhts5KjlwDoe1aPj/E08N4eu5mCn4fU14/cOLu313V0qFunWo1cI2yJMaeaeWnxCDpHqM0z4QB3SkEd6fccUqSlKiZOSelLaWq7p0BCYJ7Zrd6RmlboiKaPi+aFACMGprNsl1IABQIidO30rRcM5VddIUsEic4itLbcuNsoggep/wBb1DyJG8cLZ545wt0KgtkEHPagTYOKSuUkhJyK9SPB0dAoj1FNjgLSDqIJJ+1L7sSn9Ozyxdo5GUkSO1Q3mNMyZjtmvVrvgiHElMJGZmKzl/ysvzFsAq77VSyRZLwSMJp6rMCacaSVrEkqExA3ip99wt62kOJCNOYHWoTf7FwETqmaowlFpky1UpDaoUdI27g7V6HyRx94sJtnlKWhPwmdq83Q4UR4gI1GRB3q45cv/wAnxcJUYYcVBJHeM1llScbBOj2pDmtOoHJ2NOaoHeqrh750hP8AWrJJ3/tWMXaNUGVeXJoEkkzG+9EY07RQojUNeR1jeqYBHO8nHesh+Iy1uN8PtmiSoa1kTsMCtcogqJTOkHAPasZzpKuMsgmNFsBHzmhCZssqVnTHtXFHmGBim0BSSSdXpAnNPZxqWr/wqxg6TOB74pSgRtijSUgmVqA/6aAE4GsmP4aYDLrYKfKmD9KZCFJcnIipjgxMn2igJM9RjtUtWM89/EC8BcYtSDISXMHArEEBuVriVGAScVo+eFpc4m64pcrnTpjAHWssVeI54iwrSDCE9DitoqkZSe6H221PPJCATkJ26V6Ly9wdDNqgqQJMGYrJ8vWCnX2/PJxIA2r1KxYDbSQe0VhmnWjowR+QmLdIkJAAGBUptgRNE0Ug5z2p1K8Vy+jsTALAmYiKHwEnenwT13oCvuKbZSIbtukjYfKoNywCJgTt8qtXFA9qiOgdqExmS4rwdL6lEpGx3rDcZswwfImIORXrFy2CDpJjp1rA8zWqkuagJnEd5rpwzvRy5oasx6FzqQ4J7R0qQy4VlDY3G3v3qO4CACuQrY+lcy4pLjauqc5rdq0cD6evcr335qxZW6T4gwqevT+lapHmRM5rznk+4PgpKSNOrJnY1vrNwqTE9BiuRKpGseEk9e1JBA2yaIEFO2DXJ2ODFVsYiTWP5plfMaUaSYtUk59RWyjAwKyHGNL3NNzOdDIR9IqkxM2iNBOT8xXKA1byOmKYBTMANA/9JrkEJUR4Taj3qrGSEwRvSnTPemVLBnS0iK4QIJbTFABqAkRjv603pAkmcHMVy1SYKEQOtIojeAB9qLGeYc88PbtlrvH1y4+4dLQMY6GsxaW5V5lgqSjf0J2Fb38Q+HqdR+ecV5W06UBJ2rK8usfmuIeFBDSUgqB2J7+taOVKyauRqeAWbdkwh+4KU4k6iBE1YL5ps2lhDRKwcTEVG4pwd28Lcrc0gAeGFQKl8N5XskoPjpSoEd65qjLcjqSa4OM812BXClOADeUR96vLW8YuwFtLKkH03NRE8u8O8MlTY0jqlWakW1p+TToZ+DcEjNDhAtOVlklorRqSQcwKB9AYSpTkyATiltHi2gITsMA0F/8A7xqBUfhil+BdzM9xPjybcaWrdxSh+oQKqDzQtJPi2ykg9ZEfStObK3KocbLsYAqWOWmrlOtFq2mR161tjxwkzOblFbZjWOYGXXghXk1dVGmeN2Kbm1WoZGjPrVrxflMoCyq1UB0ITI+1Q7CxfYtlMvqBREIzke9PJi+27Qov2jzHiVsphwBYxH3qGyCpYSk+1azmi2Sg9tUx/OsxaNkuCDHb0rVS0ceSPl0a/lNlbT6HW3TpJKVIAiD7V6Pw1RKQI3nrWJ5YQtxKbhSRBTEf1rZcObgkz1yO1ckv2CJap+VFEZxmkSN5n60Qqloo5KSSB6xWPR+343eO6TCnHI9gUitknykKP7sq+lZTl8Fy4bXPxMuLPupyafwJmmDTmwacM/wmnxbvgT4To/7TSNOKCf8AGcBHdRpwvPLmXndt5ir0UwEtORPhr3/TSKC8J0L37UYUsJjW5/5GmyTvrXv+qmIZWpOvSZCpIj1qO7q8QheCOhp95CUyqPNuM1HRqcUdUyd5rKRSIHGrVN3w59spkFMCNpNYnk+3KL66OlUJUlAJ2kGYr0ZaApC09Ck1ieWdX5i6GkAl47+9Db8FQVyNO+o+BC/jncHBFQ0q4kXUhhLaUd1ETHoKtvDS+0lEAKGZNGzw9STJBHqKyjJJHUoIbsmOIPFDbowXRDkgeXtH9askfs1LQ+VAJJA0+amkMFPU46k0dwSllaWSA4oeUzWv3Y1VE+JJ9I/DrwXB8RaAGkKI8pkyKG0ukOXLqXTpU2oQmCZB60tq0m1tktJMkSSe5qJ4CvzqHULKZToUNpHSudOmaeW/kmi3uHXFBTi2gAdK0jrVw+bvh/Bl+E4VuhsaSTkKqMlZW2ARIB2FML1rZKFrUANgZ77V2QmkuGGTG5vZTs8e4kVJauHlATuUggZouLOamVLtwHkT8aTpn1ArrmyKgAlJ1bz2qNdqKG0sjZAie9Z5J2y1i88MDzmtWq3JTHWZ6jFVNjwp919pKkadasT3q75zSXWUDEhczFaHhtkg8vcEWMOu/tFqUOgq/dRMMkE3Y9whjwbYAI0nr6VpLJtQTJ33qsYbKldd8CtBYIQkpDoVozMd+lZdZgg1KLiwpyJJgwMUOQDAEA0+UpFghwfGXCIJppC1Bp5OIXE4qh2IvUW1oGf2ajtvg1muUXkXKEsXGEMsDQW0wTKjMnrtWoaUAHiqTLC0pj2rJ8j3KG13HiNNufs0gaxt5lU215EzUBERDzeakeEG0hP5pkz0ANQ3cp+KI38tEhQGJMj0irstok+GiSPzDfyBptaUgH9oFfKkmOpz1oCUxt96LEhkuKXCVwlJUJPaktXG2rtC1o1oCjIxkdKJ0y2RURIg4296zY0SRpDo0kHvWUt2UM8Xuy2MKeJrUM/4oEQCQAZmqAJnibpBkeMZ9YqJPReNfkXluBCekVNSDphMj2qDbiAMR86sme5isEdy4clnAUsnTH1qMoB5RWFBDacQT/WpVwoRk4B2rOcQt1XDDlu7JaUoqGlRBBrVr+Ar6XqG0LSYUkRmZqEthDqwEvBDgyBOarLBp2ztUMeM65p/UZNNi3ZRdqu0Nk3EfGpRxR50CZe2N0VNeE8POhWlSgetTC2oj4iR0zVTw1QhSVZUtWpR9atrRcpIV0pJvjBkK5SQDqk+5qmvCNKtImr+8mCM57VRXQ+IgdNqF0b2jG8XYVdvNtiYW8lO2M4rbXloLEW9knKbZqEes5JrN3CCEqcHxNrCx8jWo4tcC4um19Qymcbkj/Or9WcWXQfD2ZOqZBq6YUG3EqKAoD907Gq+ySEp3wBU9An2qomCOUuU6TgaiqOgJocaSO8VxTgUo0jBIntNUFUIkKIVHYiPlWP5MSk/mTIgQPuqtiV6EOKUdMoOT0xWN5NUAzcjUJ1CfvSbXkRrCWp8qFD/ALqdQG1AwwcbnXUZKwPp3pwLMQMT6VdsseUloH/CJMba6HQlWyAPnQJOnfVHSj1mYzHrRYhr8uoK1SIHQVHJEqMQSamF0n4TgelMkJWSTPvSexoBsnxAnM7/AHqibg8UfSBjxic/KtAkaM7jE1QcQQLXj2kGErEgVlNaNcbqReMjv2qU3jO1RLcggETt1p8q/Z4Gaw4diGrh0qj2PSox8NCSpSsnvS3JUUkIBJ/diqkh9V0DeAeEBHhpO9bLZNMsU3FsVFKVnVGTFM/mbYqPnKZ/UOtTm7lhDbak2LZUMGUYj+9Q+KXqFJWRYtyoxJx/LNaeUFv+AtylxKiMdwZq2Yf6CaytmbpLqoUPCBkAzNX/AA5alp1EQQPpWUnQ1dky4MIj+VVN4mAe8b1ZrVOJk+1V94BpMxSRTejOOgFxbeAN5JxFXjySq4BOy0giegiKo2EpuLpSVT4ZVBj0q5S9LqVLGEjTA6CmcOV7Lm1TDYnIipSSQKj2qgpvqMVITBTWiMglqUlRSYkDpmonErdh+0Wm6KUtqB8+oApHf0qUrAxiKoucHVM8F8sgLeQDHUTtVCbpGJ4/b8S4epLbl2p+zUrU0QslDgnqJ3pngXEkWbd01cl1KXXQ4FM4iBEEVNsLpnQ7aXwK7JxJ8s5bV0Ums+gOhJciUlRSFHYx67TUKXpUYer2j2FKzGM04l1RO5iNgaYSlUmRCSJmaLSroUj1NabOkfK1lR8yo7SaQzpUCSSabCYkFYAA3rsnJVgdaAD1HY9u9ICO+9DEkxnHaug7yOgzSYBnCZ37Zqi5rZM276Z1AwrPTBq8AggkTmmeJsJubR1kCVRKfehjTp2QOG3geZSZzuTU4O9zWXsnHGFCRpOxHrVsh6ckzjauaSpndCVompdCiQTMVy2VFST5SkGTIzTKCheJG2amsrABBikmy7GipxCQG2RB2imltqX5tASe6v7VPA1iNqjPpLZ7itN0DkVxQUKJTnrgVOtDoTq6EVFKvPE0puNCCkbCoaEpE3xAVGCY9aqONXQQ0UgyTgRT5e0Nkzmqp1Jdf8RZOBAFERSkJw5kpClwJ/qatLRAcWJGOlR0gNoS2kCes9TVjw5uYJG1ao8+btlm0lKBjFOogx0nem0pgd/aueeaYb8R9xLaP1LVAquEsdxE9Tg1VczWi77gb7TSdTqCHEgdYM1CvOcOFMEpaLtysf8ALTj6mo45xZdSoDh7yUlBypxIxGaX3I/BDkjE+J1TO2Qd603JdvaXdm9avobWlDhWEq2E9qw1tcKe1rCYhZgD9J2+1WXCr56zeW62ojWmCJispadoxTSZ6jIAMAb04HP4QTUNNuR/97nzpSy6ANNwrf5iuizrJhXkiPoKTxSnI+1RfCdGfzKp9hQeA8oA+OQfbagCcH560odkdx7b1C8B5J/4kx6pmi8B/Th/bYaaQExK1GZ+VIsnUBFMtNuhSS4+gp7AZNUXMfFTwlsqVc631/4bSAZA7mjr0IHinhs8VKEKSSpIUUg5FOtjVlJ6TFN8i8JHFuD3d5eKK7l50pS6rcEf0yKcXav2j62Xk6Vp3Hp3Henkwtq0b4ci4wk60rkGPSpjNxmDKT61GQNQHSprSEaYUJOM1zpUbthJvSnsI6gU2/c6hBJPvT5ZZMKKcD70Jt7fBCZO+TViK5bpWqG9wck9qEjYmQe/Spj4GwAg+lRlCJAGT0FSxpALSMkn+1QH71m3uGkOqgKVCferay4fc364ZR5QfM4dh/rtVL+Jlo1w3hFk21Os3IlfVRg10YvpnPphmzeVSLBADjiUggknFXlo2EIG2djXl3BOYPyjqBdNKfbHQKgitrecc4eeBu3XDiFP4SlBJ1JJ7j2qJRcHRyqfyS+N8fFiFM2SQ9cAeZRPlR79/asXequ71wO3t2p1R2kSAfTsKbZuylvS7mThROTTTri1lOlQgHAnespO2cuTI3wB/RbrKRkjvUO9uCm2DUjxHjER+71p55aVXBW6SBA+3+dRHUvXV0p4pAGyUjoB0qUqISbH+G2ugKcU2TqAPtU0tIJJmB6U3a3bdq0oOocUo/p2qJecWQs6WUKZUD5iTv8ASkrkw82etkyIneuBkR360OJwB6RQzPUR6V1cPSF1T5cAilnG0zTF1cMWjZcuH0NNjOpZiKz3EedLFiU2bTlyeh+FNFN8E3Rq0EyIIPvTdxeMW4JfebbT/GsA15pe81cWvSUIcDCCfhaTEfOq/WtatT5Liv1Ez/OtFhb6ZvIjcca5rtmUlvhZDzv/ADZ8qT/WsNe3D10tbrrqnHlZUtRyT/rpQKIKY6A96bmQNQnIz8xW0caijOU7PduTuHCx5atGUxJSFq9zk1b3/DGOJMAOjS6keVY3FBwny2bIHwFtGn/xqzQKTY1ow17wx6zd0OjfYjY0wBp9h1re3Vs1dMlp5OpJrOX3DF2qp06kdFdPnWOTGntHZhyp6ZSFS9h96KCTOYGZqatlIk+nbJpU22pSUgEnsOtclO6OukQUtEzqOJ61a8L4Cbkh26BQz+nqr/KrThnB0tkO3KQVbpR0TVucCuqGOts482dfrEiKbbYZCGmwlCRgAYrxz8W78u8TsrMZDLZcV7qwPtXsdyqcdDjevnnnG5/Pcy8SdCtSUueGj2Tiu7FpWcMnbKcHSCRgnGO/en0PYnZUAA9jUYjaCTSZ3kge1ZNW9jJRunZB1axGJ6VIY4mpOChMgVW4mBqzXKEHUDkYIqXji/gnyWLzyrhYXrgx8KRt1x60QvrZEFTikrHQoIzVa1he0Sd6k6tQIVlJ7ipeGLHomf7RtHE+a4QQNs/6iq69etnQNLyDncGuNjbuCEKKD+mMVFVwt4eVtaFAHodqhfT1xi8pnrL/ADVwxkYU+4e6UR/OqTifO7i06OHMBmd3XfOfkKx7ji1ZUTPYdqA6jgATNaRxRXTT2yTd3j924Hbl5Tq5wVK/lTLIDqpWsj1FNlIKsRSAlt0LjAG201oopE7ZOQAnCRAk7UqiANzHWgStKhrQR7RQKd8xGI6zTAJcDqSPSuaGtxKNwVJEHvNME+eFHPX+lS+GI13zCSDJcT/+hS+APo+xaCLVlMfC0kfYVITIxStABAHoP5URFZMoWo3ELu2s7Zbt4sJaAzImflUis/zRwJ/iqA5aXSmnUiNJ2I9OxoGumU4rzbZIKlcPtnTpOQ6sJ1ew3pOGc4XxaU+xwlrS2JdJclX+VUvELW8Ytn2HmGAUOFJWYLpI603CEsMMIZfN66tII1n9sgg1zyUvR03qr0encvcy2vGQW0jwrhOS2SDI7g9aulnFUPKfLrPB7RDjiEm8WgeIoDb0H8qv1p1D1reKa6cz7oqeJPflbG5uVmEtNKX9BXzi44XFLdXlayV57kzXvH4lXP5TlC9gwp6Gh8z/AGrwg6cjbFdUX+BDWxogJGr1xST55Vt2ilMFQgxjE9a5Sgrp/XFRTYAFQEg6jPSYppK1KUcR2mnT51AJCR2xXJ64x6daPkLOSCIM5pxBMdYGJFChSTIB9qJKTBHUmfnR0QZUQoGTmi1EZJJ9+lAk4+cfOlIkAk59KdhQBIJK9gZNCkgiT1Eek0qpCUxkHeetIqQqMDFFAEUwImJ7VyU6hpVJA6UQykQOm+9KAQsQBEbkxQM4EFJCQMZPtSyAjyie9cDnMHO0UkwIjr9aVr+COUZgk+maseAoDvF7MATNw2P/AGFVmqQRHXerflgzxrh5jIu0SekSKVaGun0emlNIkHM96KsijqQkDJ2FLVVzNdm04Q8pHxLGgEmAJoBK9Hnt8H7y54jxCyQhLSiQ6tQ8wz+78gKsfw7sW3uIO3NyXXHGEQyHeknJFVVq27/sl29aeDbClJSq2CsKPck1N5X4k/wi9tjf6RZvIKW1g6jBO5P0rnWTdm8o0qR6cKQ7VySFJBGxrjvXQYHnH40PlHC7C21jS48olP8A0ivIVyQABiPpXoX4yXYe47bWwyLdjUfdRrz5R1K2iN/U10x1BEvo3pKUzOelAU4gbkZjoKdG4Wc9xSaZE7xkxUhQKkgghJmRkdqBRASUkbHeM0WJknrk10kK1KBMfOaQITCVAaYPU04CZjIB+woGQpYkzgk07pEIJ6DFMRwwtQ+nWlCZEAx7iuwFbZO1cB5iBP1oGxoDU51G9LOCd4zQpMBR6YGfWkOEAnrmjghxPmZEmSD07V3SJE7UjQCXNBTgiI7k0QTGoQNo+dHpAKqd98UihHmSRIGKGFKSU4GN5rgfTzDOKKGdGZM9yat+XyE8XsiYkPtxj+IVThJUADmNqt+Cf8fZKAwHm+v8VTJaFHp9Ij4zRUI+L5UVZFnVh+er5Trq7DUlDaW9eoidSp2H2raurDbanDskTXlPE7hV9d3AuVuG9bWQwhsCJ6Ed/es8kqiXjVsAtMr4YLtT+m6W4A4zBSkY/SO3eo1zbXNpc2jfiOXTi0hy1bBwM5EHpHX1qV/uJs2HELV+fClG4URqV2M5HyqO5Zoa4oi14W8264UIW26tWotEbj1B6CuX/J0NHqXL7yrjg9q4tOlRRBE7RirGKqOUis8AtS6ZXCtRjrqNWF8+LazffUcNtqWfkJrshxHK+ngXPl0bzmniLoUNIeDY9his8pPTcin7l1T9wp9ZlTiys57maYUSJKjvtXW/4Qd0IJzjYULgxABzXAafNEnbelSSJWYiYGKmgYKoAiJE/egUZWAmYGadSrBXvBgYoEI0nvQLYTYAEdN8UoMoGreuSPMRGD0BpQCQZgweo6U+DOJyn6Qa6BrJ79O1crbGTShBJIAJgDIoGMmEo9dyK4p/aAGIAiDSg6liRnArpHnIT8jSdiABPiBR3macMgJgiCJzTZBKCI6npRtkBOkySnNAhSPN1jfFcfiB3FIflA+1Efh3zt70gOSqFaIiOwqy4OoJv7b1fb+uoVVn90icb9qsOHGLm3VEaXUn/wBhSkikz6YFLQNHU2g90ijO1ZDKbmp1SOFOIbeDK3Maz0Aya8uZWi5W+lpA/OrKYdC40xOo6vXb2itjz9ctOOpQHv2lvBDYE5OSSO0CsXbrZfs3WW0toIdU6HnJHiR+6n+UVhmfwbY1osVv8PfZYS00tAab/wB4PwySes/EKZDFtc8SNtw98sWZJU26lBEOBOQkmpzl+y8+w+/ZFpltLaFIIMkewwR71CuWbS5ubgveJb2Kwt61RISFLAz7D0rFp0jXh6PybP8A8bs5MnSZPfJzUX8QrtVpyjxBafiWjwx7qMU/ySI5ZsgNgkjaOprO/jDd+FwS0tgcvXEkdwkT/au3Eto5ZHjrsk6cAAxIoFZIAmfWi1FImJknJoCTGoSJrpfSDp1HSMjvQEkqKRnG+1L8IK1bnEAV2kFG5k/ypaAQASFYiSBTiwZBG+xpEplGkCQKUplQif8AOjobOgBwxkkd9qDckEke9OLkKEDehOVGPfNFgJI8OexxQrJMQfelHwk5HtXE+UQPtTA//9k=</field>
+      </record>
     </data>
 </openerp>
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 185e9f73a45..dded3241b91 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -79,7 +79,6 @@ class hr_department(osv.osv):
         (_check_recursion, 'Error! You cannot create recursive departments.', ['parent_id'])
     ]
 
-hr_department()
 
 class ir_action_window(osv.osv):
     _inherit = 'ir.actions.act_window'
@@ -103,7 +102,6 @@ class ir_action_window(osv.osv):
                 return False
         return res
 
-ir_action_window()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index e0c3edfdb39..ccd11bc0dc2 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -341,7 +341,8 @@
                             </group>
                             <group>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                <field name="department_id"/>                            </group>
+                                <field name="department_id"/>
+                            </group>
                         </group>
                         <div>
                             <label for="description"/>
diff --git a/addons/hr/html/crm_game_01.png b/addons/hr/html/crm_game_01.png
new file mode 100644
index 00000000000..a3cd109c2de
Binary files /dev/null and b/addons/hr/html/crm_game_01.png differ
diff --git a/addons/hr/html/crm_game_02.png b/addons/hr/html/crm_game_02.png
new file mode 100644
index 00000000000..1a747e1ffe8
Binary files /dev/null and b/addons/hr/html/crm_game_02.png differ
diff --git a/addons/hr/html/crm_game_03.png b/addons/hr/html/crm_game_03.png
new file mode 100644
index 00000000000..2fd14886179
Binary files /dev/null and b/addons/hr/html/crm_game_03.png differ
diff --git a/addons/hr/html/hr_appraisal.png b/addons/hr/html/hr_appraisal.png
new file mode 100644
index 00000000000..f0052bfda61
Binary files /dev/null and b/addons/hr/html/hr_appraisal.png differ
diff --git a/addons/hr/html/hr_employee.png b/addons/hr/html/hr_employee.png
new file mode 100644
index 00000000000..eff8730863f
Binary files /dev/null and b/addons/hr/html/hr_employee.png differ
diff --git a/addons/hr/html/hr_expense.png b/addons/hr/html/hr_expense.png
new file mode 100644
index 00000000000..7fbc35711e1
Binary files /dev/null and b/addons/hr/html/hr_expense.png differ
diff --git a/addons/hr/html/hr_illu_01.png b/addons/hr/html/hr_illu_01.png
new file mode 100644
index 00000000000..ad65bb9b407
Binary files /dev/null and b/addons/hr/html/hr_illu_01.png differ
diff --git a/addons/hr/html/hr_illu_02.png b/addons/hr/html/hr_illu_02.png
new file mode 100644
index 00000000000..b5416926793
Binary files /dev/null and b/addons/hr/html/hr_illu_02.png differ
diff --git a/addons/hr/html/hr_kanban.png b/addons/hr/html/hr_kanban.png
new file mode 100644
index 00000000000..c0782d6adca
Binary files /dev/null and b/addons/hr/html/hr_kanban.png differ
diff --git a/addons/hr/html/hr_recruitment.png b/addons/hr/html/hr_recruitment.png
new file mode 100644
index 00000000000..1951b54a6f2
Binary files /dev/null and b/addons/hr/html/hr_recruitment.png differ
diff --git a/addons/hr/html/hr_social.png b/addons/hr/html/hr_social.png
new file mode 100644
index 00000000000..215d4e3ba70
Binary files /dev/null and b/addons/hr/html/hr_social.png differ
diff --git a/addons/hr/html/hr_timesheet.png b/addons/hr/html/hr_timesheet.png
new file mode 100644
index 00000000000..d06c3a924ec
Binary files /dev/null and b/addons/hr/html/hr_timesheet.png differ
diff --git a/addons/hr/html/index.html b/addons/hr/html/index.html
new file mode 100644
index 00000000000..0bc3db084a4
--- /dev/null
+++ b/addons/hr/html/index.html
@@ -0,0 +1,209 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Human Resources</h2>
+        <h3 class="oe_slogan">Manage the most important asset in your company: People</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=hr">
+                    <img src="hr_kanban.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get all your HR operations managed easily: knowledge sharing, recruitments, appraisals, timesheets, contracts, attendances, payroll, etc.
+           </p><p>
+		   Each need is provided by a specific app that you activate on demand.
+           </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Manage Your Employees</h2>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+Oversee all important information in your company address book. Some information are restricted to HR managers, others are public to easily find colleagues.
+			</p><p>
+Record employee contracts and get alerts when they have to be renewed.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_employee.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Streamline Your Recruitment Process</h2>
+         <h3 class="oe_slogan">Index resumes, track applicants, search profiles</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_recruitment.png">
+        </div>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+Post job offers and keep track of each application received. Follow applicants in your recruitment process with the smart kanban view.
+            </p><p>
+Save time by automating some communications with email templates. Resumes are indexed automatically, allowing you to easily find for specific profiles.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Enterprise Social Network</h2>
+        <h3 class="oe_slogan">Collaborate across departments, geographies and business applications</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+			Break down information silos. Share knowledge and best practices
+			amongst all employees. Follow specific people or documents and join
+			groups of interests to share expertise and documents. 
+			</p><p>
+            Interact with your collegues in real time with live chat.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_social.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Track time and attendances</h2>
+        <h3 class="oe_slogan">Weekly or monthly timesheets with optional attendance tracking</h3>
+        <div class="oe_span6">
+            <img src="hr_timesheet.png" class="oe_picture oe_screenshot">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Keep track of the time spent by project, client or task. It's easy to record timesheets or check attendances for each employee. Get your analytic accounting posted automatically based on time spent on your projects.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Leaves Management</h2>
+        <h3 class="oe_slogan">Manage holidays, legal leaves and sick days</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Keep track of the vacation days accrued by each employee. Employees enter their requests (paid holidays, sick leave, etc), for managers to approve and validate. It's all done in just a few clicks. The agenda of each employee is updated accordingly.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="hr_illu_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Keep Track of Employee Expenses</h2>
+         <div class="oe_span6">
+             <img class="oe_picture oe_screenshot" src="hr_expense.png">
+         </div>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+Get rid of the paper work and follow employee's expenses directly in OpenERP. Don't loose time or money by controlling the full flow: expense validation, reimbursement of employees, posting in the accounting and re-invoicing to customers.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Follow Periodic Appraisals</h2>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Set-up appraisals plans and/or surveys for your employees and watch their evolution. Define steps for interviews and OpenERP will notify managers or subordinates automatically to prepare appraisals. Keep track of the progress of your staff periodically.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="hr_appraisal.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Boost Engagement With Gamification</h2>
+         <h3 class="oe_slogan">Define clear objective and provide real time feedback</h3>
+         <div class="oe_span12">
+            <p>
+Inspire achievement with challenges, goals and rewards. Define clear objectives and provide real time feedback and tangible results. Showcase the top performers to the entire team and publicly recognize a job well done.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Leaderboards</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_01.png">
+            </div>
+            <p>
+               Promote leaders and competition amongst sales team with performance ratios.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Personnal Objectives</h3>
+            <div class="oe_row_img">
+                <img class="oe_picture" src="crm_game_02.png">
+            </div>
+            <p>
+                Assign clear goals to users to align them with the company objectives.
+            </p>
+        </div>
+        <div class="oe_span4 oe_centered">
+            <h3>Team Targets</h3>
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="crm_game_03.png">
+            </div>
+            <p>
+                Compare revenues with forecasts and budgets in real time.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP helped us to effectively record our working time and invoice
+                    our customers while keeping track of our costs.
+                </q>
+                <cite class="oe_cite oe_clearfix oe_ml64">
+                    <div class="oe_author">Wolfgang Taferner</div>
+                    <div class="oe_job"><a href="http://tapo-it.at/en/" target="_blank">Tapo</a>, Austria.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    Thanks to OpenERP, we have unified all our front-office and back-office
+                    HR applications for 300.000 users in a cost effective way.
+                </q>
+                <cite class="oe_cite oe_clearfix oe_ml64">
+                    <div class="oe_author">The Ministry of Education</div>
+                    <div class="oe_job"><a href="http://www.dgrhe.min-edu.pt/_main/" target="_blank">Government of Portugal</a></div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index edefb3be0a2..548df39905c 100644
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -54,17 +54,17 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Link a user to an employee&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Related user field on the Employee form allows to link the OpenERP user (and her rights) to the employee.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
+            <field name="target_node_id" ref="process_node_openerpuser0"/>
+            <field name="source_node_id" ref="process_node_employee0"/>
         </record>
 
         <record id="process_transition_contactofemployee0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Link the employee to information&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In the Employee form, there are different kind of information like Contact information.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
+            <field name="target_node_id" ref="process_node_employeecontact0"/>
+            <field name="source_node_id" ref="process_node_employee0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 8f3697f234a..4383f2d6c74 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -25,13 +25,13 @@
 
     <record id="hr_dept_comp_rule" model="ir.rule">
         <field name="name">Department multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_department"/>
+        <field name="model_id" ref="model_hr_department"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     <record id="hr_job_comp_rule" model="ir.rule">
         <field name="name">Job multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_job"/>
+        <field name="model_id" ref="model_hr_job"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index ce3dc00d258..dcff0ad5085 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -35,7 +35,6 @@ class hr_action_reason(osv.osv):
         'action_type': 'sign_in',
     }
 
-hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
     ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
@@ -86,7 +85,6 @@ class hr_attendance(osv.osv):
     _constraints = [(_altern_si_so, 'Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)', ['action'])]
     _order = 'name desc'
 
-hr_attendance()
 
 class hr_employee(osv.osv):
     _inherit = "hr.employee"
@@ -166,6 +164,5 @@ class hr_employee(osv.osv):
             hr_attendance.create(cr, uid, vals, context=context)
         return True
 
-hr_employee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index 857fc2f54ae..0bf3b73d76e 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -9,13 +9,13 @@
 
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
-            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_attendace_employee" model="ir.rule">
             <field name="name">Employee Attendance</field>
-            <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
+            <field name="model_id" ref="model_hr_attendance"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index 6994bc5f906..93868bb2379 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -48,6 +48,5 @@ class hr_attendance_bymonth(osv.osv_memory):
             'datas': datas,
         }
 
-hr_attendance_bymonth()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 7fcfc175f0e..963a2946ffa 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -49,6 +49,5 @@ class hr_attendance_byweek(osv.osv_memory):
             'datas': datas,
         }
 
-hr_attendance_byweek()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index 066f4a56e07..82d75149428 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -46,7 +46,7 @@ class hr_attendance_error(osv.osv_memory):
         cr.execute("SELECT id FROM hr_attendance WHERE employee_id IN %s AND to_char(name,'YYYY-mm-dd')<=%s AND to_char(name,'YYYY-mm-dd')>=%s AND action IN %s ORDER BY name" ,(tuple(context['active_ids']), date_to, date_from, tuple(['sign_in','sign_out'])))
         attendance_ids = [x[0] for x in cr.fetchall()]
         if not attendance_ids:
-            raise osv.except_osv(_('No Data Available !'), _('No records are found for your selection!'))
+            raise osv.except_osv(_('No Data Available!'), _('No records are found for your selection!'))
         attendance_records = self.pool.get('hr.attendance').browse(cr, uid, attendance_ids, context=context)
 
         for rec in attendance_records:
@@ -64,6 +64,5 @@ class hr_attendance_error(osv.osv_memory):
             'datas': datas,
         }
 
-hr_attendance_error()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index faf8b015a48..0cd31d66bcf 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -49,7 +49,6 @@ class hr_employee(osv.osv):
         'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
     }
 
-hr_employee()
 
 class hr_contract_type(osv.osv):
     _name = 'hr.contract.type'
@@ -57,7 +56,6 @@ class hr_contract_type(osv.osv):
     _columns = {
         'name': fields.char('Contract Type', size=32, required=True),
     }
-hr_contract_type()
 
 class hr_contract(osv.osv):
     _name = 'hr.contract'
@@ -99,6 +97,5 @@ class hr_contract(osv.osv):
     _constraints = [
         (_check_dates, 'Error! Contract start-date must be less than contract end-date.', ['date_start', 'date_end'])
     ]
-hr_contract()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index d4ee28aff68..09c47b89153 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -45,7 +45,6 @@ class hr_evaluation_plan(osv.osv):
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
 
-hr_evaluation_plan()
 
 class hr_evaluation_plan_phase(osv.osv):
     _name = "hr_evaluation.plan.phase"
@@ -98,7 +97,6 @@ Thanks,
         '''),
     }
 
-hr_evaluation_plan_phase()
 
 class hr_employee(osv.osv):
     _name = "hr.employee"
@@ -272,7 +270,6 @@ class hr_evaluation(osv.osv):
                     obj_hr_eval_iterview.write(cr, uid, [survey_req.id], new_vals, context=context)
         return super(hr_evaluation, self).write(cr, uid, ids, vals, context=context)
 
-hr_evaluation()
 
 class survey_request(osv.osv):
     _inherit = "survey.request"
@@ -280,7 +277,6 @@ class survey_request(osv.osv):
         'is_evaluation': fields.boolean('Is Appraisal?'),
     }
 
-survey_request()
 
 class hr_evaluation_interview(osv.osv):
     _name = 'hr.evaluation.interview'
@@ -357,6 +353,5 @@ class hr_evaluation_interview(osv.osv):
         value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
         return value
 
-hr_evaluation_interview()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index 62a5e4abd89..36353b65dfb 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -97,7 +97,6 @@ class hr_evaluation_report(osv.osv):
             )
         """)
 
-hr_evaluation_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 7c7d6f43ee3..209ca281396 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -31,14 +31,14 @@
 
     <record id="hr_evaluation_plan_comp_rule" model="ir.rule">
         <field name="name">Evaluation Plan multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan"/>
+        <field name="model_id" ref="model_hr_evaluation_plan"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     
     <record id="hr_evaluation_plan_phase_comp_rule" model="ir.rule">
         <field name="name">Evaluation Plan Phase multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_evaluation_plan_phase"/>
+        <field name="model_id" ref="model_hr_evaluation_plan_phase"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 2177add8878..8d707baa50e 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -52,12 +52,12 @@ class hr_expense_expense(osv.osv):
             res[expense.id] = total
         return res
 
+    def _get_expense_from_line(self, cr, uid, ids, context=None):
+        return [line.expense_id.id for line in self.pool.get('hr.expense.line').browse(cr, uid, ids, context=context)]
+
     def _get_currency(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0]
-        if user.company_id:
-            return user.company_id.currency_id.id
-        else:
-            return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
+        return user.company_id.currency_id.id
 
     _name = "hr.expense.expense"
     _inherit = ['mail.thread']
@@ -84,7 +84,10 @@ class hr_expense_expense(osv.osv):
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
-        'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account')),
+        'amount': fields.function(_amount, string='Total Amount', digits_compute=dp.get_precision('Account'), 
+            store={
+                'hr.expense.line': (_get_expense_from_line, ['unit_amount','unit_quantity'], 10)
+            }),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
@@ -93,11 +96,13 @@ class hr_expense_expense(osv.osv):
             ('cancelled', 'Refused'),
             ('confirm', 'Waiting Approval'),
             ('accepted', 'Approved'),
-            ('done', 'Done'),
+            ('done', 'Waiting Payment'),
+            ('paid', 'Paid'),
             ],
             'Status', readonly=True, track_visibility='onchange',
             help='When the expense request is created the status is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the status is \'Waiting Confirmation\'.\
-            \nIf the admin accepts it, the status is \'Accepted\'.\n If a receipt is made for the expense request, the status is \'Done\'.'),
+            \nIf the admin accepts it, the status is \'Accepted\'.\n If the accounting entries are made for the expense request, the status is \'Waiting Payment\'.'),
+
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.employee', context=c),
@@ -108,6 +113,12 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
     }
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default.update(account_move_id=False)
+        return super(hr_expense_expense, self).copy(cr, uid, id, default=default, context=context)
+
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state != 'draft':
@@ -276,7 +287,6 @@ class hr_expense_expense(osv.osv):
             tax_code_found= False
             
             #Calculate tax according to default tax on product
-            
             taxes = []
             #Taken from product_id_onchange in account.invoice
             if line.product_id:
@@ -313,15 +323,18 @@ class hr_expense_expense(osv.osv):
                 tax_code_found = True
                 res[-1]['tax_code_id'] = tax_code_id
                 res[-1]['tax_amount'] = cur_obj.compute(cr, uid, exp.currency_id.id, company_currency, tax_amount, context={'date': exp.date_confirm})
-                
-                #Will create the tax here as we don't have the access 
+                ## 
+                is_price_include = tax_obj.read(cr,uid,tax['id'],['price_include'],context)['price_include']
+                if is_price_include:
+                    ## We need to deduce the price for the tax
+                    res[-1]['price'] = res[-1]['price']  - (tax['amount'] * tax['base_sign'] or 0.0)
                 assoc_tax = {
                              'type':'tax',
                              'name':tax['name'],
                              'price_unit': tax['price_unit'],
                              'quantity': 1,
                              'price':  tax['amount'] * tax['base_sign'] or 0.0,
-                             'account_id': tax['account_collected_id'],
+                             'account_id': tax['account_collected_id'] or mres['account_id'],
                              'tax_code_id': tax['tax_code_id'],
                              'tax_amount': tax['amount'] * tax['base_sign'],
                              }
@@ -377,7 +390,6 @@ class hr_expense_expense(osv.osv):
         }
         return result
 
-hr_expense_expense()
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -385,7 +397,6 @@ class product_product(osv.osv):
         'hr_expense_ok': fields.boolean('Can be Expensed', help="Specify if the product can be selected in an HR expense line."),
     }
 
-product_product()
 
 class hr_expense_line(osv.osv):
     _name = "hr.expense.line"
@@ -444,6 +455,27 @@ class hr_expense_line(osv.osv):
             res['value'].update({'uom_id': product.uom_id.id})
         return res
 
-hr_expense_line()
+
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+
+    def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
+        res = super(account_move_line, self).reconcile(cr, uid, ids, type=type, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id, context=context)
+        #when making a full reconciliation of account move lines 'ids', we may need to recompute the state of some hr.expense
+        account_move_ids = [aml.move_id.id for aml in self.browse(cr, uid, ids, context=context)]
+        expense_obj = self.pool.get('hr.expense.expense')
+        currency_obj = self.pool.get('res.currency')
+        if account_move_ids:
+            expense_ids = expense_obj.search(cr, uid, [('account_move_id', 'in', account_move_ids)], context=context)
+            for expense in expense_obj.browse(cr, uid, expense_ids, context=context):
+                if expense.state == 'done':
+                    #making the postulate it has to be set paid, then trying to invalidate it
+                    new_status_is_paid = True
+                    for aml in expense.account_move_id.line_id:
+                        if aml.account_id.type == 'payable' and not currency_obj.is_zero(cr, uid, expense.company_id.currency_id, aml.amount_residual):
+                            new_status_is_paid = False
+                    if new_status_is_paid:
+                        expense_obj.write(cr, uid, [expense.id], {'state': 'paid'}, context=context)
+        return res
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index eab24b06717..ca882406d63 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -32,7 +32,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="name"/>
                     <field name="currency_id" groups="base.group_multi_currency"/>
-                    <field name="amount"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -68,7 +68,7 @@
                     <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user" />
                     <button name="done" states="accepted" string="Generate Accounting Entries" type="workflow" groups="account.group_account_invoice" class="oe_highlight"/>
                     <button name="action_view_move" states="done" string="Open Accounting Entries" type="object" groups="account.group_account_invoice"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted,done,paid" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
                     <group>
diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml
index 242fe6393c2..3ade1f1daca 100644
--- a/addons/hr_expense/process/hr_expense_process.xml
+++ b/addons/hr_expense/process/hr_expense_process.xml
@@ -101,48 +101,48 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is confirmed.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmedexpenses0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftexpenses0"/>
+            <field name="target_node_id" ref="process_node_confirmedexpenses0"/>
+            <field name="source_node_id" ref="process_node_draftexpenses0"/>
         </record>
 
         <record id="process_transition_refuseexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Refuse expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is refused.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_refused0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
+            <field name="target_node_id" ref="process_node_refused0"/>
+            <field name="source_node_id" ref="process_node_confirmedexpenses0"/>
         </record>
 
         <record id="process_transition_approveexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approve expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Expense is approved.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_approved0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedexpenses0"/>
+            <field name="target_node_id" ref="process_node_approved0"/>
+            <field name="source_node_id" ref="process_node_confirmedexpenses0"/>
         </record>
 
         <record id="process_transition_approveinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Supplier Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Creates supplier invoice.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approved0"/>
+            <field name="target_node_id" ref="process_node_supplierinvoice0"/>
+            <field name="source_node_id" ref="process_node_approved0"/>
         </record>
 
         <record id="process_transition_reimburseexpense0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Reimburse expense&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;After creating invoice, reimburse expenses&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reimbursement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierinvoice0"/>
+            <field name="target_node_id" ref="process_node_reimbursement0"/>
+            <field name="source_node_id" ref="process_node_supplierinvoice0"/>
         </record>
 
         <record id="process_transition_reimbursereinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Reinvoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Create Customer invoice&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_reinvoicing0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_reimbursement0"/>
+            <field name="target_node_id" ref="process_node_reinvoicing0"/>
+            <field name="source_node_id" ref="process_node_reimbursement0"/>
         </record>
 
         <!--
@@ -178,4 +178,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 2adc11535ff..b29605a8e31 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -117,6 +117,5 @@ class hr_expense_report(osv.osv):
             )
         """)
 
-hr_expense_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/security/ir_rule.xml b/addons/hr_expense/security/ir_rule.xml
index b9ad5778d1e..3c3cb018489 100644
--- a/addons/hr_expense/security/ir_rule.xml
+++ b/addons/hr_expense/security/ir_rule.xml
@@ -4,19 +4,19 @@
 
         <record id="property_rule_expense_manager" model="ir.rule">
             <field name="name">Manager Expense</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
         <record id="property_rule_expense_employee" model="ir.rule">
             <field name="name">Employee Expense</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
             <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
         <record id="hr_expense_comp_rule" model="ir.rule">
             <field name="name">Expense multi company rule</field>
-            <field model="ir.model" name="model_id" ref="model_hr_expense_expense"/>
+            <field name="model_id" ref="model_hr_expense_expense"/>
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 4e113a23510..0eb3c0cbf16 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -180,7 +180,8 @@ class hr_holidays(osv.osv):
     ] 
     
     _sql_constraints = [
-        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "The employee or employee category of this request is missing."),
+        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", 
+         "The employee or employee category of this request is missing. Please make sure that your user login is linked to an employee."),
         ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be anterior to the end date."),
         ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0."),
     ]
@@ -454,7 +455,6 @@ class resource_calendar_leaves(osv.osv):
         'holiday_id': fields.many2one("hr.holidays", "Leave Request"),
     }
 
-resource_calendar_leaves()
 
 
 class hr_employee(osv.osv):
@@ -486,9 +486,9 @@ class hr_employee(osv.osv):
             leave_id = holiday_obj.create(cr, uid, {'name': _('Leave Request for %s') % employee.name, 'employee_id': employee.id, 'holiday_status_id': status_id, 'type': 'remove', 'holiday_type': 'employee', 'number_of_days_temp': abs(diff)}, context=context)
         else:
             return False
-        holidays_obj.signal_confirm(cr, uid, [leave_id])
-        holidays_obj.signal_validate(cr, uid, [leave_id])
-        holidays_obj.signal_second_validate(cr, uid, [leave_id])
+        holiday_obj.signal_confirm(cr, uid, [leave_id])
+        holiday_obj.signal_validate(cr, uid, [leave_id])
+        holiday_obj.signal_second_validate(cr, uid, [leave_id])
         return True
 
     def _get_remaining_days(self, cr, uid, ids, name, args, context=None):
@@ -543,6 +543,5 @@ class hr_employee(osv.osv):
         'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),
     }
 
-hr_employee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5828790c152..5ffbff10040 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -40,8 +40,8 @@
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <calendar string="Leave Request" color="user_id" date_start="date_from" date_stop="date_to">
-                    <field name="user_id"/>
+                <calendar string="Leave Request" color="employee_id" date_start="date_from" date_stop="date_to">
+                    <field name="employee_id"/>
                     <field name="holiday_status_id"/>
                 </calendar>
             </field>
diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml
index 5c10fdff749..79029e45e09 100644
--- a/addons/hr_holidays/process/hr_holidays_process.xml
+++ b/addons/hr_holidays/process/hr_holidays_process.xml
@@ -100,48 +100,48 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Employee Declaration&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Document for employee&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_legaldeclaration0"/>
-            <field model="process.node" name="source_node_id" ref="hr.process_node_employee0"/>
+            <field name="target_node_id" ref="process_node_legaldeclaration0"/>
+            <field name="source_node_id" ref="hr.process_node_employee0"/>
         </record>
 
         <record id="process_transition_holidaysdefrequest0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Holidays def Request&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If holidays available, employee can take it and fill it.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_holidaysrequest0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_holidaysdefinition0"/>
+            <field name="target_node_id" ref="process_node_holidaysrequest0"/>
+            <field name="source_node_id" ref="process_node_holidaysdefinition0"/>
         </record>
 
         <record id="process_transition_refusedrequest0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Refused Request&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Request is refused.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_refused0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0" />
+            <field name="target_node_id" ref="process_node_refused0"/>
+            <field name="source_node_id" ref="process_node_holidaysrequest0" />
         </record>
 
         <record id="process_transition_approvedrequest0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approved Request&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Request is approved.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_approved0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_holidaysrequest0"/>
+            <field name="target_node_id" ref="process_node_approved0"/>
+            <field name="source_node_id" ref="process_node_holidaysrequest0"/>
         </record>
 
         <record id="process_transition_setholiday0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Set Holiday&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Holiday is set in the calendar.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_calendar0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approved0"/>
+            <field name="target_node_id" ref="process_node_calendar0"/>
+            <field name="source_node_id" ref="process_node_approved0"/>
         </record>
 
         <record id="process_transition_employeeholidays0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Employee Holidays&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Employee get holidays&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_holidays0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_legaldeclaration0"/>
+            <field name="target_node_id" ref="process_node_holidays0"/>
+            <field name="source_node_id" ref="process_node_legaldeclaration0"/>
         </record>
 
         <!--
@@ -170,4 +170,4 @@
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index 394575d765d..0e5d6fe773c 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -55,6 +55,5 @@ class hr_holidays_remaining_leaves_user(osv.osv):
             )
         """)
 
-hr_holidays_remaining_leaves_user()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index ff0270026a4..e2c0ffb1a6f 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -3,14 +3,14 @@
   <data>
     <record id="property_rule_holidays_employee" model="ir.rule">
         <field name="name">Employee Holidays</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
     
     <record id="property_rule_holidays_officer" model="ir.rule">
         <field name="name">Holidays Officer</field>
-        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="model_id" ref="model_hr_holidays"/>
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index ef1cb8f9e6f..8a204389572 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -53,6 +53,5 @@ class hr_holidays_summary_dept(osv.osv_memory):
             'datas': datas,
             }
 
-hr_holidays_summary_dept()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 1897d82c882..1ec08eb2c86 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -50,6 +50,5 @@ class hr_holidays_summary_employee(osv.osv_memory):
             'datas': datas,
             }
 
-hr_holidays_summary_employee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 06af3054b68..e7d4cef594a 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -50,6 +50,7 @@ class hr_payroll_structure(osv.osv):
         'note': fields.text('Description'),
         'parent_id':fields.many2one('hr.payroll.structure', 'Parent'),
         'children_ids':fields.one2many('hr.payroll.structure', 'parent_id', 'Children'),
+        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
     }
 
     def _get_parent(self, cr, uid, context=None):
@@ -67,6 +68,10 @@ class hr_payroll_structure(osv.osv):
         'parent_id': _get_parent,
     }
 
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You cannot create a recursive Salary Structure.', ['parent_id']) 
+    ]
+        
     def copy(self, cr, uid, id, default=None, context=None):
         """
         Create a new record in hr_payroll_structure model from existing one
@@ -107,7 +112,6 @@ class hr_payroll_structure(osv.osv):
             parent = self._get_parent_structure(cr, uid, parent, context)
         return parent + struct_ids
 
-hr_payroll_structure()
 
 class hr_contract(osv.osv):
     """
@@ -143,7 +147,6 @@ class hr_contract(osv.osv):
         structure_ids = [contract.struct_id.id for contract in self.browse(cr, uid, contract_ids, context=context)]
         return list(set(self.pool.get('hr.payroll.structure')._get_parent_structure(cr, uid, structure_ids, context=context)))
 
-hr_contract()
 
 class contrib_register(osv.osv):
     '''
@@ -166,7 +169,6 @@ class contrib_register(osv.osv):
                     context=context).company_id.id,
     }
 
-contrib_register()
 
 class hr_salary_rule_category(osv.osv):
     """
@@ -190,7 +192,6 @@ class hr_salary_rule_category(osv.osv):
                     context=context).company_id.id,
     }
 
-hr_salary_rule_category()
 
 class one2many_mod2(fields.one2many):
 
@@ -202,8 +203,8 @@ class one2many_mod2(fields.one2many):
         res = {}
         for id in ids:
             res[id] = []
-        ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids), ('appears_on_payslip', '=', True)], limit=self._limit)
-        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
+        ids2 = obj.pool[self._obj].search(cr, user, [(self._fields_id,'in',ids), ('appears_on_payslip', '=', True)], limit=self._limit)
+        for r in obj.pool[self._obj]._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
             res[r[self._fields_id]].append( r['id'] )
         return res
 
@@ -234,7 +235,6 @@ class hr_payslip_run(osv.osv):
     def close_payslip_run(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'close'}, context=context)
 
-hr_payslip_run()
 
 class hr_payslip(osv.osv):
     '''
@@ -714,7 +714,6 @@ class hr_payslip(osv.osv):
             res['value'].update({'struct_id': False})
         return self.onchange_employee_id(cr, uid, ids, date_from=date_from, date_to=date_to, employee_id=employee_id, contract_id=contract_id, context=context)
 
-hr_payslip()
 
 class hr_payslip_worked_days(osv.osv):
     '''
@@ -736,7 +735,6 @@ class hr_payslip_worked_days(osv.osv):
     _defaults = {
         'sequence': 10,
     }
-hr_payslip_worked_days()
 
 class hr_payslip_input(osv.osv):
     '''
@@ -759,7 +757,6 @@ class hr_payslip_input(osv.osv):
         'amount': 0.0,
     }
 
-hr_payslip_input()
 
 class hr_salary_rule(osv.osv):
 
@@ -897,7 +894,6 @@ result = rules.NET > categories.NET * 0.10''',
             except:
                 raise osv.except_osv(_('Error!'), _('Wrong python condition defined for salary rule %s (%s).')% (rule.name, rule.code))
 
-hr_salary_rule()
 
 class hr_rule_input(osv.osv):
     '''
@@ -912,7 +908,6 @@ class hr_rule_input(osv.osv):
         'input_id': fields.many2one('hr.salary.rule', 'Salary Rule Input', required=True)
     }
 
-hr_rule_input()
 
 class hr_payslip_line(osv.osv):
     '''
@@ -947,16 +942,7 @@ class hr_payslip_line(osv.osv):
         'rate': 100.0,
     }
 
-hr_payslip_line()
 
-class hr_payroll_structure(osv.osv):
-
-    _inherit = 'hr.payroll.structure'
-    _columns = {
-        'rule_ids':fields.many2many('hr.salary.rule', 'hr_structure_salary_rule_rel', 'struct_id', 'rule_id', 'Salary Rules'),
-    }
-
-hr_payroll_structure()
 
 class hr_employee(osv.osv):
     '''
@@ -989,6 +975,5 @@ class hr_employee(osv.osv):
         'total_wage': fields.function(_calculate_total_wage, method=True, type='float', string='Total Basic Salary', digits_compute=dp.get_precision('Payroll'), help="Sum of all current contract's wage of employee."),
     }
 
-hr_employee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py
index 8de2f51d18f..e5b8dea8e48 100644
--- a/addons/hr_payroll/report/__init__.py
+++ b/addons/hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index 39c913adada..72500a9c6c9 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index 8ed91bd9a82..3e1dc2b1966 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 1251fedd826..6b561b8d688 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_security.xml
index d55f1c81cce..e410eae7250 100644
--- a/addons/hr_payroll/security/hr_security.xml
+++ b/addons/hr_payroll/security/hr_security.xml
@@ -8,10 +8,10 @@
 
     <record id="property_rule_employee_payslip" model="ir.rule">
         <field name="name">Employee Payslip</field>
-        <field model="ir.model" name="model_id" ref="model_hr_payslip"/>
+        <field name="model_id" ref="model_hr_payslip"/>
         <field name="domain_force">['|', ('employee_id.user_id', '=', user.id), ('employee_id.department_id.manager_id.user_id', '=', user.id)]</field>
         <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
     </record>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
index 716a5060f14..ff078b09a67 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
@@ -50,6 +50,5 @@ class payslip_lines_contribution_register(osv.osv_memory):
             'datas': datas,
         }
 
-payslip_lines_contribution_register()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index aa36d223406..3bf8b339300 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -49,7 +49,7 @@ class hr_payslip_employees(osv.osv_memory):
         to_date = run_data.get('date_end', False)
         credit_note = run_data.get('credit_note', False)
         if not data['employee_ids']:
-            raise osv.except_osv(_("Warning !"), _("You must select employee(s) to generate payslip(s)."))
+            raise osv.except_osv(_("Warning!"), _("You must select employee(s) to generate payslip(s)."))
         for emp in emp_pool.browse(cr, uid, data['employee_ids'], context=context):
             slip_data = slip_pool.onchange_employee_id(cr, uid, [], from_date, to_date, emp.id, contract_id=False, context=context)
             res = {
@@ -68,6 +68,5 @@ class hr_payslip_employees(osv.osv_memory):
         slip_pool.compute_sheet(cr, uid, slip_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-hr_payslip_employees()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 07aff9001b6..ccab06c0dc1 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -187,7 +187,6 @@ class hr_payslip(osv.osv):
                 move_pool.post(cr, uid, [move_id], context=context)
         return super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)
 
-hr_payslip()
 
 class hr_salary_rule(osv.osv):
     _inherit = 'hr.salary.rule'
@@ -197,7 +196,6 @@ class hr_salary_rule(osv.osv):
         'account_debit': fields.many2one('account.account', 'Debit Account'),
         'account_credit': fields.many2one('account.account', 'Credit Account'),
     }
-hr_salary_rule()
 
 class hr_contract(osv.osv):
 
@@ -207,7 +205,6 @@ class hr_contract(osv.osv):
         'analytic_account_id':fields.many2one('account.analytic.account', 'Analytic Account'),
         'journal_id': fields.many2one('account.journal', 'Salary Journal'),
     }
-hr_contract()
 
 class hr_payslip_run(osv.osv):
 
@@ -228,6 +225,5 @@ class hr_payslip_run(osv.osv):
         'journal_id': _get_default_journal,
     }
 
-hr_payslip_run()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/i18n/lt.po b/addons/hr_payroll_account/i18n/lt.po
new file mode 100644
index 00000000000..c29df14b44e
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/lt.po
@@ -0,0 +1,126 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_credit:0
+msgid "Credit Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:103
+#, python-format
+msgid "Payslip of %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:156
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Credit Account!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_id:0
+msgid "Accounting Entry"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:172
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Debit Account!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_tax_id:0
+msgid "Tax Code"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contract,analytic_account_id:0
+#: field:hr.salary.rule,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_debit:0
+msgid "Debit Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:156
+#: code:addons/hr_payroll_account/hr_payroll_account.py:172
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contract:0
+#: view:hr.salary.rule:0
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:158
+#: code:addons/hr_payroll_account/hr_payroll_account.py:174
+#, python-format
+msgid "Adjustment Entry"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contract,journal_id:0
+#: field:hr.payslip,journal_id:0
+#: field:hr.payslip.run,journal_id:0
+msgid "Salary Journal"
+msgstr ""
diff --git a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
index 76d197a17ec..053fab16e84 100644
--- a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
@@ -36,6 +36,5 @@ class hr_payslip_employees(osv.osv_memory):
         if journal_id: context.update({'journal_id': journal_id})
         return super(hr_payslip_employees, self).compute_sheet(cr, uid, ids, context=context)
 
-hr_payslip_employees()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 749af25e765..e83c546af04 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -57,9 +57,9 @@ You can define the different phases of interviews and easily rate the applicant
         'board_hr_recruitment_statistical_view.xml',
         'hr_recruitment_installer_view.xml',
         'res_config_view.xml',
-        'hr_recruitment_data.xml'
+        'hr_recruitment_data.xml',
     ],
-    'demo': ['hr_recruitment_demo.yml'],
+    'demo': ['hr_recruitment_demo.xml'],
     'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index deccf10619f..e26c96d41d9 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -196,7 +196,7 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange',
-                        domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=AVAILABLE_STATES, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -355,10 +355,12 @@ class hr_applicant(base_stage, osv.Model):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        val = msg.get('from').split('<')[0]
         desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         defaults = {
             'name':  msg.get('subject') or _("No Subject"),
             'description': desc,
+            'partner_name':val,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
@@ -487,6 +489,12 @@ class hr_applicant(base_stage, osv.Model):
         """
         return self.set_priority(cr, uid, ids, '3')
 
+    def get_empty_list_help(self, cr, uid, help, context=None):
+        context['empty_list_help_model'] = 'hr.job'
+        context['empty_list_help_id'] = context.get('default_job_id', None)
+        context['empty_list_help_document_name'] = _("job applicants")
+        return super(hr_applicant, self).get_empty_list_help(cr, uid, help, context=context)
+
 
 class hr_job(osv.osv):
     _inherit = "hr.job"
@@ -504,8 +512,12 @@ class hr_job(osv.osv):
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
-        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
-            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
+        if context is None:
+            context = {}
+        alias_context = dict(context, alias_model_name='hr.applicant')
+        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init,
+            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=alias_context)
+        return res
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index a0b16f042bc..f3f1b3e712d 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -485,6 +485,18 @@
         <field name="default" eval="False"/>
         <field name="description">Applicant refused</field>
     </record>
-
+    <!-- Applicant Categories(Tag) -->
+    <record id="tag_applicant_reserve" model="hr.applicant_category">
+        <field name="name">Reserve</field>
+    </record>
+    <record id="tag_applicant_manager" model="hr.applicant_category">
+        <field name="name">Manager</field>
+    </record>
+    <record id="tag_applicant_it" model="hr.applicant_category">
+        <field name="name">IT</field>
+    </record>
+    <record id="tag_applicant_sales" model="hr.applicant_category">
+        <field name="name">Sales</field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
new file mode 100644
index 00000000000..c15e0deb188
--- /dev/null
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<openerp>
+  <data noupdate="1">
+    <record id="hr_case_salesman0" model="hr.applicant">
+        <field name="name">Salesperson</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field eval= "time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+        <field name="priority">2</field>
+        <field name="partner_name">Enrique Jones</field>
+        <field name="partner_mobile">9963214587</field>
+        <field name="stage_id" ref="stage_job1"/>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_traineemca0" model="hr.applicant">
+        <field name="name">Trainee - MCA</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="priority">3</field>
+        <field name="partner_name">Marie Justine</field>
+        <field name="partner_mobile">9988774455</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6633225</field>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date_action"/>
+        <field name="title_action">Call to define real needs about training</field>
+    </record>
+    <record id="hr_case_fresher0" model="hr.applicant">
+        <field name="name">Fresher</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="priority">1</field>
+        <field name="partner_name">Jose</field>
+        <field name="stage_id" ref="stage_job3"/>
+        <field name="partner_phone">999666735</field>
+        <field eval="time.strftime('%Y-%m-5 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
+        <field name="name">Marketing Job</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_name">John Bruno</field>
+        <field name="stage_id" ref="stage_job5"/>
+        <field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
+        <field name="title_action">Call to define real needs about training</field>
+    </record>
+    <record id="hr_case_marketingjob0" model="hr.applicant">
+        <field name="name">More than 5 yrs Experience in PHP</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_name">Sandra Elvis</field>
+        <field name="stage_id" ref="stage_job6"/>
+        <field eval="time.strftime('%Y-%m-20 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_financejob0" model="hr.applicant">
+        <field name="name">Finance Job</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="priority">4</field>
+        <field name="partner_name">David Armstrong</field>
+        <field name="stage_id" ref="stage_job2"/>
+        <field name="partner_phone">33968745</field>
+        <field eval="time.strftime('%Y-%m-18 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_traineemca1" model="hr.applicant">
+        <field name="name">Trainee - MCA</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="partner_name">Tina Augustie</field>
+        <field name="partner_mobile">9898745745</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6630125</field>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_programmer" model="hr.applicant">
+        <field name="name">Programmer</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="partner_name">Shane Williams</field>
+        <field name="partner_mobile">9812398524</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6630125</field>
+        <field name="salary_expected">11000.0</field>
+        <field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_advertisement" model="hr.applicant">
+        <field name="name">Advertisement</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field name="partner_name">David Armstrong</field>
+        <field name="partner_mobile">9988774455</field>
+        <field name="stage_id" ref="stage_job2"/>
+        <field name="salary_expected">11000.0</field>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+
+    <record id="hr.job_developer" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+  </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
deleted file mode 100644
index 2554c690c15..00000000000
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ /dev/null
@@ -1,102 +0,0 @@
--
-  !record {model: hr.applicant, id: hr_case_salesman0}:
-    date: !eval time.strftime('%Y-%m-01 10:35:50')
-    type_id: degree_graduate
-    priority: '2'
-    partner_name: 'Enrique Jones'
-    partner_mobile: '9963214587'
-    job_id: hr.job_developer
-    stage_id: stage_job1
-    name: 'Salesperson'
-    partner_phone: '1236547890'
-
--
-  !record {model: hr.applicant, id: hr_case_traineemca0}:
-    date: !eval time.strftime('%Y-%m-10 18:15:00')
-    type_id: degree_bac5
-    priority: '3'
-    user_id: base.user_demo
-    partner_name: 'Marie Justine'
-    partner_mobile: '9988774455'
-    job_id: hr.job_developer
-    stage_id: stage_job4
-    name: 'Trainee - MCA'
-    partner_phone: '6633225'
--
-  !record {model: hr.applicant, id: hr_case_fresher0}:
-    date: !eval time.strftime('%Y-%m-15 16:10:00')
-    type_id: degree_licenced
-    priority: '1'
-    user_id: base.user_root
-    partner_name: 'Jose'
-    job_id: hr.job_developer
-    stage_id: stage_job3
-    name: 'Fresher'
-    partner_phone: '999666735'
--
-  !record {model: hr.applicant, id: hr_case_yrsexperienceinphp0}:
-    date: !eval time.strftime('%Y-%m-25 16:25:52')
-    job_id: hr.job_developer
-    type_id: degree_bac5
-    user_id: base.user_root
-    partner_name: 'Sandra Elvis'
-    stage_id: stage_job6
-    name: 'More than 5 yrs Experience in PHP'
--
-  !record {model: hr.applicant, id: hr_case_marketingjob0}:
-    date: !eval time.strftime('%Y-%m-26 17:15:32')
-    type_id: degree_licenced
-    user_id: base.user_demo
-    partner_name: 'John Bruno'
-    job_id: hr.job_developer
-    color: 5
-    stage_id: stage_job5
-    name: 'Marketing Job'
--
-  !record {model: hr.applicant, id: hr_case_financejob0}:
-    date: !eval time.strftime('%Y-%m-26 17:39:42')
-    type_id: degree_licenced
-    priority: '4'
-    partner_name: 'David Armstrong'
-    partner_mobile: '9966332214'
-    job_id: hr.job_developer
-    stage_id: stage_job2
-    name: 'Finance Job'
-    partner_phone: '33968745'
--
-  !record {model: hr.applicant, id: hr_case_traineemca1}:
-    date: !eval time.strftime('%Y-%m-12 17:49:19')
-    type_id: degree_bac5
-    partner_name: 'Tina Augustie'
-    partner_mobile: '9898745745'
-    job_id: hr.job_developer
-    stage_id: stage_job4
-    name: 'Trainee - MCA'
-    partner_phone: '6630125'
-
--
-  !record {model: hr.applicant, id: hr_case_programmer}:
-    date: !eval time.strftime('%Y-%m-12 17:49:19')
-    type_id: degree_bac5
-    partner_name: 'Shane Williams'
-    partner_mobile: '9812398524'
-    stage_id: stage_job4
-    name: 'Programmer'
-    partner_phone: '6630125'
-    job_id: hr.job_developer
-    department_id: hr.dep_rd
-    salary_expected: 11000.0
-
--
-  !record {model: hr.applicant, id: hr_case_advertisement}:
-    date: !eval time.strftime('%Y-%m-26 17:39:42')
-    type_id: degree_licenced
-    partner_name: 'David Armstrong'
-    job_id: hr.job_developer
-    stage_id: stage_job2
-    color: 4
-    name: 'Advertisement'
-    salary_expected: 11000.0
--
-  !record {model: hr.job, id: hr.job_developer}:
-    survey_id: hr_recruitment.survey_job_0
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index dbd4335d730..c280f64105c 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -10,17 +10,13 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
             <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to add a new job applicant.
-              </p><p>
+              <p>
                 OpenERP helps you track applicants in the recruitment
                 process and follow up all operations: meetings, interviews, etc.
               </p><p>
-                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 resumes are indexed automatically, so that you can
-                easily search through their content.
+                Applicants and their attached CV are created automatically when an email is sent.
+                If you install the document management modules, all resumes are indexed automatically, 
+                so that you can easily search through their content.
               </p>
             </field>
         </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ccf5c8f7934..f6fb202252c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -41,7 +41,7 @@
         <field name="arch" type="xml">
             <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
                 <field name="message_unread" invisible="1"/>
-                <field name="create_date" groups="base.group_no_one"/>
+                <field name="create_date"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
@@ -199,7 +199,7 @@
                     <filter string="Appreciation" domain="[]" context="{'group_by':'priority'}"/>
                     <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
                     <filter string="Source" domain="[]" context="{'group_by':'source_id'}"/>
-                    <filter string="Creation Date" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    <filter string="Creation Date" domain="[]" context="{'group_by':'create_date'}"/>
                 </group>
            </search>
         </field>
@@ -263,9 +263,14 @@
                                     <i><field name="name"/></i><br/>
                                     <field name="job_id"/><br/>
                                     <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
-                                    <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
-                                    <field name="date_action"/>
                                 </div>
+                                <div style="padding-left: 0.5em">
+                                    <t t-if="record.date_action.raw_value and record.date_action.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                        <t t-if="record.date_action.raw_value"> : </t>
+                                        <field name="title_action"/>
+                                </div>
+                                <div style="width:240px"><field name="categ_ids"/></div>
                                 <div class="oe_kanban_right">
                                     <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                     <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
@@ -285,7 +290,6 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
-                                    <field name="categ_ids"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>
@@ -312,11 +316,17 @@
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="//div[@class='oe_title']" version="7.0" position="after">
-                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                    <field name="alias_id" invisible="1" required="0"/>
-                    <label for="alias_name" class="oe_edit_only"/>
-                    <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
+            <xpath expr="//div[@class='oe_title']//h1" position="after">
+                <div name="group_alias"
+                        attrs="{'invisible': [('alias_domain', '=', False)]}">
+                    <label for="alias_id" string="Email Alias"/>
+                    <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                    <span name="edit_alias" class="oe_edit_only">
+                        <field name="alias_name" class="oe_inline"
+                                attrs="{'required': [('alias_id', '!=', False)]}"/>
+                        @
+                        <field name="alias_domain" class="oe_inline" readonly="1"/>
+                    </span>
                 </div>
             </xpath>
         </field>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 62fa1badc41..8c365b10070 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -116,6 +116,5 @@ class hr_recruitment_report(osv.osv):
                      s.department_id
             )
         """)
-hr_recruitment_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/security/hr_recruitment_security.xml b/addons/hr_recruitment/security/hr_recruitment_security.xml
index 570b0f036cd..4fccca1a791 100644
--- a/addons/hr_recruitment/security/hr_recruitment_security.xml
+++ b/addons/hr_recruitment/security/hr_recruitment_security.xml
@@ -4,7 +4,7 @@
 
     <record id="hr_applicant_comp_rule" model="ir.rule">
         <field name="name">Applicant multi company rule</field>
-        <field model="ir.model" name="model_id" ref="model_hr_applicant"/>
+        <field name="model_id" ref="model_hr_applicant"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index f2d4e4736fa..335edc71892 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -4,8 +4,7 @@
   An applicant is interested in the job position. So he sends a resume by email.
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('hr_recruitment','test', 'resume.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('hr_recruitment','test', 'resume.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'hr.applicant', request_message)
 -
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index 82dd534d81b..b0d4aebe09a 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -80,6 +80,5 @@ class hr_recruitment_partner_create(osv.osv_memory):
             'search_view_id': res['res_id']
                 }
 
-hr_recruitment_partner_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
index 58fb706a09e..60d31e74eee 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@@ -50,6 +50,5 @@ class hired_employee(osv.osv_memory):
             context = {}
         return self.pool.get('hr.applicant').case_close_with_emp(cr, uid,context.get('active_ids', []))
 
-hired_employee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index bff25e8e55d..fa14c45f84a 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Timesheets',
+    'name': 'Time Tracking',
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 23,
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index cc9c0653a85..f49ad05f7a9 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -37,8 +37,11 @@ class hr_employee(osv.osv):
     def _getAnalyticJournal(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            result = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
-            return result[1]
+            dummy, res_id = md.get_object_reference(cr, uid, 'hr_timesheet', 'analytic_journal')
+            #search on id found in result to check if current user has read access right
+            check_right = self.pool.get('account.analytic.journal').search(cr, uid, [('id', '=', res_id)], context=context)
+            if check_right:
+                return res_id
         except ValueError:
             pass
         return False
@@ -46,8 +49,11 @@ class hr_employee(osv.osv):
     def _getEmployeeProduct(self, cr, uid, context=None):
         md = self.pool.get('ir.model.data')
         try:
-            result = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
-            return result[1]
+            dummy, res_id = md.get_object_reference(cr, uid, 'product', 'product_product_consultant')
+            #search on id found in result to check if current user has read access right
+            check_right = self.pool.get('product.template').search(cr, uid, [('id', '=', res_id)], context=context)
+            if check_right:
+                return res_id
         except ValueError:
             pass
         return False
@@ -56,7 +62,6 @@ class hr_employee(osv.osv):
         'journal_id': _getAnalyticJournal,
         'product_id': _getEmployeeProduct
     }
-hr_employee()
 
 
 class hr_analytic_timesheet(osv.osv):
diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml
index b6773dbbdd6..2abea3ada67 100644
--- a/addons/hr_timesheet/hr_timesheet_demo.xml
+++ b/addons/hr_timesheet/hr_timesheet_demo.xml
@@ -34,7 +34,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-60.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -47,7 +47,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -60,7 +60,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-90.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -73,7 +73,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
@@ -86,7 +86,7 @@
             <field name="product_uom_id" ref="product.product_uom_hour"/>
             <field name="account_id" ref="account.analytic_administratif"></field>
             <field eval="-30.00" name="amount"/>
-            <field name="general_account_id" model="account.account" ref="account.a_expense"/>
+            <field name="general_account_id" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a80a0b2f151..5435ba45182 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -9,7 +9,7 @@
                 <tree editable="top" string="Timesheet Activities">                  
                     <field name="date" on_change="on_change_date(date)"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'
-                        context="{'default_groups_ref': [base.group_user']}"/>
+                        context="{'default_groups_ref': ['base.group_user']}"/>
                     <field name="name"/>
                     <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                     <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
@@ -31,7 +31,7 @@
                         <group>
                             <field name="name"/>
                             <field name="user_id" on_change="on_change_user_id(user_id)" required="1"
-                                context="{'default_groups_ref': [base.group_user']}"/>
+                                context="{'default_groups_ref': ['base.group_user']}"/>
                         </group>
                         <group>
                             <field name="date" on_change="on_change_date(date)"/>
diff --git a/addons/hr_timesheet/security/hr_timesheet_security.xml b/addons/hr_timesheet/security/hr_timesheet_security.xml
index d7cf34fa1fd..c5549d1ed27 100644
--- a/addons/hr_timesheet/security/hr_timesheet_security.xml
+++ b/addons/hr_timesheet/security/hr_timesheet_security.xml
@@ -4,14 +4,14 @@
 
         <record id="property_rule_timesheet_manager" model="ir.rule">
             <field name="name">Manager HR Analytic Timesheet</field>
-            <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+            <field name="model_id" ref="model_hr_analytic_timesheet"/>
             <field name="domain_force">[(1,'=',1)]</field>
             <field name="groups" eval="[(4,ref('base.group_hr_manager')), (4,ref('base.group_hr_user'))]"/>
         </record>
 
         <record id="property_rule_timesheet_employee" model="ir.rule">
             <field name="name">Employee HR Analytic Timesheet</field>
-            <field model="ir.model" name="model_id" ref="model_hr_analytic_timesheet"/>
+            <field name="model_id" ref="model_hr_analytic_timesheet"/>
             <field name="domain_force">[('user_id', '=', user.id)]</field>
             <field name="groups" eval="[(4,ref('base.group_user'))]"/>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 1523756aae0..efffa6acd5f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -62,6 +62,5 @@ class analytical_timesheet_employee(osv.osv_memory):
             'report_name': 'hr.analytical.timesheet',
             'datas': datas,
             }
-analytical_timesheet_employee()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 8d9f0b01f68..d7dda927111 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -52,6 +52,5 @@ class analytical_timesheet_employees(osv.osv_memory):
             'datas': datas,
             }
 
-analytical_timesheet_employees()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 054e797a884..d0cbdc78c31 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -103,7 +103,6 @@ class hr_so_project(osv.osv_memory):
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-hr_so_project()
 
 class hr_si_project(osv.osv_memory):
 
@@ -168,6 +167,5 @@ class hr_si_project(osv.osv_memory):
                 res.update({'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
-hr_si_project()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 828c7230ddf..6c4f6022c39 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -37,7 +37,6 @@ class hr_timesheet_invoice_factor(osv.osv):
         'factor': lambda *a: 0.0,
     }
 
-hr_timesheet_invoice_factor()
 
 
 class account_analytic_account(osv.osv):
@@ -182,7 +181,7 @@ class account_analytic_line(osv.osv):
             for account in analytic_account_obj.browse(cr, uid, list(account_ids), context=context):
                 partner = account.partner_id
                 if (not partner) or not (account.pricelist_id):
-                    raise osv.except_osv(_('Analytic Account incomplete !'),
+                    raise osv.except_osv(_('Analytic Account Incomplete!'),
                             _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
 
                 date_due = False
@@ -286,7 +285,6 @@ class account_analytic_line(osv.osv):
                 invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
         return invoices
 
-account_analytic_line()
 
 
 class hr_analytic_timesheet(osv.osv):
@@ -314,7 +312,6 @@ class hr_analytic_timesheet(osv.osv):
         return super(hr_analytic_timesheet, self).copy(cursor, user, obj_id,
                 default, context=context)
 
-hr_analytic_timesheet()
 
 
 class account_invoice(osv.osv):
@@ -334,7 +331,6 @@ class account_invoice(osv.osv):
                         il['analytic_lines'][0][2]['to_invoice'] = to_invoice[0]
         return iml
 
-account_invoice()
 
 
 class account_move_line(osv.osv):
@@ -353,6 +349,5 @@ class account_move_line(osv.osv):
                     }, context=context)
         return res
 
-account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 02b46b71b20..3ea7e209051 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -71,7 +71,6 @@ class report_timesheet_line(osv.osv):
                     l.invoice_id
             )
         """)
-report_timesheet_line()
 
 
 
@@ -107,7 +106,6 @@ class report_timesheet_user(osv.osv):
                 group by l.date, to_char(l.date,'YYYY'),to_char(l.date,'MM'), l.user_id
             )
         """)
-report_timesheet_user()
 
 class report_timesheet_account(osv.osv):
     _name = "report_timesheet.account"
@@ -140,7 +138,6 @@ class report_timesheet_account(osv.osv):
                     to_char(create_date, 'YYYY'),to_char(create_date, 'MM'), user_id, account_id
             )
         """)
-report_timesheet_account()
 
 
 class report_timesheet_account_date(osv.osv):
@@ -174,7 +171,6 @@ class report_timesheet_account_date(osv.osv):
                     to_char(date,'YYYY'),to_char(date,'MM'), user_id, account_id
             )
         """)
-report_timesheet_account_date()
 
 
 class report_timesheet_invoice(osv.osv):
@@ -215,7 +211,6 @@ class report_timesheet_invoice(osv.osv):
                     a.user_id
             )
         """)
-report_timesheet_invoice()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
index 53912fcb1d6..c620b2f9584 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic.py
+++ b/addons/hr_timesheet_invoice/report/report_analytic.py
@@ -60,7 +60,6 @@ class report_analytic_account_close(osv.osv):
                     (a.quantity_max>0 and (sum(l.unit_amount)>=a.quantity_max)) or
                     a.date <= current_date
             )""")
-report_analytic_account_close()
 
 class report_account_analytic_line_to_invoice(osv.osv):
     _name = "report.account.analytic.line.to.invoice"
@@ -105,7 +104,6 @@ class report_account_analytic_line_to_invoice(osv.osv):
                     to_char(l.date, 'YYYY'), to_char(l.date,'MM'), product_id, product_uom_id, account_id
             )
         """)
-report_account_analytic_line_to_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index 0896cf7d517..05326bb19c1 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -102,17 +102,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
index d00963073f0..88675f3042f 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -101,17 +101,4 @@
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
-    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
--
-  I create final invoice for this analytic account.
--
-  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
-    date: 1
-    name: 1
-    price: 1
-    time: 1
--
-  I click on "Create Invoice" button to create Invoice and validate the invoice.
--
-  !python {model: hr.timesheet.invoice.create.final}: |
-    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
+    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
index 6c6523f93f9..2675556e8ac 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -70,6 +70,5 @@ class account_analytic_profit(osv.osv_memory):
             'datas': datas,
              }
 
-account_analytic_profit()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 1977d6cccc5..8d5f0c4067c 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -58,6 +58,5 @@ class final_invoice_create(osv.osv_memory):
         act_win['name'] = _('Invoices')
         return act_win
 
-final_invoice_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 6aa8b0f9d8d..874370fea22 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -69,7 +69,6 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         return act_win
 
 
-hr_timesheet_invoice_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 4be032ba99b..70f94a4f57e 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -289,7 +289,7 @@ class hr_timesheet_line(osv.osv):
         return ts_line_ids
 
     _columns = {
-        'sheet_id': fields.function(_sheet, string='Sheet',
+        'sheet_id': fields.function(_sheet, string='Sheet', select="1",
             type='many2one', relation='hr_timesheet_sheet.sheet', ondelete="cascade",
             store={
                     'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
@@ -327,7 +327,6 @@ class hr_timesheet_line(osv.osv):
         return dict([(el, self.on_change_account_id(cr, uid, ids, el, context.get('user_id', uid))) for el in account_ids])
 
 
-hr_timesheet_line()
 
 class hr_attendance(osv.osv):
     _inherit = "hr.attendance"
@@ -425,7 +424,6 @@ class hr_attendance(osv.osv):
                 raise osv.except_osv(_('Error!'), _('You cannot modify an entry in a confirmed timesheet'))
         return True
 
-hr_attendance()
 
 class hr_timesheet_sheet_sheet_day(osv.osv):
     _name = "hr_timesheet_sheet.sheet.day"
@@ -475,12 +473,8 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                                 0.0 as total_attendance
                             from
                                 hr_analytic_timesheet hrt
-                                left join (account_analytic_line l
-                                    LEFT JOIN hr_timesheet_sheet_sheet s
-                                    ON (s.date_to >= l.date
-                                        AND s.date_from <= l.date
-                                        AND s.user_id = l.user_id))
-                                    on (l.id = hrt.line_id)
+                                JOIN account_analytic_line l ON l.id = hrt.line_id
+                                LEFT JOIN hr_timesheet_sheet_sheet s ON s.id = hrt.sheet_id
                             group by l.date::date, s.id
                         ) union (
                             select
@@ -491,21 +485,14 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
                                 SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance
                             from
                                 hr_attendance a
-                                LEFT JOIN (hr_timesheet_sheet_sheet s
-                                    LEFT JOIN resource_resource r
-                                        LEFT JOIN hr_employee e
-                                        ON (e.resource_id = r.id)
-                                    ON (s.user_id = r.user_id))
-                                ON (a.employee_id = e.id
-                                    AND s.date_to >= date_trunc('day',a.name)
-                                    AND s.date_from <= a.name)
+                                LEFT JOIN hr_timesheet_sheet_sheet s
+                                ON s.id = a.sheet_id
                             WHERE action in ('sign_in', 'sign_out')
                             group by a.name::date, s.id
                         )) AS foo
                         GROUP BY name, sheet_id
                 )) AS bar""")
 
-hr_timesheet_sheet_sheet_day()
 
 
 class hr_timesheet_sheet_sheet_account(osv.osv):
@@ -539,7 +526,6 @@ class hr_timesheet_sheet_sheet_account(osv.osv):
             group by l.account_id, s.id, l.to_invoice
         )""")
 
-hr_timesheet_sheet_sheet_account()
 
 
 
@@ -558,7 +544,6 @@ class res_company(osv.osv):
         'timesheet_max_difference': lambda *args: 0.0
     }
 
-res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
index 628cc2097ae..7ebec9ab228 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -100,24 +100,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Sign in/out&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The employee signs in and signs out.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_attendance0"/>
+            <field name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
+            <field name="source_node_id" ref="process_node_attendance0"/>
         </record>
 
         <record id="process_transition_timesheetdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The timesheet line represents the time spent by the employee on a specific service provided.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_timesheet0"/>
+            <field name="target_node_id" ref="process_node_drafttimesheetsheet0"/>
+            <field name="source_node_id" ref="process_node_timesheet0"/>
         </record>
 
         <record id="process_transition_confirmtimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The employee periodically confirms his own timesheets.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmedtimesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_drafttimesheetsheet0"/>
+            <field name="target_node_id" ref="process_node_confirmedtimesheet0"/>
+            <field name="source_node_id" ref="process_node_drafttimesheetsheet0"/>
             <field eval="[(6,0,[ref('hr_timesheet_sheet.t1')])]" name="transition_ids"/>
         </record>
 
@@ -125,24 +125,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The project manager validates the timesheets.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_validatedtimesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
+            <field name="target_node_id" ref="process_node_validatedtimesheet0"/>
+            <field name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
 
         <record id="process_transition_invoiceontimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Billing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created based on the timesheet.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceonwork0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmedtimesheet0"/>
+            <field name="target_node_id" ref="process_node_invoiceonwork0"/>
+            <field name="source_node_id" ref="process_node_confirmedtimesheet0"/>
         </record>
 
         <record id="process_transition_tasktimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Moves task entry into the timesheet line&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_timesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
+            <field name="target_node_id" ref="process_node_timesheet0"/>
+            <field name="source_node_id" ref="process_node_workontask0"/>
          </record>
 
         <!--
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index 49b66b63c0f..61c2b9e53da 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -79,6 +79,5 @@ class hr_timesheet_report(osv.osv):
                     l.currency_id
             )
         """)
-hr_timesheet_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index 31255a3a6b2..16889253a68 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -114,6 +114,5 @@ class timesheet_report(osv.osv):
                         htss.user_id
             )
         """)
-timesheet_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index fe7d0c82767..e7d13c425b6 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -163,24 +163,42 @@ openerp.hr_timesheet_sheet = function(instance) {
                 this.dfm = undefined;
             }
         },
+        is_valid_value:function(value){
+            var split_value = value.split(":");
+            var valid_value = true;
+            if (split_value.length > 2)
+                return false;
+            _.detect(split_value,function(num){
+                if(isNaN(num)){
+                    valid_value = false;
+                }
+            });
+            return valid_value;
+        },
         display_data: function() {
             var self = this;
             self.$el.html(QWeb.render("hr_timesheet_sheet.WeeklyTimesheet", {widget: self}));
             _.each(self.accounts, function(account) {
                 _.each(_.range(account.days.length), function(day_count) {
                     if (!self.get('effective_readonly')) {
-                        self.get_box(account, day_count).val(self.sum_box(account, day_count)).change(function() {
-                            var num = Number($(this).val());
+                        self.get_box(account, day_count).val(self.sum_box(account, day_count, true)).change(function() {
+                            var num = $(this).val();
+                            if (self.is_valid_value(num)){
+                                num = (num == 0)?0:Number(self.parse_client(num));
+                            }
                             if (isNaN(num)) {
-                                $(this).val(self.sum_box(account, day_count));
+                                $(this).val(self.sum_box(account, day_count, true));
                             } else {
                                 account.days[day_count].lines[0].unit_amount += num - self.sum_box(account, day_count);
                                 self.display_totals();
                                 self.sync();
+                                if(!isNaN($(this).val())){
+                                    $(this).val(self.sum_box(account, day_count, true));
+                                }
                             }
                         });
                     } else {
-                        self.get_box(account, day_count).html(self.sum_box(account, day_count));
+                        self.get_box(account, day_count).html(self.sum_box(account, day_count, true));
                     }
                 });
             });
@@ -247,12 +265,12 @@ openerp.hr_timesheet_sheet = function(instance) {
         get_super_total: function() {
             return this.$('.oe_timesheet_weekly_supertotal');
         },
-        sum_box: function(account, day_count) {
+        sum_box: function(account, day_count, show_value_in_hour) {
             var line_total = 0;
             _.each(account.days[day_count].lines, function(line) {
                 line_total += line.unit_amount;
             });
-            return line_total;
+            return (show_value_in_hour && line_total != 0)?this.format_client(line_total):line_total;
         },
         display_totals: function() {
             var self = this;
@@ -266,12 +284,12 @@ openerp.hr_timesheet_sheet = function(instance) {
                     day_tots[day_count] += sum;
                     super_tot += sum;
                 });
-                self.get_total(account).html(acc_tot);
+                self.get_total(account).html(self.format_client(acc_tot));
             });
             _.each(_.range(self.dates.length), function(day_count) {
-                self.get_day_total(day_count).html(day_tots[day_count]);
+                self.get_day_total(day_count).html(self.format_client(day_tots[day_count]));
             });
-            self.get_super_total().html(super_tot);
+            self.get_super_total().html(self.format_client(super_tot));
         },
         sync: function() {
             var self = this;
@@ -279,6 +297,14 @@ openerp.hr_timesheet_sheet = function(instance) {
             self.set({sheets: this.generate_o2m_value()});
             self.setting = false;
         },
+        //converts hour value to float
+        parse_client: function(value) {
+            return instance.web.parse_value(value, { type:"float_time" });
+        },
+        //converts float value to hour
+        format_client:function(value){
+            return instance.web.format_value(value, { type:"float_time" });
+        },
         generate_o2m_value: function() {
             var self = this;
             var ops = [];
diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
index 0cffabd0721..77f722ecdc2 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -13,11 +13,11 @@
     product_id: product.product_product_consultant
     journal_id: hr_timesheet.analytic_journal
 -
-  I create a timesheet for employee "Quentin Paolinon".
+  I create a timesheet for employee "Quentin Paolino".
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     date_from: !eval time.strftime('%Y-%m-01')
-    name: Quentin Paolinon
+    name: Quentin Paolino
     state: new
     user_id: base.user_demo
     employee_id: 'hr.employee_qdp'
@@ -60,10 +60,12 @@
 -
   !python {model: hr_timesheet_sheet.sheet}: |
     uid = ref('base.user_root')
+    from openerp import netsvc
     try:
         self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {"active_ids":
           [ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form")],"active_id": ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"),
           })
+        assert True, "The validation of the timesheet was unexpectedly accepted despite the 2:30 hours of difference"
     except:
         pass
 -
@@ -86,7 +88,7 @@
   !record {model: res.company, id: base.main_company}:
     timesheet_max_difference: 1.00
 -
-  I tried again to confirm the timesheet after modification.
+  I try again to confirm the timesheet after modification.
 -
   !python {model: hr_timesheet_sheet.sheet}: |
         uid = ref('base.user_root')
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index c2d5167c179..62511f4575b 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -58,6 +58,5 @@ class hr_timesheet_current_open(osv.osv_memory):
             value['res_id'] = ids[0]
         return value
 
-hr_timesheet_current_open()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/im/__init__.py b/addons/im/__init__.py
new file mode 100644
index 00000000000..23c6ad13350
--- /dev/null
+++ b/addons/im/__init__.py
@@ -0,0 +1,2 @@
+
+import im
diff --git a/addons/im/__openerp__.py b/addons/im/__openerp__.py
new file mode 100644
index 00000000000..a76dd7c8cc2
--- /dev/null
+++ b/addons/im/__openerp__.py
@@ -0,0 +1,27 @@
+{
+    'name' : 'Instant Messaging',
+    'version': '1.0',
+    'summary': 'Live Chat, Talks with Others',
+    'sequence': '18',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description':
+        """
+Instant Messaging
+=================
+
+Allows users to chat with each other in real time. Find other users easily and
+chat in real time. It support several chats in parallel.
+        """,
+    'data': [
+        'security/ir.model.access.csv',
+        'security/im_security.xml',
+    ],
+    'depends' : ['base'],
+    'js': ['static/src/js/*.js'],
+    'css': ['static/src/css/*.css'],
+    'qweb': ['static/src/xml/*.xml'],
+    'installable': True,
+    'auto_install': False,
+    'application': True,
+}
diff --git a/addons/im/im.py b/addons/im/im.py
new file mode 100644
index 00000000000..cee1705ec35
--- /dev/null
+++ b/addons/im/im.py
@@ -0,0 +1,279 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import openerp
+import openerp.tools.config
+import openerp.modules.registry
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+import datetime
+from openerp.osv import osv, fields
+import time
+import logging
+import json
+import select
+
+_logger = logging.getLogger(__name__)
+
+def listen_channel(cr, channel_name, handle_message, check_stop=(lambda: False), check_stop_timer=60.):
+    """
+        Begin a loop, listening on a PostgreSQL channel. This method does never terminate by default, you need to provide a check_stop
+        callback to do so. This method also assume that all notifications will include a message formated using JSON (see the
+        corresponding notify_channel() method).
+
+        :param db_name: database name
+        :param channel_name: the name of the PostgreSQL channel to listen
+        :param handle_message: function that will be called when a message is received. It takes one argument, the message
+            attached to the notification.
+        :type handle_message: function (one argument)
+        :param check_stop: function that will be called periodically (see the check_stop_timer argument). If it returns True
+            this function will stop to watch the channel.
+        :type check_stop: function (no arguments)
+        :param check_stop_timer: The maximum amount of time between calls to check_stop_timer (can be shorter if messages
+            are received).
+    """
+    try:
+        conn = cr._cnx
+        cr.execute("listen " + channel_name + ";")
+        cr.commit();
+        stopping = False
+        while not stopping:
+            if check_stop():
+                stopping = True
+                break
+            if select.select([conn], [], [], check_stop_timer) == ([],[],[]):
+                pass
+            else:
+                conn.poll()
+                while conn.notifies:
+                    message = json.loads(conn.notifies.pop().payload)
+                    handle_message(message)
+    finally:
+        try:
+            cr.execute("unlisten " + channel_name + ";")
+            cr.commit()
+        except:
+            pass # can't do anything if that fails
+
+def notify_channel(cr, channel_name, message):
+    """
+        Send a message through a PostgreSQL channel. The message will be formatted using JSON. This method will
+        commit the given transaction because the notify command in Postgresql seems to work correctly when executed in
+        a separate transaction (despite what is written in the documentation).
+
+        :param cr: The cursor.
+        :param channel_name: The name of the PostgreSQL channel.
+        :param message: The message, must be JSON-compatible data.
+    """
+    cr.commit()
+    cr.execute("notify " + channel_name + ", %s", [json.dumps(message)])
+    cr.commit()
+
+POLL_TIMER = 30
+DISCONNECTION_TIMER = POLL_TIMER + 5
+WATCHER_ERROR_DELAY = 10
+
+class LongPollingController(openerp.addons.web.http.Controller):
+    _cp_path = '/longpolling/im'
+
+    @openerp.addons.web.http.jsonrequest
+    def poll(self, req, last=None, users_watch=None, db=None, uid=None, password=None, uuid=None):
+        assert_uuid(uuid)
+        if not openerp.evented:
+            raise Exception("Not usable in a server not running gevent")
+        from openerp.addons.im.watcher import ImWatcher
+        if db is not None:
+            req.session._db = db
+            req.session._uid = uid
+            req.session._password = password
+        req.session.model('im.user').im_connect(uuid=uuid, context=req.context)
+        my_id = req.session.model('im.user').get_by_user_id(uuid or req.session._uid, req.context)["id"]
+        num = 0
+        while True:
+            res = req.session.model('im.message').get_messages(last, users_watch, uuid=uuid, context=req.context)
+            if num >= 1 or len(res["res"]) > 0:
+                return res
+            last = res["last"]
+            num += 1
+            ImWatcher.get_watcher(res["dbname"]).stop(my_id, users_watch or [], POLL_TIMER)
+
+    @openerp.addons.web.http.jsonrequest
+    def activated(self, req):
+        return not not openerp.evented
+
+    @openerp.addons.web.http.jsonrequest
+    def gen_uuid(self, req):
+        import uuid
+        return "%s" % uuid.uuid1()
+
+def assert_uuid(uuid):
+    if not isinstance(uuid, (str, unicode, type(None))):
+        raise Exception("%s is not a uuid" % uuid)
+
+
+class im_message(osv.osv):
+    _name = 'im.message'
+
+    _order = "date desc"
+
+    _columns = {
+        'message': fields.char(string="Message", size=200, required=True),
+        'from_id': fields.many2one("im.user", "From", required= True, ondelete='cascade'),
+        'to_id': fields.many2one("im.user", "To", required=True, select=True, ondelete='cascade'),
+        'date': fields.datetime("Date", required=True, select=True),
+    }
+
+    _defaults = {
+        'date': lambda *args: datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+    }
+    
+    def get_messages(self, cr, uid, last=None, users_watch=None, uuid=None, context=None):
+        assert_uuid(uuid)
+        users_watch = users_watch or []
+
+        # complex stuff to determine the last message to show
+        users = self.pool.get("im.user")
+        my_id = users.get_by_user_id(cr, uid, uuid or uid, context=context)["id"]
+        c_user = users.browse(cr, openerp.SUPERUSER_ID, my_id, context=context)
+        if last:
+            if c_user.im_last_received < last:
+                users.write(cr, openerp.SUPERUSER_ID, my_id, {'im_last_received': last}, context=context)
+        else:
+            last = c_user.im_last_received or -1
+
+        # how fun it is to always need to reorder results from read
+        mess_ids = self.search(cr, openerp.SUPERUSER_ID, [['id', '>', last], ['to_id', '=', my_id]], order="id", context=context)
+        mess = self.read(cr, openerp.SUPERUSER_ID, mess_ids, ["id", "message", "from_id", "date"], context=context)
+        index = {}
+        for i in xrange(len(mess)):
+            index[mess[i]["id"]] = mess[i]
+        mess = []
+        for i in mess_ids:
+            mess.append(index[i])
+
+        if len(mess) > 0:
+            last = mess[-1]["id"]
+        users_status = users.read(cr, openerp.SUPERUSER_ID, users_watch, ["im_status"], context=context)
+        return {"res": mess, "last": last, "dbname": cr.dbname, "users_status": users_status}
+
+    def post(self, cr, uid, message, to_user_id, uuid=None, context=None):
+        assert_uuid(uuid)
+        my_id = self.pool.get('im.user').get_by_user_id(cr, uid, uuid or uid)["id"]
+        self.create(cr, openerp.SUPERUSER_ID, {"message": message, 'from_id': my_id, 'to_id': to_user_id}, context=context)
+        notify_channel(cr, "im_channel", {'type': 'message', 'receiver': to_user_id})
+        return False
+
+class im_user(osv.osv):
+    _name = "im.user"
+
+    def _im_status(self, cr, uid, ids, something, something_else, context=None):
+        res = {}
+        current = datetime.datetime.now()
+        delta = datetime.timedelta(0, DISCONNECTION_TIMER)
+        data = self.read(cr, openerp.SUPERUSER_ID, ids, ["im_last_status_update", "im_last_status"], context=context)
+        for obj in data:
+            last_update = datetime.datetime.strptime(obj["im_last_status_update"], DEFAULT_SERVER_DATETIME_FORMAT)
+            res[obj["id"]] = obj["im_last_status"] and (last_update + delta) > current
+        return res
+
+    def search_users(self, cr, uid, domain, fields, limit, context=None):
+        # do not user openerp.SUPERUSER_ID, reserved to normal users
+        found = self.pool.get('res.users').search(cr, uid, domain, limit=limit, context=context)
+        found = self.get_by_user_ids(cr, uid, found, context=context)
+        return self.read(cr, uid, found, fields, context=context)
+
+    def im_connect(self, cr, uid, uuid=None, context=None):
+        assert_uuid(uuid)
+        return self._im_change_status(cr, uid, True, uuid, context)
+
+    def im_disconnect(self, cr, uid, uuid=None, context=None):
+        assert_uuid(uuid)
+        return self._im_change_status(cr, uid, False, uuid, context)
+
+    def _im_change_status(self, cr, uid, new_one, uuid=None, context=None):
+        assert_uuid(uuid)
+        id = self.get_by_user_id(cr, uid, uuid or uid, context=context)["id"]
+        current_status = self.read(cr, openerp.SUPERUSER_ID, id, ["im_status"], context=None)["im_status"]
+        self.write(cr, openerp.SUPERUSER_ID, id, {"im_last_status": new_one, 
+            "im_last_status_update": datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
+        if current_status != new_one:
+            notify_channel(cr, "im_channel", {'type': 'status', 'user': id})
+        return True
+
+    def get_by_user_id(self, cr, uid, id, context=None):
+        ids = self.get_by_user_ids(cr, uid, [id], context=context)
+        return ids[0]
+
+    def get_by_user_ids(self, cr, uid, ids, context=None):
+        user_ids = [x for x in ids if isinstance(x, int)]
+        uuids = [x for x in ids if isinstance(x, (str, unicode))]
+        users = self.search(cr, openerp.SUPERUSER_ID, ["|", ["user", "in", user_ids], ["uuid", "in", uuids]], context=None)
+        records = self.read(cr, openerp.SUPERUSER_ID, users, ["user", "uuid"], context=None)
+        inside = {}
+        for i in records:
+            if i["user"]:
+                inside[i["user"][0]] = True
+            elif ["uuid"]:
+                inside[i["uuid"]] = True
+        not_inside = {}
+        for i in ids:
+            if not (i in inside):
+                not_inside[i] = True
+        for to_create in not_inside.keys():
+            if isinstance(to_create, int):
+                created = self.create(cr, openerp.SUPERUSER_ID, {"user": to_create}, context=context)
+                records.append({"id": created, "user": [to_create, ""]})
+            else:
+                created = self.create(cr, openerp.SUPERUSER_ID, {"uuid": to_create}, context=context)
+                records.append({"id": created, "uuid": to_create})
+        return records
+
+    def assign_name(self, cr, uid, uuid, name, context=None):
+        assert_uuid(uuid)
+        id = self.get_by_user_id(cr, uid, uuid or uid, context=context)["id"]
+        self.write(cr, openerp.SUPERUSER_ID, id, {"assigned_name": name}, context=context)
+        return True
+
+    def _get_name(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = record.assigned_name
+            if record.user:
+                res[record.id] = record.user.name
+                continue
+        return res
+
+    _columns = {
+        'name': fields.function(_get_name, type='char', size=200, string="Name", store=True, readonly=True),
+        'assigned_name': fields.char(string="Assigned Name", size=200, required=False),
+        'image': fields.related('user', 'image_small', type='binary', string="Image", readonly=True),
+        'user': fields.many2one("res.users", string="User", select=True, ondelete='cascade'),
+        'uuid': fields.char(string="UUID", size=50, select=True),
+        'im_last_received': fields.integer(string="Instant Messaging Last Received Message"),
+        'im_last_status': fields.boolean(strint="Instant Messaging Last Status"),
+        'im_last_status_update': fields.datetime(string="Instant Messaging Last Status Update"),
+        'im_status': fields.function(_im_status, string="Instant Messaging Status", type='boolean'),
+    }
+
+    _defaults = {
+        'im_last_received': -1,
+        'im_last_status': False,
+        'im_last_status_update': lambda *args: datetime.datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+    }
diff --git a/addons/im/security/im_security.xml b/addons/im/security/im_security.xml
new file mode 100644
index 00000000000..10297ac0669
--- /dev/null
+++ b/addons/im/security/im_security.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="message_rule_1" model="ir.rule">
+            <field name="name">Can only read messages that you sent or messages sent to you</field>
+            <field name="model_id" ref="model_im_message"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="domain_force">["|", ('to_id.user', '=', user.id), ('from_id.user', '=', user.id)]</field>
+            <field name="perm_unlink" eval="0"/>
+            <field name="perm_write" eval="0"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+        </record>
+
+        <record id="users_rule_1" model="ir.rule">
+            <field name="name">Can only modify your user</field>
+            <field name="model_id" ref="model_im_user"/>
+            <field name="groups" eval="[(6,0,[ref('base.group_user')])]"/>
+            <field name="domain_force">[('user', '=', user.id)]</field>
+            <field name="perm_unlink" eval="0"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_read" eval="0"/>
+            <field name="perm_create" eval="0"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/im/security/ir.model.access.csv b/addons/im/security/ir.model.access.csv
new file mode 100644
index 00000000000..db3fe77f690
--- /dev/null
+++ b/addons/im/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_im_message,im.message,model_im_message,base.group_user,1,0,1,0
+access_im_user,im.user,model_im_user,,1,1,1,0
\ No newline at end of file
diff --git a/addons/im/static/src/audio/Ting.mp3 b/addons/im/static/src/audio/Ting.mp3
new file mode 100644
index 00000000000..ffbb77144b2
Binary files /dev/null and b/addons/im/static/src/audio/Ting.mp3 differ
diff --git a/addons/im/static/src/audio/Ting.ogg b/addons/im/static/src/audio/Ting.ogg
new file mode 100644
index 00000000000..74ee13a4e5a
Binary files /dev/null and b/addons/im/static/src/audio/Ting.ogg differ
diff --git a/addons/im/static/src/audio/purr.mp3 b/addons/im/static/src/audio/purr.mp3
new file mode 100644
index 00000000000..849d303c3b1
Binary files /dev/null and b/addons/im/static/src/audio/purr.mp3 differ
diff --git a/addons/im/static/src/audio/purr.ogg b/addons/im/static/src/audio/purr.ogg
new file mode 100644
index 00000000000..2ddc77537f1
Binary files /dev/null and b/addons/im/static/src/audio/purr.ogg differ
diff --git a/addons/im/static/src/css/im.css b/addons/im/static/src/css/im.css
new file mode 100644
index 00000000000..269d411d416
--- /dev/null
+++ b/addons/im/static/src/css/im.css
@@ -0,0 +1,264 @@
+
+.openerp .oe_im {
+    position: fixed;
+    background-color: #E8EBEF;
+    width: 220px;
+    border-left: 1px solid #AEB9BD;
+}
+
+@media print {
+    .openerp .oe_im, .openerp .oe_im_chatview {
+        visibility: hidden;
+    }
+}
+
+/* button */
+
+.openerp .oe_topbar_imbutton {
+    cursor: pointer;
+}
+
+/* search stuff */
+.openerp .oe_im_frame_header {
+    position: relative;
+    background: #dedede;
+    background: -moz-linear-gradient(#fcfcfc, #dedede);
+    background: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
+    border-bottom: 1px solid border-color !important;
+    padding: 5px;
+}
+.openerp .oe_im_frame_header .oe_im_searchbox {
+    width: 168px;
+    padding: 1px 21px 1px 19px;
+    font-size: 13px;
+    -moz-border-radius: 13px;
+    -webkit-border-radius: 13px;
+    border-radius: 13px;
+}
+.openerp .oe_im_frame_header .oe_im_search_icon {
+    position: absolute;
+    color: #888;
+    top: 2px;
+    left: 9px;
+    font-size: 28px;
+    font-family: "entypoRegular" !important;
+    font-weight: 300 !important;
+}
+.openerp .oe_im_frame_header .oe_im_search_clear {
+    display: none;
+    position: absolute;
+    right: 11px;
+    top: 4px;
+    font-size: 26px;
+    color: #b6b6b6;
+    cursor: pointer;
+}
+.openerp .oe_im_frame_header .oe_im_search_clear:hover {
+    color: #888;
+}
+
+/* users */
+
+.openerp .oe_im_users {
+    padding-bottom: 38px;
+}
+.openerp .oe_im_user {
+    position: relative;
+    padding: 2px 6px;
+    cursor: pointer;
+    font-size: 13px;
+    margin-bottom: 3px;
+}
+.openerp .oe_im_user:hover {
+  background: lightGrey;
+}
+.openerp .oe_im_user_clip {
+    display: inline-block;
+    width: 26px;
+    height: 26px;
+    margin-right: 4px;
+    -moz-box-shadow: 0 0 2px 1px rgba(0,0,0,0.25);
+    -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25);
+    box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25);
+}
+.openerp .oe_im_user_avatar {
+    width: 26px;
+    height: auto;
+}
+.openerp .oe_im_user_name {
+    width: 162px;
+    line-height: 26px;
+    padding-right: 15px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    position: relative;
+}
+
+.openerp .oe_im_user_online {
+    display: none;
+    position: absolute;
+    top: 9.5px;
+    right: 11px;
+    width: 11px;
+    height: 11px;
+    vertical-align: middle;
+    border: 0;
+}
+
+/* conversations */
+
+.openerp .oe_im_chatview {
+    position: fixed;
+    overflow: hidden;
+    bottom: 6px;
+    margin-right: 6px;
+    background: rgba(60, 60, 60, 0.8);
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 0 3px rgba(0,0,0,0.3), 0 2px 4px rgba(0,0,0,0.3);
+    -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 0 3px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(0, 0, 0, 0.3);
+    width: 240px;
+}
+.openerp .oe_im_chatview .oe_im_chatview_disconnected {
+    display:none;
+    z-index: 100;
+    width: 100%;
+    background: #E8EBEF;
+    padding: 5px;
+    font-size: 11px;
+    color: #999;
+    line-height: 14px;
+    height: 28px;
+    overflow: hidden;
+}
+.openerp .oe_im_chatview.oe_im_chatview_disconnected_status .oe_im_chatview_disconnected {
+    display: block;
+}
+.openerp .oe_im_chatview .oe_im_chatview_header {
+    padding: 3px 6px 2px;
+    background: #DEDEDE;
+    background: -moz-linear-gradient(#FCFCFC, #DEDEDE);
+    background: -webkit-gradient(linear, left top, left bottom, from(#FCFCFC), to(#DEDEDE));
+    -moz-border-radius: 3px 3px 0 0;
+    -webkit-border-radius: 3px 3px 0 0;
+    border-radius: 3px 3px 0 0;
+    border-bottom: 1px solid #AEB9BD;
+    cursor: pointer;
+}
+.openerp .oe_im_chatview .oe_im_chatview_close {
+    padding: 0;
+    cursor: pointer;
+    background: transparent;
+    border: 0;
+    -webkit-appearance: none;
+    font-size: 18px;
+    line-height: 16px;
+    float: right;
+    font-weight: bold;
+    color: black;
+    text-shadow: 0 1px 0 white;
+    opacity: 0.2;
+}
+.openerp .oe_im_chatview .oe_im_chatview_content {
+    overflow: auto;
+    height: 287px;
+}
+.openerp .oe_im_chatview.oe_im_chatview_disconnected_status .oe_im_chatview_content {
+    height: 249px;
+}
+.openerp .oe_im_chatview .oe_im_chatview_footer {
+    position: relative;
+    padding: 3px;
+    border-top: 1px solid #AEB9BD;
+    background: #DEDEDE;
+    background: -moz-linear-gradient(#FCFCFC, #DEDEDE);
+    background: -webkit-gradient(linear, left top, left bottom, from(#FCFCFC), to(#DEDEDE));
+    -moz-border-radius: 0 0 3px 3px;
+    -webkit-border-radius: 0 0 3px 3px;
+    border-radius: 0 0 3px 3px;
+}
+.openerp .oe_im_chatview .oe_im_chatview_input {
+    width: 222px;
+    font-family: Lato, Helvetica, sans-serif;
+    font-size: 13px;
+    color: #333;
+    padding: 1px 5px;
+    border: 1px solid #AEB9BD;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: inset 0 1px 4px rgba(0,0,0,0.2);
+    -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.2);
+}
+.openerp .oe_im_chatview .oe_im_chatview_bubble {
+    background: white;
+    position: relative;
+    padding: 3px;
+    margin: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+}
+.openerp .oe_im_chatview .oe_im_chatview_clip {
+    position: relative;
+    float: left;
+    width: 26px;
+    height: 26px;
+    margin-right: 4px;
+    -moz-box-shadow: 0 0 2px 1px rgba(0,0,0,0.25);
+    -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25);
+    box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25);
+}
+.openerp .oe_im_chatview .oe_im_chatview_avatar {
+    float: left;
+    width: 26px;
+    height: auto;
+    clip: rect(0, 26px, 26px, 0);
+    max-width: 100%;
+    width: auto 9;
+    height: auto;
+    vertical-align: middle;
+    border: 0;
+    -ms-interpolation-mode: bicubic;
+}
+.openerp .oe_im_chatview .oe_im_chatview_time {
+    position: absolute;
+    right: 0px;
+    top: 0px;
+    margin: 3px;
+    text-align: right;
+    line-height: 13px;
+    font-size: 11px;
+    color: #999;
+    width: 60px;
+    overflow: hidden;
+}
+.openerp .oe_im_chatview .oe_im_chatview_from {
+    margin: 0 0 2px 0;
+    line-height: 14px;
+    font-weight: bold;
+    font-size: 12px;
+    width: 140px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    color: #3A87AD;
+}
+.openerp .oe_im_chatview .oe_im_chatview_bubble_list {
+}
+.openerp .oe_im_chatview .oe_im_chatview_bubble_item {
+    margin: 0 0 2px 30px;
+    line-height: 14px;
+    word-wrap: break-word;
+}
+
+.openerp .oe_im_chatview_online {
+    display: none;
+    margin-top: -4px;
+    width: 11px;
+    height: 11px;
+}
diff --git a/addons/im/static/src/img/avatar/avatar.jpeg b/addons/im/static/src/img/avatar/avatar.jpeg
new file mode 100644
index 00000000000..7168794022e
Binary files /dev/null and b/addons/im/static/src/img/avatar/avatar.jpeg differ
diff --git a/addons/im/static/src/img/button-gloss.png b/addons/im/static/src/img/button-gloss.png
new file mode 100755
index 00000000000..6f3957702fe
Binary files /dev/null and b/addons/im/static/src/img/button-gloss.png differ
diff --git a/addons/im/static/src/img/glyphicons-halflings-white.png b/addons/im/static/src/img/glyphicons-halflings-white.png
new file mode 100755
index 00000000000..3bf6484a29d
Binary files /dev/null and b/addons/im/static/src/img/glyphicons-halflings-white.png differ
diff --git a/addons/im/static/src/img/glyphicons-halflings.png b/addons/im/static/src/img/glyphicons-halflings.png
new file mode 100755
index 00000000000..a9969993201
Binary files /dev/null and b/addons/im/static/src/img/glyphicons-halflings.png differ
diff --git a/addons/im/static/src/img/green.png b/addons/im/static/src/img/green.png
new file mode 100644
index 00000000000..01fb373c251
Binary files /dev/null and b/addons/im/static/src/img/green.png differ
diff --git a/addons/im/static/src/img/icon.png b/addons/im/static/src/img/icon.png
new file mode 100644
index 00000000000..07d2503ce4e
Binary files /dev/null and b/addons/im/static/src/img/icon.png differ
diff --git a/addons/im/static/src/img/logo.png b/addons/im/static/src/img/logo.png
new file mode 100644
index 00000000000..aca5f4c60d8
Binary files /dev/null and b/addons/im/static/src/img/logo.png differ
diff --git a/addons/im/static/src/img/wood.png b/addons/im/static/src/img/wood.png
new file mode 100644
index 00000000000..22f2450d3ad
Binary files /dev/null and b/addons/im/static/src/img/wood.png differ
diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js
new file mode 100644
index 00000000000..a271c9eccf0
--- /dev/null
+++ b/addons/im/static/src/js/im.js
@@ -0,0 +1,470 @@
+
+openerp.im = function(instance) {
+
+    var USERS_LIMIT = 20;
+    var ERROR_DELAY = 5000;
+
+    var _t = instance.web._t,
+       _lt = instance.web._lt;
+    var QWeb = instance.web.qweb;
+
+    instance.web.UserMenu.include({
+        do_update: function(){
+            var self = this;
+            this.update_promise.then(function() {
+                var im = new instance.im.InstantMessaging(self);
+                im.appendTo(instance.client.$el);
+                var button = new instance.im.ImTopButton(this);
+                button.on("clicked", im, im.switch_display);
+                button.appendTo(instance.webclient.$el.find('.oe_systray'));
+            });
+            return this._super.apply(this, arguments);
+        },
+    });
+
+    instance.im.ImTopButton = instance.web.Widget.extend({
+        template:'ImTopButton',
+        events: {
+            "click": "clicked",
+        },
+        clicked: function() {
+            this.trigger("clicked");
+        },
+    });
+
+    instance.im.InstantMessaging = instance.web.Widget.extend({
+        template: "InstantMessaging",
+        events: {
+            "keydown .oe_im_searchbox": "input_change",
+            "keyup .oe_im_searchbox": "input_change",
+            "change .oe_im_searchbox": "input_change",
+        },
+        init: function(parent) {
+            this._super(parent);
+            this.shown = false;
+            this.set("right_offset", 0);
+            this.set("current_search", "");
+            this.users = [];
+            this.c_manager = new instance.im.ConversationManager(this);
+            this.on("change:right_offset", this.c_manager, _.bind(function() {
+                this.c_manager.set("right_offset", this.get("right_offset"));
+            }, this));
+            this.user_search_dm = new instance.web.DropMisordered();
+        },
+        start: function() {
+            this.$el.css("right", -this.$el.outerWidth());
+            $(window).scroll(_.bind(this.calc_box, this));
+            $(window).resize(_.bind(this.calc_box, this));
+            this.calc_box();
+
+            this.on("change:current_search", this, this.search_changed);
+            this.search_changed();
+
+            var self = this;
+
+            return this.c_manager.start_polling();
+        },
+        calc_box: function() {
+            var $topbar = instance.client.$(".oe_topbar");
+            var top = $topbar.offset().top + $topbar.height();
+            top = Math.max(top - $(window).scrollTop(), 0);
+            this.$el.css("top", top);
+            this.$el.css("bottom", 0);
+        },
+        input_change: function() {
+            this.set("current_search", this.$(".oe_im_searchbox").val());
+        },
+        search_changed: function(e) {
+            var users = new instance.web.Model("im.user");
+            var self = this;
+            return this.user_search_dm.add(users.call("search_users", 
+                        [[["name", "ilike", this.get("current_search")], ["id", "<>", instance.session.uid]],
+                        ["name", "user", "uuid", "im_status"], USERS_LIMIT], {context:new instance.web.CompoundContext()})).then(function(result) {
+                self.c_manager.add_to_user_cache(result);
+                self.$(".oe_im_input").val("");
+                var old_users = self.users;
+                self.users = [];
+                _.each(result, function(user) {
+                    var widget = new instance.im.UserWidget(self, self.c_manager.get_user(user.id));
+                    widget.appendTo(self.$(".oe_im_users"));
+                    widget.on("activate_user", self, self.activate_user);
+                    self.users.push(widget);
+                });
+                _.each(old_users, function(user) {
+                    user.destroy();
+                });
+            });
+        },
+        switch_display: function() {
+            var fct =  _.bind(function(place) {
+                this.set("right_offset", place + this.$el.outerWidth());
+            }, this);
+            var opt = {
+                step: fct,
+            };
+            if (this.shown) {
+                this.$el.animate({
+                    right: -this.$el.outerWidth(),
+                }, opt);
+            } else {
+                if (! this.c_manager.get_activated()) {
+                    this.do_warn("Instant Messaging is not activated on this server.", "");
+                    return;
+                }
+                this.$el.animate({
+                    right: 0,
+                }, opt);
+            }
+            this.shown = ! this.shown;
+        },
+        activate_user: function(user) {
+            this.c_manager.activate_user(user, true);
+        },
+    });
+
+    instance.im.UserWidget = instance.web.Widget.extend({
+        "template": "UserWidget",
+        events: {
+            "click": "activate_user",
+        },
+        init: function(parent, user) {
+            this._super(parent);
+            this.user = user;
+            this.user.add_watcher();
+        },
+        start: function() {
+            var change_status = function() {
+                this.$(".oe_im_user_online").toggle(this.user.get("im_status") === true);
+            };
+            this.user.on("change:im_status", this, change_status);
+            change_status.call(this);
+        },
+        activate_user: function() {
+            this.trigger("activate_user", this.user);
+        },
+        destroy: function() {
+            this.user.remove_watcher();
+            this._super();
+        },
+    });
+
+    instance.im.ImUser = instance.web.Class.extend(instance.web.PropertiesMixin, {
+        init: function(parent, user_rec) {
+            instance.web.PropertiesMixin.init.call(this, parent);
+            user_rec.image_url = instance.session.url("/im/static/src/img/avatar/avatar.jpeg");
+            if (user_rec.user)
+                user_rec.image_url = instance.session.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user_rec.user[0]});
+            this.set(user_rec);
+            this.set("watcher_count", 0);
+            this.on("change:watcher_count", this, function() {
+                if (this.get("watcher_count") === 0)
+                    this.destroy();
+            });
+        },
+        destroy: function() {
+            this.trigger("destroyed");
+            instance.web.PropertiesMixin.destroy.call(this);
+        },
+        add_watcher: function() {
+            this.set("watcher_count", this.get("watcher_count") + 1);
+        },
+        remove_watcher: function() {
+            this.set("watcher_count", this.get("watcher_count") - 1);
+        },
+    });
+
+    instance.im.ConversationManager = instance.web.Controller.extend({
+        init: function(parent) {
+            this._super(parent);
+            this.set("right_offset", 0);
+            this.conversations = [];
+            this.users = {};
+            this.on("change:right_offset", this, this.calc_positions);
+            this.set("window_focus", true);
+            this.set("waiting_messages", 0);
+            this.focus_hdl = _.bind(function() {
+                this.set("window_focus", true);
+            }, this);
+            $(window).bind("focus", this.focus_hdl);
+            this.blur_hdl = _.bind(function() {
+                this.set("window_focus", false);
+            }, this);
+            $(window).bind("blur", this.blur_hdl);
+            this.on("change:window_focus", this, this.window_focus_change);
+            this.window_focus_change();
+            this.on("change:waiting_messages", this, this.messages_change);
+            this.messages_change();
+            this.create_ting();
+            this.activated = false;
+            this.users_cache = {};
+            this.last = null;
+            this.unload_event_handler = _.bind(this.unload, this);
+        },
+        start_polling: function() {
+            var self = this;
+            return new instance.web.Model("im.user").call("get_by_user_id", [instance.session.uid]).then(function(my_id) {
+                self.my_id = my_id["id"];
+                return self.ensure_users([self.my_id]).then(function() {
+                    var me = self.users_cache[self.my_id];
+                    delete self.users_cache[self.my_id];
+                    self.me = me;
+                    self.rpc("/longpolling/im/activated", {}, {shadow: true}).then(function(activated) {
+                        if (activated) {
+                            self.activated = true;
+                            $(window).on("unload", self.unload_event_handler);
+                            self.poll();
+                        }
+                    }, function(a, e) {
+                        e.preventDefault();
+                    });
+                });
+            });
+        },
+        unload: function() {
+            return new instance.web.Model("im.user").call("im_disconnect", [], {context: new instance.web.CompoundContext()});
+        },
+        ensure_users: function(user_ids) {
+            var no_cache = {};
+            _.each(user_ids, function(el) {
+                if (! this.users_cache[el])
+                    no_cache[el] = el;
+            }, this);
+            var self = this;
+            if (_.size(no_cache) === 0)
+                return $.when();
+            else
+                return new instance.web.Model("im.user").call("read", [_.values(no_cache), ["name", "user", "uuid", "im_status"]],
+                        {context: new instance.web.CompoundContext()}).then(function(users) {
+                    self.add_to_user_cache(users);
+                });
+        },
+        add_to_user_cache: function(user_recs) {
+            _.each(user_recs, function(user_rec) {
+                if (! this.users_cache[user_rec.id]) {
+                    var user = new instance.im.ImUser(this, user_rec);
+                    this.users_cache[user_rec.id] = user;
+                    user.on("destroyed", this, function() {
+                        delete this.users_cache[user_rec.id];
+                    });
+                }
+            }, this);
+        },
+        get_user: function(user_id) {
+            return this.users_cache[user_id];
+        },
+        poll: function() {
+            var self = this;
+            var user_ids = _.map(this.users_cache, function(el) {
+                return el.get("id");
+            });
+            this.rpc("/longpolling/im/poll", {
+                last: this.last,
+                users_watch: user_ids,
+                context: instance.web.pyeval.eval('context', {}),
+            }, {shadow: true}).then(function(result) {
+                _.each(result.users_status, function(el) {
+                    if (self.get_user(el.id))
+                        self.get_user(el.id).set(el);
+                });
+                self.last = result.last;
+                var user_ids = _.pluck(_.pluck(result.res, "from_id"), 0);
+                self.ensure_users(user_ids).then(function() {
+                    _.each(result.res, function(mes) {
+                        var user = self.get_user(mes.from_id[0]);
+                        self.received_message(mes, user);
+                    });
+                    self.poll();
+                });
+            }, function(unused, e) {
+                e.preventDefault();
+                setTimeout(_.bind(self.poll, self), ERROR_DELAY);
+            });
+        },
+        get_activated: function() {
+            return this.activated;
+        },
+        create_ting: function() {
+            if (typeof(Audio) === "undefined") {
+                this.ting = {play: function() {}};
+                return;
+            }
+            var kitten = jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined;
+            this.ting = new Audio(instance.webclient.session.origin + "/im/static/src/audio/" + (kitten ? "purr" : "Ting") +
+                (new Audio().canPlayType("audio/ogg; codecs=vorbis") ? ".ogg" : ".mp3"));
+        },
+        window_focus_change: function() {
+            if (this.get("window_focus")) {
+                this.set("waiting_messages", 0);
+            }
+        },
+        messages_change: function() {
+            if (! instance.webclient.set_title_part)
+                return;
+            instance.webclient.set_title_part("aa_im_messages", this.get("waiting_messages") === 0 ? undefined :
+                _.str.sprintf(_t("%d Messages"), this.get("waiting_messages")));
+        },
+        activate_user: function(user, focus) {
+            var conv = this.users[user.get('id')];
+            if (! conv) {
+                conv = new instance.im.Conversation(this, user, this.me);
+                conv.appendTo(instance.client.$el);
+                conv.on("destroyed", this, function() {
+                    this.conversations = _.without(this.conversations, conv);
+                    delete this.users[conv.user.get('id')];
+                    this.calc_positions();
+                });
+                this.conversations.push(conv);
+                this.users[user.get('id')] = conv;
+                this.calc_positions();
+            }
+            if (focus)
+                conv.focus();
+            return conv;
+        },
+        received_message: function(message, user) {
+            if (! this.get("window_focus")) {
+                this.set("waiting_messages", this.get("waiting_messages") + 1);
+                this.ting.play();
+                this.create_ting();
+            }
+            var conv = this.activate_user(user);
+            conv.received_message(message);
+        },
+        calc_positions: function() {
+            var current = this.get("right_offset");
+            _.each(_.range(this.conversations.length), function(i) {
+                this.conversations[i].set("right_position", current);
+                current += this.conversations[i].$el.outerWidth(true);
+            }, this);
+        },
+        destroy: function() {
+            $(window).off("unload", this.unload_event_handler);
+            $(window).unbind("blur", this.blur_hdl);
+            $(window).unbind("focus", this.focus_hdl);
+            this._super();
+        },
+    });
+
+    instance.im.Conversation = instance.web.Widget.extend({
+        "template": "Conversation",
+        events: {
+            "keydown input": "send_message",
+            "click .oe_im_chatview_close": "destroy",
+            "click .oe_im_chatview_header": "show_hide",
+        },
+        init: function(parent, user, me) {
+            this._super(parent);
+            this.me = me;
+            this.user = user;
+            this.user.add_watcher();
+            this.set("right_position", 0);
+            this.shown = true;
+            this.set("pending", 0);
+        },
+        start: function() {
+            var change_status = function() {
+                this.$el.toggleClass("oe_im_chatview_disconnected_status", this.user.get("im_status") === false);
+                this.$(".oe_im_chatview_online").toggle(this.user.get("im_status") === true);
+                this._go_bottom();
+            };
+            this.user.on("change:im_status", this, change_status);
+            change_status.call(this);
+
+            this.on("change:right_position", this, this.calc_pos);
+            this.full_height = this.$el.height();
+            this.calc_pos();
+            this.on("change:pending", this, _.bind(function() {
+                if (this.get("pending") === 0) {
+                    this.$(".oe_im_chatview_nbr_messages").text("");
+                } else {
+                    this.$(".oe_im_chatview_nbr_messages").text("(" + this.get("pending") + ")");
+                }
+            }, this));
+        },
+        show_hide: function() {
+            if (this.shown) {
+                this.$el.animate({
+                    height: this.$(".oe_im_chatview_header").outerHeight(),
+                });
+            } else {
+                this.$el.animate({
+                    height: this.full_height,
+                });
+            }
+            this.shown = ! this.shown;
+            if (this.shown) {
+                this.set("pending", 0);
+            }
+        },
+        calc_pos: function() {
+            this.$el.css("right", this.get("right_position"));
+        },
+        received_message: function(message) {
+            if (this.shown) {
+                this.set("pending", 0);
+            } else {
+                this.set("pending", this.get("pending") + 1);
+            }
+            this._add_bubble(this.user, message.message, message.date);
+        },
+        send_message: function(e) {
+            if(e && e.which !== 13) {
+                return;
+            }
+            var mes = this.$("input").val();
+            if (! mes.trim()) {
+                return;
+            }
+            this.$("input").val("");
+            var send_it = _.bind(function() {
+                var model = new instance.web.Model("im.message");
+                return model.call("post", [mes, this.user.get('id')],
+                    {context: new instance.web.CompoundContext()});
+            }, this);
+            var tries = 0;
+            send_it().then(_.bind(function() {
+                this._add_bubble(this.me, mes, instance.web.datetime_to_str(new Date()));
+            }, this), function(error, e) {
+                e.preventDefault();
+                tries += 1;
+                if (tries < 3)
+                    return send_it();
+            });
+        },
+        _add_bubble: function(user, item, date) {
+            var items = [item];
+            if (user === this.last_user) {
+                this.last_bubble.remove();
+                items = this.last_items.concat(items);
+            }
+            this.last_user = user;
+            this.last_items = items;
+            date = instance.web.str_to_datetime(date);
+            var now = new Date();
+            var diff = now - date;
+            if (diff > (1000 * 60 * 60 * 24)) {
+                date = $.timeago(date);
+            } else {
+                date = date.toString(Date.CultureInfo.formatPatterns.shortTime);
+            }
+            
+            this.last_bubble = $(QWeb.render("Conversation.bubble", {"items": items, "user": user, "time": date}));
+            $(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
+            this._go_bottom();
+        },
+        _go_bottom: function() {
+            this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
+        },
+        focus: function() {
+            this.$(".oe_im_chatview_input").focus();
+            if (! this.shown)
+                this.show_hide();
+        },
+        destroy: function() {
+            this.user.remove_watcher();
+            this.trigger("destroyed");
+            return this._super();
+        },
+    });
+
+}
\ No newline at end of file
diff --git a/addons/im/static/src/xml/im.xml b/addons/im/static/src/xml/im.xml
new file mode 100644
index 00000000000..795d1b3e698
--- /dev/null
+++ b/addons/im/static/src/xml/im.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates xml:space="preserve">
+    <t t-name="InstantMessaging">
+        <div class="oe_im">
+            <div class="oe_im_frame_header">
+                <span class="oe_e oe_im_search_icon">ô</span>
+                <input class="oe_im_searchbox" t-att-placeholder="_t('Search users...')"/>
+                <span class="oe_e oe_im_search_clear">[</span>
+            </div>
+            <div class="oe_im_users"></div>
+            <div class="oe_im_content"></div>
+        </div>
+    </t>
+    <t t-name="ImTopButton">
+        <div t-att-title='_t("Display Instant Messaging")' class="oe_topbar_item oe_topbar_imbutton">
+            <span class="oe_e">+</span>
+        </div>
+    </t>
+    <t t-name="UserWidget">
+        <div class="oe_im_user">
+            <span class="oe_im_user_clip">
+                <img t-att-src='widget.user.get("image_url")' class="oe_im_user_avatar"/>
+            </span>
+            <span class="oe_im_user_name"><t t-esc="widget.user.get('name')"/></span>
+            <img t-att-src="_s +'/im/static/src/img/green.png'" class="oe_im_user_online"/>
+        </div>
+    </t>
+    <t t-name="Conversation">
+        <div class="oe_im_chatview">
+            <div class="oe_im_chatview_header">
+                <img t-att-src="_s +'/im/static/src/img/green.png'" class="oe_im_chatview_online"/>
+                <t t-esc="widget.user.get('name') || 'Anonymous'"/>
+                <scan class="oe_im_chatview_nbr_messages" />
+                <button class="oe_im_chatview_close">×</button>
+            </div>
+            <div class="oe_im_chatview_disconnected">
+                <t t-esc='_.str.sprintf(_t("%s is offline. He/She will receive your messages on his/her next connection."), widget.user.get("name") || "Anonymous")'/>
+            </div>
+            <div class="oe_im_chatview_content">
+                <div></div>
+            </div>
+            <div class="oe_im_chatview_footer">
+                <input class="oe_im_chatview_input" t-att-placeholder="_t('Say something...')" />
+            </div>
+        </div>
+    </t>
+    <t t-name="Conversation.bubble">
+        <div class="oe_im_chatview_bubble">
+            <div class="oe_im_chatview_clip">
+                <img class="oe_im_chatview_avatar" t-att-src='user.get("image_url")'/>
+            </div>
+            <div class="oe_im_chatview_from"><t t-esc="user.get('name') || 'Anonymous'"/></div>
+            <div class="oe_im_chatview_bubble_list">
+                <t t-foreach="items" t-as="item">
+                    <div class="oe_im_chatview_bubble_item"><t t-esc="item"/></div>
+                </t>
+            </div>
+            <div class="oe_im_chatview_time"><t t-esc="time"/></div>
+        </div>
+    </t>
+</templates>
\ No newline at end of file
diff --git a/addons/im/watcher.py b/addons/im/watcher.py
new file mode 100644
index 00000000000..b8cb74df5ba
--- /dev/null
+++ b/addons/im/watcher.py
@@ -0,0 +1,84 @@
+
+import openerp
+import openerp.tools.config
+import openerp.modules.registry
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+import datetime
+from openerp.osv import osv, fields
+import time
+import logging
+import json
+import select
+import gevent
+import gevent.event
+from openerp.addons.im.im import *
+
+_logger = logging.getLogger(__name__)
+
+class ImWatcher(object):
+    watchers = {}
+
+    @staticmethod
+    def get_watcher(db_name):
+        if not ImWatcher.watchers.get(db_name):
+            ImWatcher(db_name)
+        return ImWatcher.watchers[db_name]
+
+    def __init__(self, db_name):
+        self.db_name = db_name
+        ImWatcher.watchers[db_name] = self
+        self.waiting = 0
+        self.wait_id = 0
+        self.users = {}
+        self.users_watch = {}
+        gevent.spawn(self.loop)
+
+    def loop(self):
+        _logger.info("Begin watching on channel im_channel for database " + self.db_name)
+        stop = False
+        while not stop:
+            try:
+                registry = openerp.modules.registry.RegistryManager.get(self.db_name)
+                with registry.cursor() as cr:
+                    listen_channel(cr, "im_channel", self.handle_message, self.check_stop)
+                    stop = True
+            except:
+                # if something crash, we wait some time then try again
+                _logger.exception("Exception during watcher activity")
+                time.sleep(WATCHER_ERROR_DELAY)
+        _logger.info("End watching on channel im_channel for database " + self.db_name)
+        del ImWatcher.watchers[self.db_name]
+
+    def handle_message(self, message):
+        if message["type"] == "message":
+            for waiter in self.users.get(message["receiver"], {}).values():
+                waiter.set()
+        else: #type status
+            for waiter in self.users_watch.get(message["user"], {}).values():
+                waiter.set()
+
+    def check_stop(self):
+        return self.waiting == 0
+
+    def _get_wait_id(self):
+        self.wait_id += 1
+        return self.wait_id
+
+    def stop(self, user_id, watch_users, timeout=None):
+        wait_id = self._get_wait_id()
+        event = gevent.event.Event()
+        self.waiting += 1
+        self.users.setdefault(user_id, {})[wait_id] = event
+        for watch in watch_users:
+            self.users_watch.setdefault(watch, {})[wait_id] = event
+        try:
+            event.wait(timeout)
+        finally:
+            for watch in watch_users:
+                del self.users_watch[watch][wait_id]
+                if len(self.users_watch[watch]) == 0:
+                    del self.users_watch[watch]
+            del self.users[user_id][wait_id]
+            if len(self.users[user_id]) == 0:
+                del self.users[user_id]
+            self.waiting -= 1
diff --git a/addons/im_livechat/__init__.py b/addons/im_livechat/__init__.py
new file mode 100644
index 00000000000..2825a75179c
--- /dev/null
+++ b/addons/im_livechat/__init__.py
@@ -0,0 +1,2 @@
+
+import im_livechat
diff --git a/addons/im_livechat/__openerp__.py b/addons/im_livechat/__openerp__.py
new file mode 100644
index 00000000000..8b9ea3924d5
--- /dev/null
+++ b/addons/im_livechat/__openerp__.py
@@ -0,0 +1,29 @@
+{
+    'name' : 'Live Support',
+    'version': '1.0',
+    'summary': 'Live Chat with Visitors/Customers',
+    'category': 'Tools',
+    'complexity': 'easy',
+    'description':
+        """
+Live Chat Support
+=================
+
+Allow to drop instant messaging widgets on any web page that will communicate
+with the current server and dispatch visitors request amongst several live
+chat operators.
+
+        """,
+    'data': [
+        "security/im_livechat_security.xml",
+        "security/ir.model.access.csv",
+        "im_livechat_view.xml",
+    ],
+    'demo': [
+        "im_livechat_demo.xml",
+    ],
+    'depends' : ["im", "mail", "portal_anonymous"],
+    'installable': True,
+    'auto_install': False,
+    'application': True,
+}
diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py
new file mode 100644
index 00000000000..1ffb422fe6a
--- /dev/null
+++ b/addons/im_livechat/im_livechat.py
@@ -0,0 +1,245 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import openerp
+import openerp.addons.im.im as im
+import json
+import random
+import jinja2
+from openerp.osv import osv, fields
+from openerp import tools
+
+env = jinja2.Environment(
+    loader=jinja2.PackageLoader('openerp.addons.im_livechat', "."),
+    autoescape=False
+)
+env.filters["json"] = json.dumps
+
+class LiveChatController(openerp.addons.web.http.Controller):
+    _cp_path = '/im_livechat'
+
+    @openerp.addons.web.http.httprequest
+    def loader(self, req, **kwargs):
+        p = json.loads(kwargs["p"])
+        db = p["db"]
+        channel = p["channel"]
+        user_name = p.get("user_name", None)
+        req.session._db = db
+        req.session._uid = None
+        req.session._login = "anonymous"
+        req.session._password = "anonymous"
+        info = req.session.model('im_livechat.channel').get_info_for_chat_src(channel)
+        info["db"] = db
+        info["channel"] = channel
+        info["userName"] = user_name
+        return req.make_response(env.get_template("loader.js").render(info),
+             headers=[('Content-Type', "text/javascript")])
+
+    @openerp.addons.web.http.httprequest
+    def web_page(self, req, **kwargs):
+        p = json.loads(kwargs["p"])
+        db = p["db"]
+        channel = p["channel"]
+        req.session._db = db
+        req.session._uid = None
+        req.session._login = "anonymous"
+        req.session._password = "anonymous"
+        script = req.session.model('im_livechat.channel').read(channel, ["script"])["script"]
+        info = req.session.model('im_livechat.channel').get_info_for_chat_src(channel)
+        info["script"] = script
+        return req.make_response(env.get_template("web_page.html").render(info),
+             headers=[('Content-Type', "text/html")])
+
+    @openerp.addons.web.http.jsonrequest
+    def available(self, req, db, channel):
+        req.session._db = db
+        req.session._uid = None
+        req.session._login = "anonymous"
+        req.session._password = "anonymous"
+        return req.session.model('im_livechat.channel').get_available_user(channel) > 0
+
+class im_livechat_channel(osv.osv):
+    _name = 'im_livechat.channel'
+
+    def _get_default_image(self, cr, uid, context=None):
+        image_path = openerp.modules.get_module_resource('im_livechat', 'static/src/img', 'default.png')
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+    def _get_image(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = tools.image_get_resized_images(obj.image)
+        return result
+    def _set_image(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
+
+
+    def _are_you_inside(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = False
+            for user in record.user_ids:
+                if user.id == uid:
+                    res[record.id] = True
+                    break
+        return res
+
+    def _script(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = env.get_template("include.html").render({
+                "url": self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'),
+                "parameters": {"db":cr.dbname, "channel":record.id},
+            })
+        return res
+
+    def _web_page(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + \
+                "/im_livechat/web_page?p=" + json.dumps({"db":cr.dbname, "channel":record.id})
+        return res
+
+    _columns = {
+        'name': fields.char(string="Channel Name", size=200, required=True),
+        'user_ids': fields.many2many('res.users', 'im_livechat_channel_im_user', 'channel_id', 'user_id', string="Users"),
+        'are_you_inside': fields.function(_are_you_inside, type='boolean', string='Are you inside the matrix?', store=False),
+        'script': fields.function(_script, type='text', string='Script', store=False),
+        'web_page': fields.function(_web_page, type='url', string='Web Page', store=False, size="200"),
+        'button_text': fields.char(string="Text of the Button", size=200),
+        'input_placeholder': fields.char(string="Chat Input Placeholder", size=200),
+        'default_message': fields.char(string="Welcome Message", size=200, help="This is an automated 'welcome' message that your visitor will see when they initiate a new chat session."),
+        # image: all image fields are base64 encoded and PIL-supported
+        'image': fields.binary("Photo",
+            help="This field holds the image used as photo for the group, limited to 1024x1024px."),
+        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
+            string="Medium-sized photo", type="binary", multi="_get_image",
+            store={
+                'im_livechat.channel': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Medium-sized photo of the group. It is automatically "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
+                 "Use this field in form views or some kanban views."),
+        'image_small': fields.function(_get_image, fnct_inv=_set_image,
+            string="Small-sized photo", type="binary", multi="_get_image",
+            store={
+                'im_livechat.channel': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Small-sized photo of the group. It is automatically "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
+                 "Use this field anywhere a small image is required."),
+    }
+
+    def _default_user_ids(self, cr, uid, context=None):
+        return [(6, 0, [uid])]
+
+    _defaults = {
+        'button_text': "Have a Question? Chat with us.",
+        'input_placeholder': "How may I help you?",
+        'default_message': '',
+        'user_ids': _default_user_ids,
+        'image': _get_default_image,
+    }
+
+    def get_available_user(self, cr, uid, channel_id, context=None):
+        channel = self.browse(cr, openerp.SUPERUSER_ID, channel_id, context=context)
+        users = []
+        for user in channel.user_ids:
+            iuid = self.pool.get("im.user").get_by_user_id(cr, uid, user.id, context=context)["id"]
+            imuser = self.pool.get("im.user").browse(cr, uid, iuid, context=context)
+            if imuser.im_status:
+                users.append(imuser)
+        if len(users) == 0:
+            return False
+        return random.choice(users).id
+
+    def test_channel(self, cr, uid, channel, context=None):
+        if not channel:
+            return {}
+        return {
+            'url': self.browse(cr, uid, channel[0], context=context or {}).web_page,
+            'type': 'ir.actions.act_url'
+        }
+
+    def get_info_for_chat_src(self, cr, uid, channel, context=None):
+        url = self.pool.get('ir.config_parameter').get_param(cr, openerp.SUPERUSER_ID, 'web.base.url')
+        chan = self.browse(cr, uid, channel, context=context)
+        return {
+            "url": url,
+            'buttonText': chan.button_text,
+            'inputPlaceholder': chan.input_placeholder,
+            'defaultMessage': chan.default_message,
+            "channelName": chan.name,
+        }
+
+    def join(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'user_ids': [(4, uid)]})
+        return True
+
+    def quit(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'user_ids': [(3, uid)]})
+        return True
+
+
+class im_message(osv.osv):
+    _inherit = 'im.message'
+
+    def _support_member(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = False
+            if record.to_id.user and record.from_id.user:
+                continue
+            elif record.to_id.user:
+                res[record.id] = record.to_id.user.id
+            elif record.from_id.user:
+                res[record.id] = record.from_id.user.id
+        return res
+
+    def _customer(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = False
+            if record.to_id.uuid and record.from_id.uuid:
+                continue
+            elif record.to_id.uuid:
+                res[record.id] = record.to_id.id
+            elif record.from_id.uuid:
+                res[record.id] = record.from_id.id
+        return res
+
+    def _direction(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = False
+            if not not record.to_id.user and not not record.from_id.user:
+                continue
+            elif not not record.to_id.user:
+                res[record.id] = "c2s"
+            elif not not record.from_id.user:
+                res[record.id] = "s2c"
+        return res
+
+    _columns = {
+        'support_member_id': fields.function(_support_member, type='many2one', relation='res.users', string='Support Member', store=True, select=True),
+        'customer_id': fields.function(_customer, type='many2one', relation='im.user', string='Customer', store=True, select=True),
+        'direction': fields.function(_direction, type="selection", selection=[("s2c", "Support Member to Customer"), ("c2s", "Customer to Support Member")],
+            string='Direction', store=False),
+    }
diff --git a/addons/im_livechat/im_livechat_demo.xml b/addons/im_livechat/im_livechat_demo.xml
new file mode 100644
index 00000000000..f199179fb50
--- /dev/null
+++ b/addons/im_livechat/im_livechat_demo.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="channel_website" model="im_livechat.channel">
+            <field name="name">YourWebsite.com</field>
+            <field name="default_message">Hello, how may I help you?</field>
+        </record>
+
+        <record id="group_im_livechat" model="res.groups">
+            <field name="users" eval="[(4, ref('base.user_demo'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/im_livechat/im_livechat_view.xml b/addons/im_livechat/im_livechat_view.xml
new file mode 100644
index 00000000000..f684fd561fc
--- /dev/null
+++ b/addons/im_livechat/im_livechat_view.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <menuitem id="im_livechat" name="Live Chat" parent="mail.mail_feeds_main" groups="group_im_livechat"/>
+
+        <record model="ir.actions.act_window" id="action_support_channels">
+            <field name="name">Live Chat Channels</field>
+            <field name="res_model">im_livechat.channel</field>
+            <field name="view_mode">kanban,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new live chat channel.
+              </p><p>
+                You can create channels for each website on which you want
+                to integrate the live chat widget, allowing you website
+                visitors to talk in real time with your operators.
+              </p><p>
+                Each channel has it's own URL that you can send by email to
+                your customers in order to start chatting with you.
+              </p>
+            </field>
+        </record>
+        <menuitem name="Channels" parent="im_livechat" id="support_channels" action="action_support_channels" groups="group_im_livechat"/>
+
+
+        <record model="ir.ui.view" id="support_channel_kanban">
+            <field name="name">support_channel.kanban</field>
+            <field name="model">im_livechat.channel</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="name"/>
+                    <field name="web_page"/>
+                    <field name="are_you_inside"/>
+                    <field name="user_ids"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_group_image">
+                                <a type="open"><img t-att-src="kanban_image('im_livechat.channel', 'image_medium', record.id.value)" class="oe_group_photo"/></a>
+                            </div>
+                            <div class="oe_group_details">
+                                <h4><a type="open"><field name="name"/></a></h4>
+                                <div class="oe_kanban_footer_left">
+                                    <span>
+                                        <span class="oe_e">+</span> <t t-esc="(record.user_ids.raw_value || []).length"/>
+                                    </span>
+                                </div>
+                                <div class="oe_group_button">
+                                    <button t-if="record.are_you_inside.raw_value" name="quit" type="object" class="oe_group_join">Quit</button>
+                                    <button t-if="! record.are_you_inside.raw_value" name="join" type="object">Join</button>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+
+        <record id="support_channel_form" model="ir.ui.view">
+            <field name="name">support_channel.form</field>
+            <field name="model">im_livechat.channel</field>
+            <field name="arch" type="xml">
+                <form string="Support Channels" version="7.0">
+                <sheet>
+                    <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" placeholder="e.g. YourWebsite.com"/>
+                        </h1>
+                        <div>
+                            <button type="object" name="join" class="oe_highlight" string="Join Channel" attrs='{"invisible": [["are_you_inside", "=", True]]}'/>
+                            <button type="object" name="quit" string="Leave Channel" attrs='{"invisible": [["are_you_inside", "=", False]]}'/>
+                            <button type="object" name="test_channel" string="Test" attrs='{"invisible": [["web_page", "=", False]]}'/>
+                            <field name="are_you_inside" invisible="1"/>
+                        </div>
+                    </div>
+
+                    <group>
+                        <group string="Operators">
+                            <field name="user_ids" widget="many2many_kanban" nolabel="1" colspan="2">
+                                <kanban>
+                                    <field name="name"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div>
+                                                <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
+                                                <div class="oe_group_details" style="min-height: 40px">
+                                                    <img t-att-src="kanban_image('res.users', 'image', record.id.value)"
+                                                        class="oe_avatar oe_kanban_avatar_smallbox" style="float:left; margin-right: 10px;"/>
+                                                    <h4><field name="name"/></h4>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
+                        </group>
+                        <group string="Options">
+                            <field name="button_text"/>
+                            <field name="input_placeholder"/>
+                            <field name="default_message" placeholder="e.g. Hello, how may I help you?"/>
+                        </group>
+                    </group>
+
+                    <div attrs='{"invisible": [["web_page", "=", False]]}'>
+                        <separator string="How to use the Live Chat widget?"/>
+                        <p>
+                            Copy and paste this code into your website, within the &amp;lt;head&amp;gt; tag:
+                        </p>
+                        <field name="script" readonly="1" class="oe_tag"/>
+                        <p>
+                            or copy this url and send it by email to your customers or suppliers:
+                        </p>
+                        <field name="web_page" readonly="1" class="oe_tag"/>
+                    </div>
+
+                </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_history">
+            <field name="name">History</field>
+            <field name="res_model">im.message</field>
+            <field name="view_mode">list</field>
+            <field name="domain">["|", ('to_id.user', '=', None), ('from_id.user', '=', None)]</field>
+        </record>
+        <menuitem name="History" parent="im_livechat" id="history" action="action_history" groups="group_im_livechat_manager"/>
+
+        <record id="im_message_form" model="ir.ui.view">
+            <field name="name">im.message.tree</field>
+            <field name="model">im.message</field>
+            <field name="arch" type="xml">
+                <tree string="History">
+                    <field name="date"/>
+                    <field name="support_member_id"/>
+                    <field name="customer_id"/>
+                    <field name="direction"/>
+                    <field name="message"/>
+                </tree>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/im_livechat/include.html b/addons/im_livechat/include.html
new file mode 100644
index 00000000000..55de6212361
--- /dev/null
+++ b/addons/im_livechat/include.html
@@ -0,0 +1,2 @@
+<script type="text/javascript" src="{{url}}/im_livechat/static/ext/static/js/require.js"></script>
+<script type="text/javascript" src='{{url}}/im_livechat/loader?p={{parameters | json | escape}}'></script>
\ No newline at end of file
diff --git a/addons/im_livechat/loader.js b/addons/im_livechat/loader.js
new file mode 100644
index 00000000000..669591b410f
--- /dev/null
+++ b/addons/im_livechat/loader.js
@@ -0,0 +1,24 @@
+
+require.config({
+    context: "oelivesupport",
+    baseUrl: {{url | json}} + "/im_livechat/static/ext/static/js",
+    shim: {
+        underscore: {
+            init: function() {
+                return _.noConflict();
+            },
+        },
+        "jquery.achtung": {
+            deps: ['jquery'],
+        },
+    },
+})(["livesupport", "jquery"], function(livesupport, jQuery) {
+    jQuery.noConflict();
+    livesupport.main({{url | json}}, {{db | json}}, "anonymous", "anonymous", {{channel | json}}, {
+        buttonText: {{buttonText | json}},
+        inputPlaceholder: {{inputPlaceholder | json}},
+        defaultMessage: {{(defaultMessage or None) | json}},
+        auto: window.oe_im_livechat_auto || false,
+        userName: {{userName | json}} || undefined,
+    });
+});
diff --git a/addons/im_livechat/security/im_livechat_security.xml b/addons/im_livechat/security/im_livechat_security.xml
new file mode 100644
index 00000000000..5ad020a8a78
--- /dev/null
+++ b/addons/im_livechat/security/im_livechat_security.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="module_category_im_livechat" model="ir.module.category">
+            <field name="name">Live Support</field>
+            <field name="sequence" eval="20" />
+        </record>
+
+        <record id="group_im_livechat" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_category_im_livechat"/>
+            <field name="comment">The user will be able to join support channels.</field>
+        </record>
+
+        <record id="group_im_livechat_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="comment">The user will be able to delete support channels.</field>
+            <field name="category_id" ref="module_category_im_livechat"/>
+            <field name="implied_ids" eval="[(4, ref('im_livechat.group_im_livechat'))]"/>
+            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        </record>
+
+        <record id="message_rule_1" model="ir.rule">
+            <field name="name">Live Support Managers can read messages from live support</field>
+            <field name="model_id" ref="im.model_im_message"/>
+            <field name="groups" eval="[(6,0,[ref('im_livechat.group_im_livechat_manager')])]"/>
+            <field name="domain_force">["|", ('to_id.user', '=', None), ('from_id.user', '=', None)]</field>
+            <field name="perm_unlink" eval="0"/>
+            <field name="perm_write" eval="0"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/im_livechat/security/ir.model.access.csv b/addons/im_livechat/security/ir.model.access.csv
new file mode 100644
index 00000000000..0dcf0bdee6f
--- /dev/null
+++ b/addons/im_livechat/security/ir.model.access.csv
@@ -0,0 +1,8 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_ls_chann1,im_livechat.channel,model_im_livechat_channel,,1,0,0,0
+access_ls_chann2,im_livechat.channel,model_im_livechat_channel,group_im_livechat,1,1,1,0
+access_ls_chann3,im_livechat.channel,model_im_livechat_channel,group_im_livechat_manager,1,1,1,1
+access_ls_message_portal,im_livechat.im.message.portal,im.model_im_message,portal.group_portal,0,0,0,0
+access_im_user_portal,im_livechat.im.user.portal,im.model_im_user,portal.group_portal,1,0,0,0
+access_ls_message,im_livechat.im.message,im.model_im_message,portal.group_anonymous,0,0,0,0
+access_im_user,im_livechat.im.user,im.model_im_user,portal.group_anonymous,1,0,0,0
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/Makefile b/addons/im_livechat/static/ext/Makefile
new file mode 100644
index 00000000000..b73ca4f2b89
--- /dev/null
+++ b/addons/im_livechat/static/ext/Makefile
@@ -0,0 +1,3 @@
+
+static/js/livesupport_templates.js: static/js/livesupport_templates.html
+	python static/js/to_jsonp.py static/js/livesupport_templates.html oe_livesupport_templates_callback > static/js/livesupport_templates.js
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.mp3 b/addons/im_livechat/static/ext/static/audio/Ting.mp3
new file mode 100644
index 00000000000..ffbb77144b2
Binary files /dev/null and b/addons/im_livechat/static/ext/static/audio/Ting.mp3 differ
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.ogg b/addons/im_livechat/static/ext/static/audio/Ting.ogg
new file mode 100644
index 00000000000..74ee13a4e5a
Binary files /dev/null and b/addons/im_livechat/static/ext/static/audio/Ting.ogg differ
diff --git a/addons/im_livechat/static/ext/static/css/livesupport.css b/addons/im_livechat/static/ext/static/css/livesupport.css
new file mode 100644
index 00000000000..bfe26b5e838
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/css/livesupport.css
@@ -0,0 +1,190 @@
+
+
+
+.openerp_style { /* base style of openerp */
+  font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
+  color: #4c4c4c;
+  font-size: 13px;
+  background: white;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
+}
+
+/* button */
+
+.oe_chat_button {
+    position: fixed;
+    bottom: 0px;
+    right: 6px;
+    display: inline-block;
+    min-width: 100px;
+    background-color: rgba(60, 60, 60, 0.6);
+    font-family: 'Lucida Grande', 'Lucida Sans Unicode', Arial, Verdana, sans-serif;
+    font-size: 14px;
+    font-weight: bold;
+    padding: 10px;
+    color: white;
+    text-shadow: rgb(59, 76, 88) 1px 1px 0px;
+    border: 1px solid rgb(80, 80, 80);
+    border-bottom: 0px;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    cursor: pointer;
+}
+
+/* conversations */
+
+.oe_im_chatview {
+    position: fixed;
+    overflow: hidden;
+    bottom: 42px;
+    margin-right: 6px;
+    background: rgba(60, 60, 60, 0.8);
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: 0 0 3px rgba(0,0,0,0.3), 0 2px 4px rgba(0,0,0,0.3);
+    -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 0 3px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(0, 0, 0, 0.3);
+    width: 240px;
+}
+.oe_im_chatview .oe_im_chatview_disconnected {
+    display:none;
+    z-index: 100;
+    width: 100%;
+    background: #E8EBEF;
+    padding: 5px;
+    font-size: 11px;
+    color: #999;
+    line-height: 14px;
+    height: 28px;
+    overflow: hidden;
+}
+.oe_im_chatview.oe_im_chatview_disconnected_status .oe_im_chatview_disconnected {
+    display: block;
+}
+.oe_im_chatview .oe_im_chatview_header {
+    padding: 3px 6px 2px;
+    background: #DEDEDE;
+    background: -moz-linear-gradient(#FCFCFC, #DEDEDE);
+    background: -webkit-gradient(linear, left top, left bottom, from(#FCFCFC), to(#DEDEDE));
+    -moz-border-radius: 3px 3px 0 0;
+    -webkit-border-radius: 3px 3px 0 0;
+    border-radius: 3px 3px 0 0;
+    border-bottom: 1px solid #AEB9BD;
+    cursor: pointer;
+}
+.oe_im_chatview .oe_im_chatview_close {
+    padding: 0;
+    cursor: pointer;
+    background: transparent;
+    border: 0;
+    -webkit-appearance: none;
+    font-size: 18px;
+    line-height: 16px;
+    float: right;
+    font-weight: bold;
+    color: black;
+    text-shadow: 0 1px 0 white;
+    opacity: 0.2;
+}
+.oe_im_chatview .oe_im_chatview_content {
+    overflow: auto;
+    height: 287px;
+    width: 240px;
+}
+.oe_im_chatview.oe_im_chatview_disconnected_status .oe_im_chatview_content {
+    height: 249px;
+}
+.oe_im_chatview .oe_im_chatview_footer {
+    position: relative;
+    padding: 3px;
+    border-top: 1px solid #AEB9BD;
+    background: #DEDEDE;
+    background: -moz-linear-gradient(#FCFCFC, #DEDEDE);
+    background: -webkit-gradient(linear, left top, left bottom, from(#FCFCFC), to(#DEDEDE));
+    -moz-border-radius: 0 0 3px 3px;
+    -webkit-border-radius: 0 0 3px 3px;
+    border-radius: 0 0 3px 3px;
+}
+.oe_im_chatview .oe_im_chatview_input {
+    width: 222px;
+    font-family: Lato, Helvetica, sans-serif;
+    font-size: 13px;
+    color: #333;
+    padding: 1px 5px;
+    border: 1px solid #AEB9BD;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -moz-box-shadow: inset 0 1px 4px rgba(0,0,0,0.2);
+    -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.2);
+}
+.oe_im_chatview .oe_im_chatview_bubble {
+    background: white;
+    position: relative;
+    padding: 3px;
+    margin: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+}
+.oe_im_chatview .oe_im_chatview_clip {
+    position: relative;
+    float: left;
+    width: 26px;
+    height: 26px;
+    margin-right: 4px;
+    -moz-box-shadow: 0 0 2px 1px rgba(0,0,0,0.25);
+    -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25);
+    box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.25);
+}
+.oe_im_chatview .oe_im_chatview_avatar {
+    float: left;
+    width: 26px;
+    height: auto;
+    clip: rect(0, 26px, 26px, 0);
+    max-width: 100%;
+    width: auto 9;
+    height: auto;
+    vertical-align: middle;
+    border: 0;
+    -ms-interpolation-mode: bicubic;
+}
+.oe_im_chatview .oe_im_chatview_time {
+    position: absolute;
+    right: 0px;
+    top: 0px;
+    margin: 3px;
+    text-align: right;
+    line-height: 13px;
+    font-size: 11px;
+    color: #999;
+    width: 60px;
+    overflow: hidden;
+}
+.oe_im_chatview .oe_im_chatview_from {
+    margin: 0 0 2px 0;
+    line-height: 14px;
+    font-weight: bold;
+    font-size: 12px;
+    width: 140px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    color: #3A87AD;
+}
+.oe_im_chatview .oe_im_chatview_bubble_list {
+}
+.oe_im_chatview .oe_im_chatview_bubble_item {
+    margin: 0 0 2px 30px;
+    line-height: 14px;
+    word-wrap: break-word;
+}
+
+.oe_im_chatview_online {
+    display: none;
+    margin-top: -4px;
+    width: 11px;
+    height: 11px;
+}
diff --git a/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg b/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg
new file mode 100644
index 00000000000..7168794022e
Binary files /dev/null and b/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg differ
diff --git a/addons/im_livechat/static/ext/static/img/button-gloss.png b/addons/im_livechat/static/ext/static/img/button-gloss.png
new file mode 100755
index 00000000000..6f3957702fe
Binary files /dev/null and b/addons/im_livechat/static/ext/static/img/button-gloss.png differ
diff --git a/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png b/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png
new file mode 100755
index 00000000000..3bf6484a29d
Binary files /dev/null and b/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png differ
diff --git a/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png b/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png
new file mode 100755
index 00000000000..a9969993201
Binary files /dev/null and b/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png differ
diff --git a/addons/im_livechat/static/ext/static/img/green.png b/addons/im_livechat/static/ext/static/img/green.png
new file mode 100644
index 00000000000..01fb373c251
Binary files /dev/null and b/addons/im_livechat/static/ext/static/img/green.png differ
diff --git a/addons/im_livechat/static/ext/static/img/logo.png b/addons/im_livechat/static/ext/static/img/logo.png
new file mode 100644
index 00000000000..aca5f4c60d8
Binary files /dev/null and b/addons/im_livechat/static/ext/static/img/logo.png differ
diff --git a/addons/im_livechat/static/ext/static/img/wood.png b/addons/im_livechat/static/ext/static/img/wood.png
new file mode 100644
index 00000000000..22f2450d3ad
Binary files /dev/null and b/addons/im_livechat/static/ext/static/img/wood.png differ
diff --git a/addons/im_livechat/static/ext/static/js/jquery.achtung.css b/addons/im_livechat/static/ext/static/js/jquery.achtung.css
new file mode 100644
index 00000000000..820ae3e9194
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/jquery.achtung.css
@@ -0,0 +1,306 @@
+/**
+ * achtung 0.3.0
+ * 
+ * Growl-like notifications for jQuery
+ *
+ * Copyright (c) 2009 Josh Varner <josh@voxwerk.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Portions of this file are from the jQuery UI CSS framework.
+ *
+ * @license http://www.opensource.org/licenses/mit-license.php
+ * @author Josh Varner <josh@voxwerk.com>
+ */
+
+/* IE 6 doesn't support position: fixed */
+* html #achtung-overlay {
+	position:absolute;
+}
+
+/* IE6 includes padding in width */
+* html .achtung {
+    width: 280px;
+}
+
+#achtung-overlay {
+    overflow: hidden;
+    position: fixed;
+    top: 15px;
+    right: 15px;
+    width: 280px;
+    z-index:50;
+}
+
+.achtung {
+    display:none;
+    margin-bottom: 8px;
+	padding: 15px 15px;
+	background-color: #000;
+	color: white;
+	width: 250px;
+	font-weight: bold;
+	position:relative;
+	overflow: hidden;
+    -moz-box-shadow: #aaa 1px 1px 2px;
+    -webkit-box-shadow: #aaa 1px 1px 2px;
+    box-shadow: #aaa 1px 1px 2px;  
+    -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px;
+    /* Note that if using show/hide animations, IE will lose
+       this setting */
+    opacity: .85;
+    filter:Alpha(Opacity=85);
+}
+
+/**
+ * This section from jQuery UI CSS framework
+ * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+ * Can (and should) be removed if you are already loading the jQuery UI CSS
+ * to reduce payload size.
+ */
+.ui-icon { display: block; overflow: hidden; background-repeat: no-repeat; }
+.ui-icon { width: 16px; height: 16px; }
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+.achtung .achtung-message-icon {
+	margin-top: 0px;
+	margin-left: -.5em;
+	margin-right: .5em;
+    float: left;
+	zoom: 1;
+}
+
+.achtung .ui-icon.achtung-close-button {
+    float: right;
+    margin-right: -8px;
+    margin-top: -12px;
+    cursor: pointer;
+    color: white;
+    text-align: right;
+}
+
+.achtung .ui-icon.achtung-close-button:after {
+    content: "x"
+}
+
+/* Slightly darker for these colors (readability) */
+.achtungSuccess, .achtungFail, .achtungWait {
+    /* Note that if using show/hide animations, IE will lose
+       this setting */
+    opacity: .93; filter:Alpha(Opacity=93);
+}
+
+.achtungSuccess {
+	background-color: #4DB559;
+}
+
+.achtungFail {
+	background-color: #D64450;
+}
+
+.achtungWait {
+	background-color: #658093;
+}
+
+.achtungSuccess .ui-icon.achtung-close-button,
+.achtungFail .ui-icon.achtung-close-button {
+}
+
+.achtungSuccess .ui-icon.achtung-close-button-hover,
+.achtungFail .ui-icon.achtung-close-button-hover {
+}
+
+.achtung .wait-icon {
+}
+
+.achtung .achtung-message {
+    display: inline;
+}
diff --git a/addons/im_livechat/static/ext/static/js/jquery.achtung.js b/addons/im_livechat/static/ext/static/js/jquery.achtung.js
new file mode 100644
index 00000000000..1aa69469c1d
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/jquery.achtung.js
@@ -0,0 +1,273 @@
+/**
+ * achtung 0.3.0
+ * 
+ * Growl-like notifications for jQuery
+ *
+ * Copyright (c) 2009 Josh Varner <josh@voxwerk.com>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @license http://www.opensource.org/licenses/mit-license.php
+ * @author Josh Varner <josh@voxwerk.com>
+ */
+
+/*globals jQuery,clearTimeout,document,navigator,setTimeout
+*/
+(function($) {
+
+/**
+ * This is based on the jQuery UI $.widget code. I would have just made this
+ * a $.widget but I didn't want the jQuery UI dependency.
+ */
+$.fn.achtung = function(options)
+{
+	var isMethodCall = (typeof options === 'string'),
+		args = Array.prototype.slice.call(arguments, 0),
+		name = 'achtung';
+
+	// handle initialization and non-getter methods
+	return this.each(function() {
+		var instance = $.data(this, name);
+
+		// prevent calls to internal methods
+		if (isMethodCall && options.substring(0, 1) === '_') {
+			return this;
+		}
+
+		// constructor
+		(!instance && !isMethodCall &&
+			$.data(this, name, new $.achtung(this))._init(args));
+
+		// method call
+		(instance && isMethodCall && $.isFunction(instance[options]) &&
+			instance[options].apply(instance, args.slice(1)));
+	});
+};
+
+$.achtung = function(element)
+{
+    var args = Array.prototype.slice.call(arguments, 0), $el;
+
+    if (!element || !element.nodeType) {
+        $el = $('<div />');
+        return $el.achtung.apply($el, args);
+    }
+    
+    this.$container = $(element);
+};
+
+
+/**
+ * Static members
+ **/
+$.extend($.achtung, {
+    version: '0.3.0',
+    $overlay: false,
+    defaults: {
+        timeout: 10,
+        disableClose: false,
+        icon: false,
+        className: '',
+        animateClassSwitch: false,
+        showEffects: {'opacity':'toggle','height':'toggle'},
+        hideEffects: {'opacity':'toggle','height':'toggle'},
+        showEffectDuration: 500,
+        hideEffectDuration: 700
+    }
+});
+
+/**
+ * Non-static members
+ **/
+$.extend($.achtung.prototype, {
+    $container: false,
+    closeTimer: false,
+    options: {},
+    
+    _init: function(args)
+    {
+        var o, self = this;
+
+        args = $.isArray(args) ? args : [];
+
+        
+        args.unshift($.achtung.defaults);
+        args.unshift({});
+
+        o = this.options = $.extend.apply($, args);
+
+        if (!$.achtung.$overlay) {
+    	    $.achtung.$overlay = $('<div id="achtung-overlay"></div>').appendTo(document.body);
+        }
+
+        if (!o.disableClose) {
+            $('<span class="achtung-close-button ui-icon ui-icon-close" />')
+                .click(function () {  self.close();  })
+                .hover(function () { $(this).addClass('achtung-close-button-hover'); },
+                       function () { $(this).removeClass('achtung-close-button-hover'); })
+                .prependTo(this.$container);
+        }
+
+        this.changeIcon(o.icon, true);
+
+        if (o.message) {
+            this.$container.append($('<span class="achtung-message">' + o.message + '</span>'));
+        }
+
+        (o.className && this.$container.addClass(o.className));
+        (o.css && this.$container.css(o.css));
+
+        this.$container
+            .addClass('achtung')
+            .appendTo($.achtung.$overlay);
+
+        if (o.showEffects) {
+            this.$container.toggle();
+        } else {
+            this.$container.show();
+        }
+
+        if (o.timeout > 0) {
+            this.timeout(o.timeout);
+        }
+    },
+    
+    timeout: function(timeout)
+    {
+        var self = this;
+
+        if (this.closeTimer) {
+            clearTimeout(this.closeTimer);
+        }
+
+        this.closeTimer = setTimeout(function() { self.close(); }, timeout * 1000);
+        this.options.timeout = timeout;
+    },
+
+    /**
+     * Change the CSS class associated with this message, using
+     * a transition if available (not availble in Safari/Webkit).
+     * If no transition is available, the switch is immediate.
+     * 
+     * #LATER Check if this has been corrected in Webkit or jQuery UI
+     * #TODO Make transition time configurable
+     * @param newClass string Name of new class to associate
+     */
+    changeClass: function(newClass)
+    {
+        var self = this;
+
+        if (this.options.className === newClass) {
+            return;
+        }
+
+        this.$container.queue(function() {
+            if (!self.options.animateClassSwitch ||
+                /webkit/.test(navigator.userAgent.toLowerCase()) ||
+                !$.isFunction($.fn.switchClass)) {
+                self.$container.removeClass(self.options.className);
+                self.$container.addClass(newClass);
+            } else {
+                self.$container.switchClass(self.options.className, newClass, 500);
+            }
+
+            self.options.className = newClass;
+            self.$container.dequeue();
+        });
+    },
+
+    changeIcon: function(newIcon, force)
+    {
+        var self = this;
+
+        if ((force !== true || newIcon === false) && this.options.icon === newIcon) {
+            return;
+        }
+
+        if (force || this.options.icon === false) {
+            this.$container.prepend($('<span class="achtung-message-icon ui-icon ' + newIcon + '" />'));
+            this.options.icon = newIcon;
+            return;
+        } else if (newIcon === false) {
+            this.$container.find('.achtung-message-icon').remove();
+            this.options.icon = false;
+            return;
+        }
+
+        this.$container.queue(function() {
+            var $span = $('.achtung-message-icon', self.$container);
+
+            if (!self.options.animateClassSwitch ||
+                /webkit/.test(navigator.userAgent.toLowerCase()) ||
+                !$.isFunction($.fn.switchClass)) {
+                $span.removeClass(self.options.icon);
+                $span.addClass(newIcon);
+            } else {
+                $span.switchClass(self.options.icon, newIcon, 500);
+            }
+
+            self.options.icon = newIcon;
+            self.$container.dequeue();
+        });
+    },
+
+
+    changeMessage: function(newMessage)
+    {
+        this.$container.queue(function() {
+            $('.achtung-message', $(this)).html(newMessage);
+            $(this).dequeue();
+        });
+    },
+
+
+    update: function(options)
+    {
+        (options.className && this.changeClass(options.className));
+        (options.css && this.$container.css(options.css));
+        (typeof(options.icon) !== 'undefined' && this.changeIcon(options.icon));
+        (options.message && this.changeMessage(options.message));
+        (options.timeout && this.timeout(options.timeout));
+    },
+
+    close: function() 
+    {
+        var o = this.options, $container = this.$container;
+
+        if (o.hideEffects) {
+            this.$container.animate(o.hideEffects, o.hideEffectDuration);
+        } else {
+            this.$container.hide();
+        }
+
+        $container.queue(function() {
+            $container.removeData('achtung');
+            $container.remove();
+            
+            if ($.achtung.$overlay && $.achtung.$overlay.is(':empty')) {
+                $.achtung.$overlay.remove();
+                $.achtung.$overlay = false;
+            }
+            
+            $container.dequeue();
+        });
+    }
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/js/jquery.js b/addons/im_livechat/static/ext/static/js/jquery.js
new file mode 100644
index 00000000000..ded03845983
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/jquery.js
@@ -0,0 +1,9555 @@
+/*!
+ * jQuery JavaScript Library v1.9.0
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2012 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2013-1-14
+ */
+(function( window, undefined ) {
+"use strict";
+var
+    // A central reference to the root jQuery(document)
+    rootjQuery,
+
+    // The deferred used on DOM ready
+    readyList,
+
+    // Use the correct document accordingly with window argument (sandbox)
+    document = window.document,
+    location = window.location,
+
+    // Map over jQuery in case of overwrite
+    _jQuery = window.jQuery,
+
+    // Map over the $ in case of overwrite
+    _$ = window.$,
+
+    // [[Class]] -> type pairs
+    class2type = {},
+
+    // List of deleted data cache ids, so we can reuse them
+    core_deletedIds = [],
+
+    core_version = "1.9.0",
+
+    // Save a reference to some core methods
+    core_concat = core_deletedIds.concat,
+    core_push = core_deletedIds.push,
+    core_slice = core_deletedIds.slice,
+    core_indexOf = core_deletedIds.indexOf,
+    core_toString = class2type.toString,
+    core_hasOwn = class2type.hasOwnProperty,
+    core_trim = core_version.trim,
+
+    // Define a local copy of jQuery
+    jQuery = function( selector, context ) {
+        // The jQuery object is actually just the init constructor 'enhanced'
+        return new jQuery.fn.init( selector, context, rootjQuery );
+    },
+
+    // Used for matching numbers
+    core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
+
+    // Used for splitting on whitespace
+    core_rnotwhite = /\S+/g,
+
+    // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+    rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+    // A simple way to check for HTML strings
+    // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+    // Strict HTML recognition (#11290: must start with <)
+    rquickExpr = /^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,
+
+    // Match a standalone tag
+    rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
+
+    // JSON RegExp
+    rvalidchars = /^[\],:{}\s]*$/,
+    rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+    rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+    rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
+
+    // Matches dashed string for camelizing
+    rmsPrefix = /^-ms-/,
+    rdashAlpha = /-([\da-z])/gi,
+
+    // Used by jQuery.camelCase as callback to replace()
+    fcamelCase = function( all, letter ) {
+        return letter.toUpperCase();
+    },
+
+    // The ready event handler and self cleanup method
+    DOMContentLoaded = function() {
+        if ( document.addEventListener ) {
+            document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+            jQuery.ready();
+        } else if ( document.readyState === "complete" ) {
+            // we're here because readyState === "complete" in oldIE
+            // which is good enough for us to call the dom ready!
+            document.detachEvent( "onreadystatechange", DOMContentLoaded );
+            jQuery.ready();
+        }
+    };
+
+jQuery.fn = jQuery.prototype = {
+    // The current version of jQuery being used
+    jquery: core_version,
+
+    constructor: jQuery,
+    init: function( selector, context, rootjQuery ) {
+        var match, elem;
+
+        // HANDLE: $(""), $(null), $(undefined), $(false)
+        if ( !selector ) {
+            return this;
+        }
+
+        // Handle HTML strings
+        if ( typeof selector === "string" ) {
+            if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+                // Assume that strings that start and end with <> are HTML and skip the regex check
+                match = [ null, selector, null ];
+
+            } else {
+                match = rquickExpr.exec( selector );
+            }
+
+            // Match html or make sure no context is specified for #id
+            if ( match && (match[1] || !context) ) {
+
+                // HANDLE: $(html) -> $(array)
+                if ( match[1] ) {
+                    context = context instanceof jQuery ? context[0] : context;
+
+                    // scripts is true for back-compat
+                    jQuery.merge( this, jQuery.parseHTML(
+                        match[1],
+                        context && context.nodeType ? context.ownerDocument || context : document,
+                        true
+                    ) );
+
+                    // HANDLE: $(html, props)
+                    if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+                        for ( match in context ) {
+                            // Properties of context are called as methods if possible
+                            if ( jQuery.isFunction( this[ match ] ) ) {
+                                this[ match ]( context[ match ] );
+
+                            // ...and otherwise set as attributes
+                            } else {
+                                this.attr( match, context[ match ] );
+                            }
+                        }
+                    }
+
+                    return this;
+
+                // HANDLE: $(#id)
+                } else {
+                    elem = document.getElementById( match[2] );
+
+                    // Check parentNode to catch when Blackberry 4.6 returns
+                    // nodes that are no longer in the document #6963
+                    if ( elem && elem.parentNode ) {
+                        // Handle the case where IE and Opera return items
+                        // by name instead of ID
+                        if ( elem.id !== match[2] ) {
+                            return rootjQuery.find( selector );
+                        }
+
+                        // Otherwise, we inject the element directly into the jQuery object
+                        this.length = 1;
+                        this[0] = elem;
+                    }
+
+                    this.context = document;
+                    this.selector = selector;
+                    return this;
+                }
+
+            // HANDLE: $(expr, $(...))
+            } else if ( !context || context.jquery ) {
+                return ( context || rootjQuery ).find( selector );
+
+            // HANDLE: $(expr, context)
+            // (which is just equivalent to: $(context).find(expr)
+            } else {
+                return this.constructor( context ).find( selector );
+            }
+
+        // HANDLE: $(DOMElement)
+        } else if ( selector.nodeType ) {
+            this.context = this[0] = selector;
+            this.length = 1;
+            return this;
+
+        // HANDLE: $(function)
+        // Shortcut for document ready
+        } else if ( jQuery.isFunction( selector ) ) {
+            return rootjQuery.ready( selector );
+        }
+
+        if ( selector.selector !== undefined ) {
+            this.selector = selector.selector;
+            this.context = selector.context;
+        }
+
+        return jQuery.makeArray( selector, this );
+    },
+
+    // Start with an empty selector
+    selector: "",
+
+    // The default length of a jQuery object is 0
+    length: 0,
+
+    // The number of elements contained in the matched element set
+    size: function() {
+        return this.length;
+    },
+
+    toArray: function() {
+        return core_slice.call( this );
+    },
+
+    // Get the Nth element in the matched element set OR
+    // Get the whole matched element set as a clean array
+    get: function( num ) {
+        return num == null ?
+
+            // Return a 'clean' array
+            this.toArray() :
+
+            // Return just the object
+            ( num < 0 ? this[ this.length + num ] : this[ num ] );
+    },
+
+    // Take an array of elements and push it onto the stack
+    // (returning the new matched element set)
+    pushStack: function( elems ) {
+
+        // Build a new jQuery matched element set
+        var ret = jQuery.merge( this.constructor(), elems );
+
+        // Add the old object onto the stack (as a reference)
+        ret.prevObject = this;
+        ret.context = this.context;
+
+        // Return the newly-formed element set
+        return ret;
+    },
+
+    // Execute a callback for every element in the matched set.
+    // (You can seed the arguments with an array of args, but this is
+    // only used internally.)
+    each: function( callback, args ) {
+        return jQuery.each( this, callback, args );
+    },
+
+    ready: function( fn ) {
+        // Add the callback
+        jQuery.ready.promise().done( fn );
+
+        return this;
+    },
+
+    slice: function() {
+        return this.pushStack( core_slice.apply( this, arguments ) );
+    },
+
+    first: function() {
+        return this.eq( 0 );
+    },
+
+    last: function() {
+        return this.eq( -1 );
+    },
+
+    eq: function( i ) {
+        var len = this.length,
+            j = +i + ( i < 0 ? len : 0 );
+        return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
+    },
+
+    map: function( callback ) {
+        return this.pushStack( jQuery.map(this, function( elem, i ) {
+            return callback.call( elem, i, elem );
+        }));
+    },
+
+    end: function() {
+        return this.prevObject || this.constructor(null);
+    },
+
+    // For internal use only.
+    // Behaves like an Array's method, not like a jQuery method.
+    push: core_push,
+    sort: [].sort,
+    splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+    var options, name, src, copy, copyIsArray, clone,
+        target = arguments[0] || {},
+        i = 1,
+        length = arguments.length,
+        deep = false;
+
+    // Handle a deep copy situation
+    if ( typeof target === "boolean" ) {
+        deep = target;
+        target = arguments[1] || {};
+        // skip the boolean and the target
+        i = 2;
+    }
+
+    // Handle case when target is a string or something (possible in deep copy)
+    if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+        target = {};
+    }
+
+    // extend jQuery itself if only one argument is passed
+    if ( length === i ) {
+        target = this;
+        --i;
+    }
+
+    for ( ; i < length; i++ ) {
+        // Only deal with non-null/undefined values
+        if ( (options = arguments[ i ]) != null ) {
+            // Extend the base object
+            for ( name in options ) {
+                src = target[ name ];
+                copy = options[ name ];
+
+                // Prevent never-ending loop
+                if ( target === copy ) {
+                    continue;
+                }
+
+                // Recurse if we're merging plain objects or arrays
+                if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+                    if ( copyIsArray ) {
+                        copyIsArray = false;
+                        clone = src && jQuery.isArray(src) ? src : [];
+
+                    } else {
+                        clone = src && jQuery.isPlainObject(src) ? src : {};
+                    }
+
+                    // Never move original objects, clone them
+                    target[ name ] = jQuery.extend( deep, clone, copy );
+
+                // Don't bring in undefined values
+                } else if ( copy !== undefined ) {
+                    target[ name ] = copy;
+                }
+            }
+        }
+    }
+
+    // Return the modified object
+    return target;
+};
+
+jQuery.extend({
+    noConflict: function( deep ) {
+        if ( window.$ === jQuery ) {
+            window.$ = _$;
+        }
+
+        if ( deep && window.jQuery === jQuery ) {
+            window.jQuery = _jQuery;
+        }
+
+        return jQuery;
+    },
+
+    // Is the DOM ready to be used? Set to true once it occurs.
+    isReady: false,
+
+    // A counter to track how many items to wait for before
+    // the ready event fires. See #6781
+    readyWait: 1,
+
+    // Hold (or release) the ready event
+    holdReady: function( hold ) {
+        if ( hold ) {
+            jQuery.readyWait++;
+        } else {
+            jQuery.ready( true );
+        }
+    },
+
+    // Handle when the DOM is ready
+    ready: function( wait ) {
+
+        // Abort if there are pending holds or we're already ready
+        if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
+            return;
+        }
+
+        // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+        if ( !document.body ) {
+            return setTimeout( jQuery.ready );
+        }
+
+        // Remember that the DOM is ready
+        jQuery.isReady = true;
+
+        // If a normal DOM Ready event fired, decrement, and wait if need be
+        if ( wait !== true && --jQuery.readyWait > 0 ) {
+            return;
+        }
+
+        // If there are functions bound, to execute
+        readyList.resolveWith( document, [ jQuery ] );
+
+        // Trigger any bound ready events
+        if ( jQuery.fn.trigger ) {
+            jQuery( document ).trigger("ready").off("ready");
+        }
+    },
+
+    // See test/unit/core.js for details concerning isFunction.
+    // Since version 1.3, DOM methods and functions like alert
+    // aren't supported. They return false on IE (#2968).
+    isFunction: function( obj ) {
+        return jQuery.type(obj) === "function";
+    },
+
+    isArray: Array.isArray || function( obj ) {
+        return jQuery.type(obj) === "array";
+    },
+
+    isWindow: function( obj ) {
+        return obj != null && obj == obj.window;
+    },
+
+    isNumeric: function( obj ) {
+        return !isNaN( parseFloat(obj) ) && isFinite( obj );
+    },
+
+    type: function( obj ) {
+        if ( obj == null ) {
+            return String( obj );
+        }
+        return typeof obj === "object" || typeof obj === "function" ?
+            class2type[ core_toString.call(obj) ] || "object" :
+            typeof obj;
+    },
+
+    isPlainObject: function( obj ) {
+        // Must be an Object.
+        // Because of IE, we also have to check the presence of the constructor property.
+        // Make sure that DOM nodes and window objects don't pass through, as well
+        if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+            return false;
+        }
+
+        try {
+            // Not own constructor property must be Object
+            if ( obj.constructor &&
+                !core_hasOwn.call(obj, "constructor") &&
+                !core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+                return false;
+            }
+        } catch ( e ) {
+            // IE8,9 Will throw exceptions on certain host objects #9897
+            return false;
+        }
+
+        // Own properties are enumerated firstly, so to speed up,
+        // if last one is own, then all properties are own.
+
+        var key;
+        for ( key in obj ) {}
+
+        return key === undefined || core_hasOwn.call( obj, key );
+    },
+
+    isEmptyObject: function( obj ) {
+        var name;
+        for ( name in obj ) {
+            return false;
+        }
+        return true;
+    },
+
+    error: function( msg ) {
+        throw new Error( msg );
+    },
+
+    // data: string of html
+    // context (optional): If specified, the fragment will be created in this context, defaults to document
+    // keepScripts (optional): If true, will include scripts passed in the html string
+    parseHTML: function( data, context, keepScripts ) {
+        if ( !data || typeof data !== "string" ) {
+            return null;
+        }
+        if ( typeof context === "boolean" ) {
+            keepScripts = context;
+            context = false;
+        }
+        context = context || document;
+
+        var parsed = rsingleTag.exec( data ),
+            scripts = !keepScripts && [];
+
+        // Single tag
+        if ( parsed ) {
+            return [ context.createElement( parsed[1] ) ];
+        }
+
+        parsed = jQuery.buildFragment( [ data ], context, scripts );
+        if ( scripts ) {
+            jQuery( scripts ).remove();
+        }
+        return jQuery.merge( [], parsed.childNodes );
+    },
+
+    parseJSON: function( data ) {
+        // Attempt to parse using the native JSON parser first
+        if ( window.JSON && window.JSON.parse ) {
+            return window.JSON.parse( data );
+        }
+
+        if ( data === null ) {
+            return data;
+        }
+
+        if ( typeof data === "string" ) {
+
+            // Make sure leading/trailing whitespace is removed (IE can't handle it)
+            data = jQuery.trim( data );
+
+            if ( data ) {
+                // Make sure the incoming data is actual JSON
+                // Logic borrowed from http://json.org/json2.js
+                if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+                    .replace( rvalidtokens, "]" )
+                    .replace( rvalidbraces, "")) ) {
+
+                    return ( new Function( "return " + data ) )();
+                }
+            }
+        }
+
+        jQuery.error( "Invalid JSON: " + data );
+    },
+
+    // Cross-browser xml parsing
+    parseXML: function( data ) {
+        var xml, tmp;
+        if ( !data || typeof data !== "string" ) {
+            return null;
+        }
+        try {
+            if ( window.DOMParser ) { // Standard
+                tmp = new DOMParser();
+                xml = tmp.parseFromString( data , "text/xml" );
+            } else { // IE
+                xml = new ActiveXObject( "Microsoft.XMLDOM" );
+                xml.async = "false";
+                xml.loadXML( data );
+            }
+        } catch( e ) {
+            xml = undefined;
+        }
+        if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+            jQuery.error( "Invalid XML: " + data );
+        }
+        return xml;
+    },
+
+    noop: function() {},
+
+    // Evaluates a script in a global context
+    // Workarounds based on findings by Jim Driscoll
+    // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+    globalEval: function( data ) {
+        if ( data && jQuery.trim( data ) ) {
+            // We use execScript on Internet Explorer
+            // We use an anonymous function so that context is window
+            // rather than jQuery in Firefox
+            ( window.execScript || function( data ) {
+                window[ "eval" ].call( window, data );
+            } )( data );
+        }
+    },
+
+    // Convert dashed to camelCase; used by the css and data modules
+    // Microsoft forgot to hump their vendor prefix (#9572)
+    camelCase: function( string ) {
+        return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+    },
+
+    nodeName: function( elem, name ) {
+        return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+    },
+
+    // args is for internal usage only
+    each: function( obj, callback, args ) {
+        var value,
+            i = 0,
+            length = obj.length,
+            isArray = isArraylike( obj );
+
+        if ( args ) {
+            if ( isArray ) {
+                for ( ; i < length; i++ ) {
+                    value = callback.apply( obj[ i ], args );
+
+                    if ( value === false ) {
+                        break;
+                    }
+                }
+            } else {
+                for ( i in obj ) {
+                    value = callback.apply( obj[ i ], args );
+
+                    if ( value === false ) {
+                        break;
+                    }
+                }
+            }
+
+        // A special, fast, case for the most common use of each
+        } else {
+            if ( isArray ) {
+                for ( ; i < length; i++ ) {
+                    value = callback.call( obj[ i ], i, obj[ i ] );
+
+                    if ( value === false ) {
+                        break;
+                    }
+                }
+            } else {
+                for ( i in obj ) {
+                    value = callback.call( obj[ i ], i, obj[ i ] );
+
+                    if ( value === false ) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        return obj;
+    },
+
+    // Use native String.trim function wherever possible
+    trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
+        function( text ) {
+            return text == null ?
+                "" :
+                core_trim.call( text );
+        } :
+
+        // Otherwise use our own trimming functionality
+        function( text ) {
+            return text == null ?
+                "" :
+                ( text + "" ).replace( rtrim, "" );
+        },
+
+    // results is for internal usage only
+    makeArray: function( arr, results ) {
+        var ret = results || [];
+
+        if ( arr != null ) {
+            if ( isArraylike( Object(arr) ) ) {
+                jQuery.merge( ret,
+                    typeof arr === "string" ?
+                    [ arr ] : arr
+                );
+            } else {
+                core_push.call( ret, arr );
+            }
+        }
+
+        return ret;
+    },
+
+    inArray: function( elem, arr, i ) {
+        var len;
+
+        if ( arr ) {
+            if ( core_indexOf ) {
+                return core_indexOf.call( arr, elem, i );
+            }
+
+            len = arr.length;
+            i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+            for ( ; i < len; i++ ) {
+                // Skip accessing in sparse arrays
+                if ( i in arr && arr[ i ] === elem ) {
+                    return i;
+                }
+            }
+        }
+
+        return -1;
+    },
+
+    merge: function( first, second ) {
+        var l = second.length,
+            i = first.length,
+            j = 0;
+
+        if ( typeof l === "number" ) {
+            for ( ; j < l; j++ ) {
+                first[ i++ ] = second[ j ];
+            }
+        } else {
+            while ( second[j] !== undefined ) {
+                first[ i++ ] = second[ j++ ];
+            }
+        }
+
+        first.length = i;
+
+        return first;
+    },
+
+    grep: function( elems, callback, inv ) {
+        var retVal,
+            ret = [],
+            i = 0,
+            length = elems.length;
+        inv = !!inv;
+
+        // Go through the array, only saving the items
+        // that pass the validator function
+        for ( ; i < length; i++ ) {
+            retVal = !!callback( elems[ i ], i );
+            if ( inv !== retVal ) {
+                ret.push( elems[ i ] );
+            }
+        }
+
+        return ret;
+    },
+
+    // arg is for internal usage only
+    map: function( elems, callback, arg ) {
+        var value,
+            i = 0,
+            length = elems.length,
+            isArray = isArraylike( elems ),
+            ret = [];
+
+        // Go through the array, translating each of the items to their
+        if ( isArray ) {
+            for ( ; i < length; i++ ) {
+                value = callback( elems[ i ], i, arg );
+
+                if ( value != null ) {
+                    ret[ ret.length ] = value;
+                }
+            }
+
+        // Go through every key on the object,
+        } else {
+            for ( i in elems ) {
+                value = callback( elems[ i ], i, arg );
+
+                if ( value != null ) {
+                    ret[ ret.length ] = value;
+                }
+            }
+        }
+
+        // Flatten any nested arrays
+        return core_concat.apply( [], ret );
+    },
+
+    // A global GUID counter for objects
+    guid: 1,
+
+    // Bind a function to a context, optionally partially applying any
+    // arguments.
+    proxy: function( fn, context ) {
+        var tmp, args, proxy;
+
+        if ( typeof context === "string" ) {
+            tmp = fn[ context ];
+            context = fn;
+            fn = tmp;
+        }
+
+        // Quick check to determine if target is callable, in the spec
+        // this throws a TypeError, but we will just return undefined.
+        if ( !jQuery.isFunction( fn ) ) {
+            return undefined;
+        }
+
+        // Simulated bind
+        args = core_slice.call( arguments, 2 );
+        proxy = function() {
+            return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
+        };
+
+        // Set the guid of unique handler to the same of original handler, so it can be removed
+        proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+        return proxy;
+    },
+
+    // Multifunctional method to get and set values of a collection
+    // The value/s can optionally be executed if it's a function
+    access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
+        var i = 0,
+            length = elems.length,
+            bulk = key == null;
+
+        // Sets many values
+        if ( jQuery.type( key ) === "object" ) {
+            chainable = true;
+            for ( i in key ) {
+                jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+            }
+
+        // Sets one value
+        } else if ( value !== undefined ) {
+            chainable = true;
+
+            if ( !jQuery.isFunction( value ) ) {
+                raw = true;
+            }
+
+            if ( bulk ) {
+                // Bulk operations run against the entire set
+                if ( raw ) {
+                    fn.call( elems, value );
+                    fn = null;
+
+                // ...except when executing function values
+                } else {
+                    bulk = fn;
+                    fn = function( elem, key, value ) {
+                        return bulk.call( jQuery( elem ), value );
+                    };
+                }
+            }
+
+            if ( fn ) {
+                for ( ; i < length; i++ ) {
+                    fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
+                }
+            }
+        }
+
+        return chainable ?
+            elems :
+
+            // Gets
+            bulk ?
+                fn.call( elems ) :
+                length ? fn( elems[0], key ) : emptyGet;
+    },
+
+    now: function() {
+        return ( new Date() ).getTime();
+    }
+});
+
+jQuery.ready.promise = function( obj ) {
+    if ( !readyList ) {
+
+        readyList = jQuery.Deferred();
+
+        // Catch cases where $(document).ready() is called after the browser event has already occurred.
+        // we once tried to use readyState "interactive" here, but it caused issues like the one
+        // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+        if ( document.readyState === "complete" ) {
+            // Handle it asynchronously to allow scripts the opportunity to delay ready
+            setTimeout( jQuery.ready );
+
+        // Standards-based browsers support DOMContentLoaded
+        } else if ( document.addEventListener ) {
+            // Use the handy event callback
+            document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+            // A fallback to window.onload, that will always work
+            window.addEventListener( "load", jQuery.ready, false );
+
+        // If IE event model is used
+        } else {
+            // Ensure firing before onload, maybe late but safe also for iframes
+            document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
+            // A fallback to window.onload, that will always work
+            window.attachEvent( "onload", jQuery.ready );
+
+            // If IE and not a frame
+            // continually check to see if the document is ready
+            var top = false;
+
+            try {
+                top = window.frameElement == null && document.documentElement;
+            } catch(e) {}
+
+            if ( top && top.doScroll ) {
+                (function doScrollCheck() {
+                    if ( !jQuery.isReady ) {
+
+                        try {
+                            // Use the trick by Diego Perini
+                            // http://javascript.nwbox.com/IEContentLoaded/
+                            top.doScroll("left");
+                        } catch(e) {
+                            return setTimeout( doScrollCheck, 50 );
+                        }
+
+                        // and execute any waiting functions
+                        jQuery.ready();
+                    }
+                })();
+            }
+        }
+    }
+    return readyList.promise( obj );
+};
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
+    class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+function isArraylike( obj ) {
+    var length = obj.length,
+        type = jQuery.type( obj );
+
+    if ( jQuery.isWindow( obj ) ) {
+        return false;
+    }
+
+    if ( obj.nodeType === 1 && length ) {
+        return true;
+    }
+
+    return type === "array" || type !== "function" &&
+        ( length === 0 ||
+        typeof length === "number" && length > 0 && ( length - 1 ) in obj );
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+// String to Object options format cache
+var optionsCache = {};
+
+// Convert String-formatted options into Object-formatted ones and store in cache
+function createOptions( options ) {
+    var object = optionsCache[ options ] = {};
+    jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
+        object[ flag ] = true;
+    });
+    return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *  options: an optional list of space-separated options that will change how
+ *          the callback list behaves or a more traditional option object
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible options:
+ *
+ *  once:           will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *  memory:         will keep track of previous values and will call any callback added
+ *                  after the list has been fired right away with the latest "memorized"
+ *                  values (like a Deferred)
+ *
+ *  unique:         will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *  stopOnFalse:    interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( options ) {
+
+    // Convert options from String-formatted to Object-formatted if needed
+    // (we check in cache first)
+    options = typeof options === "string" ?
+        ( optionsCache[ options ] || createOptions( options ) ) :
+        jQuery.extend( {}, options );
+
+    var // Last fire value (for non-forgettable lists)
+        memory,
+        // Flag to know if list was already fired
+        fired,
+        // Flag to know if list is currently firing
+        firing,
+        // First callback to fire (used internally by add and fireWith)
+        firingStart,
+        // End of the loop when firing
+        firingLength,
+        // Index of currently firing callback (modified by remove if needed)
+        firingIndex,
+        // Actual callback list
+        list = [],
+        // Stack of fire calls for repeatable lists
+        stack = !options.once && [],
+        // Fire callbacks
+        fire = function( data ) {
+            memory = options.memory && data;
+            fired = true;
+            firingIndex = firingStart || 0;
+            firingStart = 0;
+            firingLength = list.length;
+            firing = true;
+            for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+                if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
+                    memory = false; // To prevent further calls using add
+                    break;
+                }
+            }
+            firing = false;
+            if ( list ) {
+                if ( stack ) {
+                    if ( stack.length ) {
+                        fire( stack.shift() );
+                    }
+                } else if ( memory ) {
+                    list = [];
+                } else {
+                    self.disable();
+                }
+            }
+        },
+        // Actual Callbacks object
+        self = {
+            // Add a callback or a collection of callbacks to the list
+            add: function() {
+                if ( list ) {
+                    // First, we save the current length
+                    var start = list.length;
+                    (function add( args ) {
+                        jQuery.each( args, function( _, arg ) {
+                            var type = jQuery.type( arg );
+                            if ( type === "function" ) {
+                                if ( !options.unique || !self.has( arg ) ) {
+                                    list.push( arg );
+                                }
+                            } else if ( arg && arg.length && type !== "string" ) {
+                                // Inspect recursively
+                                add( arg );
+                            }
+                        });
+                    })( arguments );
+                    // Do we need to add the callbacks to the
+                    // current firing batch?
+                    if ( firing ) {
+                        firingLength = list.length;
+                    // With memory, if we're not firing then
+                    // we should call right away
+                    } else if ( memory ) {
+                        firingStart = start;
+                        fire( memory );
+                    }
+                }
+                return this;
+            },
+            // Remove a callback from the list
+            remove: function() {
+                if ( list ) {
+                    jQuery.each( arguments, function( _, arg ) {
+                        var index;
+                        while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
+                            list.splice( index, 1 );
+                            // Handle firing indexes
+                            if ( firing ) {
+                                if ( index <= firingLength ) {
+                                    firingLength--;
+                                }
+                                if ( index <= firingIndex ) {
+                                    firingIndex--;
+                                }
+                            }
+                        }
+                    });
+                }
+                return this;
+            },
+            // Control if a given callback is in the list
+            has: function( fn ) {
+                return jQuery.inArray( fn, list ) > -1;
+            },
+            // Remove all callbacks from the list
+            empty: function() {
+                list = [];
+                return this;
+            },
+            // Have the list do nothing anymore
+            disable: function() {
+                list = stack = memory = undefined;
+                return this;
+            },
+            // Is it disabled?
+            disabled: function() {
+                return !list;
+            },
+            // Lock the list in its current state
+            lock: function() {
+                stack = undefined;
+                if ( !memory ) {
+                    self.disable();
+                }
+                return this;
+            },
+            // Is it locked?
+            locked: function() {
+                return !stack;
+            },
+            // Call all callbacks with the given context and arguments
+            fireWith: function( context, args ) {
+                args = args || [];
+                args = [ context, args.slice ? args.slice() : args ];
+                if ( list && ( !fired || stack ) ) {
+                    if ( firing ) {
+                        stack.push( args );
+                    } else {
+                        fire( args );
+                    }
+                }
+                return this;
+            },
+            // Call all the callbacks with the given arguments
+            fire: function() {
+                self.fireWith( this, arguments );
+                return this;
+            },
+            // To know if the callbacks have already been called at least once
+            fired: function() {
+                return !!fired;
+            }
+        };
+
+    return self;
+};
+jQuery.extend({
+
+    Deferred: function( func ) {
+        var tuples = [
+                // action, add listener, listener list, final state
+                [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
+                [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
+                [ "notify", "progress", jQuery.Callbacks("memory") ]
+            ],
+            state = "pending",
+            promise = {
+                state: function() {
+                    return state;
+                },
+                always: function() {
+                    deferred.done( arguments ).fail( arguments );
+                    return this;
+                },
+                then: function( /* fnDone, fnFail, fnProgress */ ) {
+                    var fns = arguments;
+                    return jQuery.Deferred(function( newDefer ) {
+                        jQuery.each( tuples, function( i, tuple ) {
+                            var action = tuple[ 0 ],
+                                fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+                            // deferred[ done | fail | progress ] for forwarding actions to newDefer
+                            deferred[ tuple[1] ](function() {
+                                var returned = fn && fn.apply( this, arguments );
+                                if ( returned && jQuery.isFunction( returned.promise ) ) {
+                                    returned.promise()
+                                        .done( newDefer.resolve )
+                                        .fail( newDefer.reject )
+                                        .progress( newDefer.notify );
+                                } else {
+                                    newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+                                }
+                            });
+                        });
+                        fns = null;
+                    }).promise();
+                },
+                // Get a promise for this deferred
+                // If obj is provided, the promise aspect is added to the object
+                promise: function( obj ) {
+                    return obj != null ? jQuery.extend( obj, promise ) : promise;
+                }
+            },
+            deferred = {};
+
+        // Keep pipe for back-compat
+        promise.pipe = promise.then;
+
+        // Add list-specific methods
+        jQuery.each( tuples, function( i, tuple ) {
+            var list = tuple[ 2 ],
+                stateString = tuple[ 3 ];
+
+            // promise[ done | fail | progress ] = list.add
+            promise[ tuple[1] ] = list.add;
+
+            // Handle state
+            if ( stateString ) {
+                list.add(function() {
+                    // state = [ resolved | rejected ]
+                    state = stateString;
+
+                // [ reject_list | resolve_list ].disable; progress_list.lock
+                }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
+            }
+
+            // deferred[ resolve | reject | notify ]
+            deferred[ tuple[0] ] = function() {
+                deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
+                return this;
+            };
+            deferred[ tuple[0] + "With" ] = list.fireWith;
+        });
+
+        // Make the deferred a promise
+        promise.promise( deferred );
+
+        // Call given func if any
+        if ( func ) {
+            func.call( deferred, deferred );
+        }
+
+        // All done!
+        return deferred;
+    },
+
+    // Deferred helper
+    when: function( subordinate /* , ..., subordinateN */ ) {
+        var i = 0,
+            resolveValues = core_slice.call( arguments ),
+            length = resolveValues.length,
+
+            // the count of uncompleted subordinates
+            remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+
+            // the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+            deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+            // Update function for both resolve and progress values
+            updateFunc = function( i, contexts, values ) {
+                return function( value ) {
+                    contexts[ i ] = this;
+                    values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
+                    if( values === progressValues ) {
+                        deferred.notifyWith( contexts, values );
+                    } else if ( !( --remaining ) ) {
+                        deferred.resolveWith( contexts, values );
+                    }
+                };
+            },
+
+            progressValues, progressContexts, resolveContexts;
+
+        // add listeners to Deferred subordinates; treat others as resolved
+        if ( length > 1 ) {
+            progressValues = new Array( length );
+            progressContexts = new Array( length );
+            resolveContexts = new Array( length );
+            for ( ; i < length; i++ ) {
+                if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
+                    resolveValues[ i ].promise()
+                        .done( updateFunc( i, resolveContexts, resolveValues ) )
+                        .fail( deferred.reject )
+                        .progress( updateFunc( i, progressContexts, progressValues ) );
+                } else {
+                    --remaining;
+                }
+            }
+        }
+
+        // if we're not waiting on anything, resolve the master
+        if ( !remaining ) {
+            deferred.resolveWith( resolveContexts, resolveValues );
+        }
+
+        return deferred.promise();
+    }
+});
+jQuery.support = (function() {
+
+    var support, all, a, select, opt, input, fragment, eventName, isSupported, i,
+        div = document.createElement("div");
+
+    // Setup
+    div.setAttribute( "className", "t" );
+    div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+
+    // Support tests won't run in some limited or non-browser environments
+    all = div.getElementsByTagName("*");
+    a = div.getElementsByTagName("a")[ 0 ];
+    if ( !all || !a || !all.length ) {
+        return {};
+    }
+
+    // First batch of tests
+    select = document.createElement("select");
+    opt = select.appendChild( document.createElement("option") );
+    input = div.getElementsByTagName("input")[ 0 ];
+
+    a.style.cssText = "top:1px;float:left;opacity:.5";
+    support = {
+        // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+        getSetAttribute: div.className !== "t",
+
+        // IE strips leading whitespace when .innerHTML is used
+        leadingWhitespace: div.firstChild.nodeType === 3,
+
+        // Make sure that tbody elements aren't automatically inserted
+        // IE will insert them into empty tables
+        tbody: !div.getElementsByTagName("tbody").length,
+
+        // Make sure that link elements get serialized correctly by innerHTML
+        // This requires a wrapper element in IE
+        htmlSerialize: !!div.getElementsByTagName("link").length,
+
+        // Get the style information from getAttribute
+        // (IE uses .cssText instead)
+        style: /top/.test( a.getAttribute("style") ),
+
+        // Make sure that URLs aren't manipulated
+        // (IE normalizes it by default)
+        hrefNormalized: a.getAttribute("href") === "/a",
+
+        // Make sure that element opacity exists
+        // (IE uses filter instead)
+        // Use a regex to work around a WebKit issue. See #5145
+        opacity: /^0.5/.test( a.style.opacity ),
+
+        // Verify style float existence
+        // (IE uses styleFloat instead of cssFloat)
+        cssFloat: !!a.style.cssFloat,
+
+        // Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+        checkOn: !!input.value,
+
+        // Make sure that a selected-by-default option has a working selected property.
+        // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+        optSelected: opt.selected,
+
+        // Tests for enctype support on a form (#6743)
+        enctype: !!document.createElement("form").enctype,
+
+        // Makes sure cloning an html5 element does not cause problems
+        // Where outerHTML is undefined, this still works
+        html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
+
+        // jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
+        boxModel: document.compatMode === "CSS1Compat",
+
+        // Will be defined later
+        deleteExpando: true,
+        noCloneEvent: true,
+        inlineBlockNeedsLayout: false,
+        shrinkWrapBlocks: false,
+        reliableMarginRight: true,
+        boxSizingReliable: true,
+        pixelPosition: false
+    };
+
+    // Make sure checked status is properly cloned
+    input.checked = true;
+    support.noCloneChecked = input.cloneNode( true ).checked;
+
+    // Make sure that the options inside disabled selects aren't marked as disabled
+    // (WebKit marks them as disabled)
+    select.disabled = true;
+    support.optDisabled = !opt.disabled;
+
+    // Support: IE<9
+    try {
+        delete div.test;
+    } catch( e ) {
+        support.deleteExpando = false;
+    }
+
+    // Check if we can trust getAttribute("value")
+    input = document.createElement("input");
+    input.setAttribute( "value", "" );
+    support.input = input.getAttribute( "value" ) === "";
+
+    // Check if an input maintains its value after becoming a radio
+    input.value = "t";
+    input.setAttribute( "type", "radio" );
+    support.radioValue = input.value === "t";
+
+    // #11217 - WebKit loses check when the name is after the checked attribute
+    input.setAttribute( "checked", "t" );
+    input.setAttribute( "name", "t" );
+
+    fragment = document.createDocumentFragment();
+    fragment.appendChild( input );
+
+    // Check if a disconnected checkbox will retain its checked
+    // value of true after appended to the DOM (IE6/7)
+    support.appendChecked = input.checked;
+
+    // WebKit doesn't clone checked state correctly in fragments
+    support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+    // Support: IE<9
+    // Opera does not clone events (and typeof div.attachEvent === undefined).
+    // IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
+    if ( div.attachEvent ) {
+        div.attachEvent( "onclick", function() {
+            support.noCloneEvent = false;
+        });
+
+        div.cloneNode( true ).click();
+    }
+
+    // Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
+    // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP), test/csp.php
+    for ( i in { submit: true, change: true, focusin: true }) {
+        div.setAttribute( eventName = "on" + i, "t" );
+
+        support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
+    }
+
+    div.style.backgroundClip = "content-box";
+    div.cloneNode( true ).style.backgroundClip = "";
+    support.clearCloneStyle = div.style.backgroundClip === "content-box";
+
+    // Run tests that need a body at doc ready
+    jQuery(function() {
+        var container, marginDiv, tds,
+            divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
+            body = document.getElementsByTagName("body")[0];
+
+        if ( !body ) {
+            // Return for frameset docs that don't have a body
+            return;
+        }
+
+        container = document.createElement("div");
+        container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
+
+        body.appendChild( container ).appendChild( div );
+
+        // Support: IE8
+        // Check if table cells still have offsetWidth/Height when they are set
+        // to display:none and there are still other visible table cells in a
+        // table row; if so, offsetWidth/Height are not reliable for use when
+        // determining if an element has been hidden directly using
+        // display:none (it is still safe to use offsets if a parent element is
+        // hidden; don safety goggles and see bug #4512 for more information).
+        div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+        tds = div.getElementsByTagName("td");
+        tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
+        isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+        tds[ 0 ].style.display = "";
+        tds[ 1 ].style.display = "none";
+
+        // Support: IE8
+        // Check if empty table cells still have offsetWidth/Height
+        support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+
+        // Check box-sizing and margin behavior
+        div.innerHTML = "";
+        div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
+        support.boxSizing = ( div.offsetWidth === 4 );
+        support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
+
+        // Use window.getComputedStyle because jsdom on node.js will break without it.
+        if ( window.getComputedStyle ) {
+            support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
+            support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+
+            // Check if div with explicit width and no margin-right incorrectly
+            // gets computed margin-right based on width of container. (#3333)
+            // Fails in WebKit before Feb 2011 nightlies
+            // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+            marginDiv = div.appendChild( document.createElement("div") );
+            marginDiv.style.cssText = div.style.cssText = divReset;
+            marginDiv.style.marginRight = marginDiv.style.width = "0";
+            div.style.width = "1px";
+
+            support.reliableMarginRight =
+                !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+        }
+
+        if ( typeof div.style.zoom !== "undefined" ) {
+            // Support: IE<8
+            // Check if natively block-level elements act like inline-block
+            // elements when setting their display to 'inline' and giving
+            // them layout
+            div.innerHTML = "";
+            div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
+            support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+
+            // Support: IE6
+            // Check if elements with layout shrink-wrap their children
+            div.style.display = "block";
+            div.innerHTML = "<div></div>";
+            div.firstChild.style.width = "5px";
+            support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+
+            // Prevent IE 6 from affecting layout for positioned elements #11048
+            // Prevent IE from shrinking the body in IE 7 mode #12869
+            body.style.zoom = 1;
+        }
+
+        body.removeChild( container );
+
+        // Null elements to avoid leaks in IE
+        container = div = tds = marginDiv = null;
+    });
+
+    // Null elements to avoid leaks in IE
+    all = select = fragment = opt = a = input = null;
+
+    return support;
+})();
+
+var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+    rmultiDash = /([A-Z])/g;
+    
+function internalData( elem, name, data, pvt /* Internal Use Only */ ){
+    if ( !jQuery.acceptData( elem ) ) {
+        return;
+    }
+
+    var thisCache, ret,
+        internalKey = jQuery.expando,
+        getByName = typeof name === "string",
+
+        // We have to handle DOM nodes and JS objects differently because IE6-7
+        // can't GC object references properly across the DOM-JS boundary
+        isNode = elem.nodeType,
+
+        // Only DOM nodes need the global jQuery cache; JS object data is
+        // attached directly to the object so GC can occur automatically
+        cache = isNode ? jQuery.cache : elem,
+
+        // Only defining an ID for JS objects if its cache already exists allows
+        // the code to shortcut on the same path as a DOM node with no cache
+        id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+
+    // Avoid doing any more work than we need to when trying to get data on an
+    // object that has no data at all
+    if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
+        return;
+    }
+
+    if ( !id ) {
+        // Only DOM nodes need a new unique ID for each element since their data
+        // ends up in the global cache
+        if ( isNode ) {
+            elem[ internalKey ] = id = core_deletedIds.pop() || jQuery.guid++;
+        } else {
+            id = internalKey;
+        }
+    }
+
+    if ( !cache[ id ] ) {
+        cache[ id ] = {};
+
+        // Avoids exposing jQuery metadata on plain JS objects when the object
+        // is serialized using JSON.stringify
+        if ( !isNode ) {
+            cache[ id ].toJSON = jQuery.noop;
+        }
+    }
+
+    // An object can be passed to jQuery.data instead of a key/value pair; this gets
+    // shallow copied over onto the existing cache
+    if ( typeof name === "object" || typeof name === "function" ) {
+        if ( pvt ) {
+            cache[ id ] = jQuery.extend( cache[ id ], name );
+        } else {
+            cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+        }
+    }
+
+    thisCache = cache[ id ];
+
+    // jQuery data() is stored in a separate object inside the object's internal data
+    // cache in order to avoid key collisions between internal data and user-defined
+    // data.
+    if ( !pvt ) {
+        if ( !thisCache.data ) {
+            thisCache.data = {};
+        }
+
+        thisCache = thisCache.data;
+    }
+
+    if ( data !== undefined ) {
+        thisCache[ jQuery.camelCase( name ) ] = data;
+    }
+
+    // Check for both converted-to-camel and non-converted data property names
+    // If a data property was specified
+    if ( getByName ) {
+
+        // First Try to find as-is property data
+        ret = thisCache[ name ];
+
+        // Test for null|undefined property data
+        if ( ret == null ) {
+
+            // Try to find the camelCased property
+            ret = thisCache[ jQuery.camelCase( name ) ];
+        }
+    } else {
+        ret = thisCache;
+    }
+
+    return ret;
+}
+
+function internalRemoveData( elem, name, pvt /* For internal use only */ ){
+    if ( !jQuery.acceptData( elem ) ) {
+        return;
+    }
+
+    var thisCache, i, l,
+
+        isNode = elem.nodeType,
+
+        // See jQuery.data for more information
+        cache = isNode ? jQuery.cache : elem,
+        id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+    // If there is already no cache entry for this object, there is no
+    // purpose in continuing
+    if ( !cache[ id ] ) {
+        return;
+    }
+
+    if ( name ) {
+
+        thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+        if ( thisCache ) {
+
+            // Support array or space separated string names for data keys
+            if ( !jQuery.isArray( name ) ) {
+
+                // try the string as a key before any manipulation
+                if ( name in thisCache ) {
+                    name = [ name ];
+                } else {
+
+                    // split the camel cased version by spaces unless a key with the spaces exists
+                    name = jQuery.camelCase( name );
+                    if ( name in thisCache ) {
+                        name = [ name ];
+                    } else {
+                        name = name.split(" ");
+                    }
+                }
+            } else {
+                // If "name" is an array of keys...
+                // When data is initially created, via ("key", "val") signature,
+                // keys will be converted to camelCase.
+                // Since there is no way to tell _how_ a key was added, remove
+                // both plain key and camelCase key. #12786
+                // This will only penalize the array argument path.
+                name = name.concat( jQuery.map( name, jQuery.camelCase ) );
+            }
+
+            for ( i = 0, l = name.length; i < l; i++ ) {
+                delete thisCache[ name[i] ];
+            }
+
+            // If there is no data left in the cache, we want to continue
+            // and let the cache object itself get destroyed
+            if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
+                return;
+            }
+        }
+    }
+
+    // See jQuery.data for more information
+    if ( !pvt ) {
+        delete cache[ id ].data;
+
+        // Don't destroy the parent cache unless the internal data object
+        // had been the only thing left in it
+        if ( !isEmptyDataObject( cache[ id ] ) ) {
+            return;
+        }
+    }
+
+    // Destroy the cache
+    if ( isNode ) {
+        jQuery.cleanData( [ elem ], true );
+
+    // Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+    } else if ( jQuery.support.deleteExpando || cache != cache.window ) {
+        delete cache[ id ];
+
+    // When all else fails, null
+    } else {
+        cache[ id ] = null;
+    }
+}
+
+jQuery.extend({
+    cache: {},
+
+    // Unique for each copy of jQuery on the page
+    // Non-digits removed to match rinlinejQuery
+    expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
+
+    // The following elements throw uncatchable exceptions if you
+    // attempt to add expando properties to them.
+    noData: {
+        "embed": true,
+        // Ban all objects except for Flash (which handle expandos)
+        "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+        "applet": true
+    },
+
+    hasData: function( elem ) {
+        elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+        return !!elem && !isEmptyDataObject( elem );
+    },
+
+    data: function( elem, name, data ) {
+        return internalData( elem, name, data, false );
+    },
+
+    removeData: function( elem, name ) {
+        return internalRemoveData( elem, name, false );
+    },
+
+    // For internal use only.
+    _data: function( elem, name, data ) {
+        return internalData( elem, name, data, true );
+    },
+    
+    _removeData: function( elem, name ) {
+        return internalRemoveData( elem, name, true );
+    },
+
+    // A method for determining if a DOM node can handle the data expando
+    acceptData: function( elem ) {
+        var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+        // nodes accept data unless otherwise specified; rejection can be conditional
+        return !noData || noData !== true && elem.getAttribute("classid") === noData;
+    }
+});
+
+jQuery.fn.extend({
+    data: function( key, value ) {
+        var attrs, name,
+            elem = this[0],
+            i = 0,
+            data = null;
+
+        // Gets all values
+        if ( key === undefined ) {
+            if ( this.length ) {
+                data = jQuery.data( elem );
+
+                if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
+                    attrs = elem.attributes;
+                    for ( ; i < attrs.length; i++ ) {
+                        name = attrs[i].name;
+
+                        if ( !name.indexOf( "data-" ) ) {
+                            name = jQuery.camelCase( name.substring(5) );
+
+                            dataAttr( elem, name, data[ name ] );
+                        }
+                    }
+                    jQuery._data( elem, "parsedAttrs", true );
+                }
+            }
+
+            return data;
+        }
+
+        // Sets multiple values
+        if ( typeof key === "object" ) {
+            return this.each(function() {
+                jQuery.data( this, key );
+            });
+        }
+
+        return jQuery.access( this, function( value ) {
+
+            if ( value === undefined ) {
+                // Try to fetch any internally stored data first
+                return elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
+            }
+
+            this.each(function() {
+                jQuery.data( this, key, value );
+            });
+        }, null, value, arguments.length > 1, null, true );
+    },
+
+    removeData: function( key ) {
+        return this.each(function() {
+            jQuery.removeData( this, key );
+        });
+    }
+});
+
+function dataAttr( elem, key, data ) {
+    // If nothing was found internally, try to fetch any
+    // data from the HTML5 data-* attribute
+    if ( data === undefined && elem.nodeType === 1 ) {
+
+        var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+        data = elem.getAttribute( name );
+
+        if ( typeof data === "string" ) {
+            try {
+                data = data === "true" ? true :
+                data === "false" ? false :
+                data === "null" ? null :
+                // Only convert to a number if it doesn't change the string
+                +data + "" === data ? +data :
+                rbrace.test( data ) ? jQuery.parseJSON( data ) :
+                    data;
+            } catch( e ) {}
+
+            // Make sure we set the data so it isn't changed later
+            jQuery.data( elem, key, data );
+
+        } else {
+            data = undefined;
+        }
+    }
+
+    return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+    var name;
+    for ( name in obj ) {
+
+        // if the public data object is empty, the private is still empty
+        if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+            continue;
+        }
+        if ( name !== "toJSON" ) {
+            return false;
+        }
+    }
+
+    return true;
+}
+jQuery.extend({
+    queue: function( elem, type, data ) {
+        var queue;
+
+        if ( elem ) {
+            type = ( type || "fx" ) + "queue";
+            queue = jQuery._data( elem, type );
+
+            // Speed up dequeue by getting out quickly if this is just a lookup
+            if ( data ) {
+                if ( !queue || jQuery.isArray(data) ) {
+                    queue = jQuery._data( elem, type, jQuery.makeArray(data) );
+                } else {
+                    queue.push( data );
+                }
+            }
+            return queue || [];
+        }
+    },
+
+    dequeue: function( elem, type ) {
+        type = type || "fx";
+
+        var queue = jQuery.queue( elem, type ),
+            startLength = queue.length,
+            fn = queue.shift(),
+            hooks = jQuery._queueHooks( elem, type ),
+            next = function() {
+                jQuery.dequeue( elem, type );
+            };
+
+        // If the fx queue is dequeued, always remove the progress sentinel
+        if ( fn === "inprogress" ) {
+            fn = queue.shift();
+            startLength--;
+        }
+
+        hooks.cur = fn;
+        if ( fn ) {
+
+            // Add a progress sentinel to prevent the fx queue from being
+            // automatically dequeued
+            if ( type === "fx" ) {
+                queue.unshift( "inprogress" );
+            }
+
+            // clear up the last queue stop function
+            delete hooks.stop;
+            fn.call( elem, next, hooks );
+        }
+
+        if ( !startLength && hooks ) {
+            hooks.empty.fire();
+        }
+    },
+
+    // not intended for public consumption - generates a queueHooks object, or returns the current one
+    _queueHooks: function( elem, type ) {
+        var key = type + "queueHooks";
+        return jQuery._data( elem, key ) || jQuery._data( elem, key, {
+            empty: jQuery.Callbacks("once memory").add(function() {
+                jQuery._removeData( elem, type + "queue" );
+                jQuery._removeData( elem, key );
+            })
+        });
+    }
+});
+
+jQuery.fn.extend({
+    queue: function( type, data ) {
+        var setter = 2;
+
+        if ( typeof type !== "string" ) {
+            data = type;
+            type = "fx";
+            setter--;
+        }
+
+        if ( arguments.length < setter ) {
+            return jQuery.queue( this[0], type );
+        }
+
+        return data === undefined ?
+            this :
+            this.each(function() {
+                var queue = jQuery.queue( this, type, data );
+
+                // ensure a hooks for this queue
+                jQuery._queueHooks( this, type );
+
+                if ( type === "fx" && queue[0] !== "inprogress" ) {
+                    jQuery.dequeue( this, type );
+                }
+            });
+    },
+    dequeue: function( type ) {
+        return this.each(function() {
+            jQuery.dequeue( this, type );
+        });
+    },
+    // Based off of the plugin by Clint Helfers, with permission.
+    // http://blindsignals.com/index.php/2009/07/jquery-delay/
+    delay: function( time, type ) {
+        time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+        type = type || "fx";
+
+        return this.queue( type, function( next, hooks ) {
+            var timeout = setTimeout( next, time );
+            hooks.stop = function() {
+                clearTimeout( timeout );
+            };
+        });
+    },
+    clearQueue: function( type ) {
+        return this.queue( type || "fx", [] );
+    },
+    // Get a promise resolved when queues of a certain type
+    // are emptied (fx is the type by default)
+    promise: function( type, obj ) {
+        var tmp,
+            count = 1,
+            defer = jQuery.Deferred(),
+            elements = this,
+            i = this.length,
+            resolve = function() {
+                if ( !( --count ) ) {
+                    defer.resolveWith( elements, [ elements ] );
+                }
+            };
+
+        if ( typeof type !== "string" ) {
+            obj = type;
+            type = undefined;
+        }
+        type = type || "fx";
+
+        while( i-- ) {
+            tmp = jQuery._data( elements[ i ], type + "queueHooks" );
+            if ( tmp && tmp.empty ) {
+                count++;
+                tmp.empty.add( resolve );
+            }
+        }
+        resolve();
+        return defer.promise( obj );
+    }
+});
+var nodeHook, boolHook,
+    rclass = /[\t\r\n]/g,
+    rreturn = /\r/g,
+    rfocusable = /^(?:input|select|textarea|button|object)$/i,
+    rclickable = /^(?:a|area)$/i,
+    rboolean = /^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,
+    ruseDefault = /^(?:checked|selected)$/i,
+    getSetAttribute = jQuery.support.getSetAttribute,
+    getSetInput = jQuery.support.input;
+
+jQuery.fn.extend({
+    attr: function( name, value ) {
+        return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
+    },
+
+    removeAttr: function( name ) {
+        return this.each(function() {
+            jQuery.removeAttr( this, name );
+        });
+    },
+
+    prop: function( name, value ) {
+        return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
+    },
+
+    removeProp: function( name ) {
+        name = jQuery.propFix[ name ] || name;
+        return this.each(function() {
+            // try/catch handles cases where IE balks (such as removing a property on window)
+            try {
+                this[ name ] = undefined;
+                delete this[ name ];
+            } catch( e ) {}
+        });
+    },
+
+    addClass: function( value ) {
+        var classes, elem, cur, clazz, j,
+            i = 0,
+            len = this.length,
+            proceed = typeof value === "string" && value;
+
+        if ( jQuery.isFunction( value ) ) {
+            return this.each(function( j ) {
+                jQuery( this ).addClass( value.call( this, j, this.className ) );
+            });
+        }
+
+        if ( proceed ) {
+            // The disjunction here is for better compressibility (see removeClass)
+            classes = ( value || "" ).match( core_rnotwhite ) || [];
+
+            for ( ; i < len; i++ ) {
+                elem = this[ i ];
+                cur = elem.nodeType === 1 && ( elem.className ?
+                    ( " " + elem.className + " " ).replace( rclass, " " ) :
+                    " "
+                );
+
+                if ( cur ) {
+                    j = 0;
+                    while ( (clazz = classes[j++]) ) {
+                        if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
+                            cur += clazz + " ";
+                        }
+                    }
+                    elem.className = jQuery.trim( cur );
+
+                }
+            }
+        }
+
+        return this;
+    },
+
+    removeClass: function( value ) {
+        var classes, elem, cur, clazz, j,
+            i = 0,
+            len = this.length,
+            proceed = arguments.length === 0 || typeof value === "string" && value;
+
+        if ( jQuery.isFunction( value ) ) {
+            return this.each(function( j ) {
+                jQuery( this ).removeClass( value.call( this, j, this.className ) );
+            });
+        }
+        if ( proceed ) {
+            classes = ( value || "" ).match( core_rnotwhite ) || [];
+
+            for ( ; i < len; i++ ) {
+                elem = this[ i ];
+                // This expression is here for better compressibility (see addClass)
+                cur = elem.nodeType === 1 && ( elem.className ?
+                    ( " " + elem.className + " " ).replace( rclass, " " ) :
+                    ""
+                );
+
+                if ( cur ) {
+                    j = 0;
+                    while ( (clazz = classes[j++]) ) {
+                        // Remove *all* instances
+                        while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
+                            cur = cur.replace( " " + clazz + " ", " " );
+                        }
+                    }
+                    elem.className = value ? jQuery.trim( cur ) : "";
+                }
+            }
+        }
+
+        return this;
+    },
+
+    toggleClass: function( value, stateVal ) {
+        var type = typeof value,
+            isBool = typeof stateVal === "boolean";
+
+        if ( jQuery.isFunction( value ) ) {
+            return this.each(function( i ) {
+                jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+            });
+        }
+
+        return this.each(function() {
+            if ( type === "string" ) {
+                // toggle individual class names
+                var className,
+                    i = 0,
+                    self = jQuery( this ),
+                    state = stateVal,
+                    classNames = value.match( core_rnotwhite ) || [];
+
+                while ( (className = classNames[ i++ ]) ) {
+                    // check each className given, space separated list
+                    state = isBool ? state : !self.hasClass( className );
+                    self[ state ? "addClass" : "removeClass" ]( className );
+                }
+
+            // Toggle whole class name
+            } else if ( type === "undefined" || type === "boolean" ) {
+                if ( this.className ) {
+                    // store className if set
+                    jQuery._data( this, "__className__", this.className );
+                }
+
+                // If the element has a class name or if we're passed "false",
+                // then remove the whole classname (if there was one, the above saved it).
+                // Otherwise bring back whatever was previously saved (if anything),
+                // falling back to the empty string if nothing was stored.
+                this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+            }
+        });
+    },
+
+    hasClass: function( selector ) {
+        var className = " " + selector + " ",
+            i = 0,
+            l = this.length;
+        for ( ; i < l; i++ ) {
+            if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
+                return true;
+            }
+        }
+
+        return false;
+    },
+
+    val: function( value ) {
+        var hooks, ret, isFunction,
+            elem = this[0];
+
+        if ( !arguments.length ) {
+            if ( elem ) {
+                hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+
+                if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+                    return ret;
+                }
+
+                ret = elem.value;
+
+                return typeof ret === "string" ?
+                    // handle most common string cases
+                    ret.replace(rreturn, "") :
+                    // handle cases where value is null/undef or number
+                    ret == null ? "" : ret;
+            }
+
+            return;
+        }
+
+        isFunction = jQuery.isFunction( value );
+
+        return this.each(function( i ) {
+            var val,
+                self = jQuery(this);
+
+            if ( this.nodeType !== 1 ) {
+                return;
+            }
+
+            if ( isFunction ) {
+                val = value.call( this, i, self.val() );
+            } else {
+                val = value;
+            }
+
+            // Treat null/undefined as ""; convert numbers to string
+            if ( val == null ) {
+                val = "";
+            } else if ( typeof val === "number" ) {
+                val += "";
+            } else if ( jQuery.isArray( val ) ) {
+                val = jQuery.map(val, function ( value ) {
+                    return value == null ? "" : value + "";
+                });
+            }
+
+            hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+
+            // If set returns undefined, fall back to normal setting
+            if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+                this.value = val;
+            }
+        });
+    }
+});
+
+jQuery.extend({
+    valHooks: {
+        option: {
+            get: function( elem ) {
+                // attributes.value is undefined in Blackberry 4.7 but
+                // uses .value. See #6932
+                var val = elem.attributes.value;
+                return !val || val.specified ? elem.value : elem.text;
+            }
+        },
+        select: {
+            get: function( elem ) {
+                var value, option,
+                    options = elem.options,
+                    index = elem.selectedIndex,
+                    one = elem.type === "select-one" || index < 0,
+                    values = one ? null : [],
+                    max = one ? index + 1 : options.length,
+                    i = index < 0 ?
+                        max :
+                        one ? index : 0;
+
+                // Loop through all the selected options
+                for ( ; i < max; i++ ) {
+                    option = options[ i ];
+
+                    // oldIE doesn't update selected after form reset (#2551)
+                    if ( ( option.selected || i === index ) &&
+                            // Don't return options that are disabled or in a disabled optgroup
+                            ( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
+                            ( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+
+                        // Get the specific value for the option
+                        value = jQuery( option ).val();
+
+                        // We don't need an array for one selects
+                        if ( one ) {
+                            return value;
+                        }
+
+                        // Multi-Selects return an array
+                        values.push( value );
+                    }
+                }
+
+                return values;
+            },
+
+            set: function( elem, value ) {
+                var values = jQuery.makeArray( value );
+
+                jQuery(elem).find("option").each(function() {
+                    this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+                });
+
+                if ( !values.length ) {
+                    elem.selectedIndex = -1;
+                }
+                return values;
+            }
+        }
+    },
+
+    attr: function( elem, name, value ) {
+        var ret, hooks, notxml,
+            nType = elem.nodeType;
+
+        // don't get/set attributes on text, comment and attribute nodes
+        if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+            return;
+        }
+
+        // Fallback to prop when attributes are not supported
+        if ( typeof elem.getAttribute === "undefined" ) {
+            return jQuery.prop( elem, name, value );
+        }
+
+        notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+        // All attributes are lowercase
+        // Grab necessary hook if one is defined
+        if ( notxml ) {
+            name = name.toLowerCase();
+            hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
+        }
+
+        if ( value !== undefined ) {
+
+            if ( value === null ) {
+                jQuery.removeAttr( elem, name );
+
+            } else if ( hooks && notxml && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+                return ret;
+
+            } else {
+                elem.setAttribute( name, value + "" );
+                return value;
+            }
+
+        } else if ( hooks && notxml && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+            return ret;
+
+        } else {
+
+            // In IE9+, Flash objects don't have .getAttribute (#12945)
+            // Support: IE9+
+            if ( typeof elem.getAttribute !== "undefined" ) {
+                ret =  elem.getAttribute( name );
+            }
+
+            // Non-existent attributes return null, we normalize to undefined
+            return ret == null ?
+                undefined :
+                ret;
+        }
+    },
+
+    removeAttr: function( elem, value ) {
+        var name, propName,
+            i = 0,
+            attrNames = value && value.match( core_rnotwhite );
+
+        if ( attrNames && elem.nodeType === 1 ) {
+            while ( (name = attrNames[i++]) ) {
+                propName = jQuery.propFix[ name ] || name;
+
+                // Boolean attributes get special treatment (#10870)
+                if ( rboolean.test( name ) ) {
+                    // Set corresponding property to false for boolean attributes
+                    // Also clear defaultChecked/defaultSelected (if appropriate) for IE<8
+                    if ( !getSetAttribute && ruseDefault.test( name ) ) {
+                        elem[ jQuery.camelCase( "default-" + name ) ] =
+                            elem[ propName ] = false;
+                    } else {
+                        elem[ propName ] = false;
+                    }
+
+                // See #9699 for explanation of this approach (setting first, then removal)
+                } else {
+                    jQuery.attr( elem, name, "" );
+                }
+
+                elem.removeAttribute( getSetAttribute ? name : propName );
+            }
+        }
+    },
+
+    attrHooks: {
+        type: {
+            set: function( elem, value ) {
+                if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+                    // Setting the type on a radio button after the value resets the value in IE6-9
+                    // Reset value to default in case type is set after value during creation
+                    var val = elem.value;
+                    elem.setAttribute( "type", value );
+                    if ( val ) {
+                        elem.value = val;
+                    }
+                    return value;
+                }
+            }
+        }
+    },
+
+    propFix: {
+        tabindex: "tabIndex",
+        readonly: "readOnly",
+        "for": "htmlFor",
+        "class": "className",
+        maxlength: "maxLength",
+        cellspacing: "cellSpacing",
+        cellpadding: "cellPadding",
+        rowspan: "rowSpan",
+        colspan: "colSpan",
+        usemap: "useMap",
+        frameborder: "frameBorder",
+        contenteditable: "contentEditable"
+    },
+
+    prop: function( elem, name, value ) {
+        var ret, hooks, notxml,
+            nType = elem.nodeType;
+
+        // don't get/set properties on text, comment and attribute nodes
+        if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+            return;
+        }
+
+        notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+        if ( notxml ) {
+            // Fix name and attach hooks
+            name = jQuery.propFix[ name ] || name;
+            hooks = jQuery.propHooks[ name ];
+        }
+
+        if ( value !== undefined ) {
+            if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+                return ret;
+
+            } else {
+                return ( elem[ name ] = value );
+            }
+
+        } else {
+            if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+                return ret;
+
+            } else {
+                return elem[ name ];
+            }
+        }
+    },
+
+    propHooks: {
+        tabIndex: {
+            get: function( elem ) {
+                // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+                // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+                var attributeNode = elem.getAttributeNode("tabindex");
+
+                return attributeNode && attributeNode.specified ?
+                    parseInt( attributeNode.value, 10 ) :
+                    rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+                        0 :
+                        undefined;
+            }
+        }
+    }
+});
+
+// Hook for boolean attributes
+boolHook = {
+    get: function( elem, name ) {
+        var
+            // Use .prop to determine if this attribute is understood as boolean
+            prop = jQuery.prop( elem, name ),
+
+            // Fetch it accordingly
+            attr = typeof prop === "boolean" && elem.getAttribute( name ),
+            detail = typeof prop === "boolean" ?
+
+                getSetInput && getSetAttribute ?
+                    attr != null :
+                    // oldIE fabricates an empty string for missing boolean attributes
+                    // and conflates checked/selected into attroperties
+                    ruseDefault.test( name ) ?
+                        elem[ jQuery.camelCase( "default-" + name ) ] :
+                        !!attr :
+
+                // fetch an attribute node for properties not recognized as boolean
+                elem.getAttributeNode( name );
+
+        return detail && detail.value !== false ?
+            name.toLowerCase() :
+            undefined;
+    },
+    set: function( elem, value, name ) {
+        if ( value === false ) {
+            // Remove boolean attributes when set to false
+            jQuery.removeAttr( elem, name );
+        } else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
+            // IE<8 needs the *property* name
+            elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
+
+        // Use defaultChecked and defaultSelected for oldIE
+        } else {
+            elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
+        }
+
+        return name;
+    }
+};
+
+// fix oldIE value attroperty
+if ( !getSetInput || !getSetAttribute ) {
+    jQuery.attrHooks.value = {
+        get: function( elem, name ) {
+            var ret = elem.getAttributeNode( name );
+            return jQuery.nodeName( elem, "input" ) ?
+
+                // Ignore the value *property* by using defaultValue
+                elem.defaultValue :
+
+                ret && ret.specified ? ret.value : undefined;
+        },
+        set: function( elem, value, name ) {
+            if ( jQuery.nodeName( elem, "input" ) ) {
+                // Does not return so that setAttribute is also used
+                elem.defaultValue = value;
+            } else {
+                // Use nodeHook if defined (#1954); otherwise setAttribute is fine
+                return nodeHook && nodeHook.set( elem, value, name );
+            }
+        }
+    };
+}
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+    // Use this for any attribute in IE6/7
+    // This fixes almost every IE6/7 issue
+    nodeHook = jQuery.valHooks.button = {
+        get: function( elem, name ) {
+            var ret = elem.getAttributeNode( name );
+            return ret && ( name === "id" || name === "name" || name === "coords" ? ret.value !== "" : ret.specified ) ?
+                ret.value :
+                undefined;
+        },
+        set: function( elem, value, name ) {
+            // Set the existing or create a new attribute node
+            var ret = elem.getAttributeNode( name );
+            if ( !ret ) {
+                elem.setAttributeNode(
+                    (ret = elem.ownerDocument.createAttribute( name ))
+                );
+            }
+
+            ret.value = value += "";
+
+            // Break association with cloned elements by also using setAttribute (#9646)
+            return name === "value" || value === elem.getAttribute( name ) ?
+                value :
+                undefined;
+        }
+    };
+
+    // Set contenteditable to false on removals(#10429)
+    // Setting to empty string throws an error as an invalid value
+    jQuery.attrHooks.contenteditable = {
+        get: nodeHook.get,
+        set: function( elem, value, name ) {
+            nodeHook.set( elem, value === "" ? false : value, name );
+        }
+    };
+
+    // Set width and height to auto instead of 0 on empty string( Bug #8150 )
+    // This is for removals
+    jQuery.each([ "width", "height" ], function( i, name ) {
+        jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+            set: function( elem, value ) {
+                if ( value === "" ) {
+                    elem.setAttribute( name, "auto" );
+                    return value;
+                }
+            }
+        });
+    });
+}
+
+
+// Some attributes require a special call on IE
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !jQuery.support.hrefNormalized ) {
+    jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+        jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+            get: function( elem ) {
+                var ret = elem.getAttribute( name, 2 );
+                return ret == null ? undefined : ret;
+            }
+        });
+    });
+
+    // href/src property should get the full normalized URL (#10299/#12915)
+    jQuery.each([ "href", "src" ], function( i, name ) {
+        jQuery.propHooks[ name ] = {
+            get: function( elem ) {
+                return elem.getAttribute( name, 4 );
+            }
+        };
+    });
+}
+
+if ( !jQuery.support.style ) {
+    jQuery.attrHooks.style = {
+        get: function( elem ) {
+            // Return undefined in the case of empty string
+            // Note: IE uppercases css property names, but if we were to .toLowerCase()
+            // .cssText, that would destroy case senstitivity in URL's, like in "background"
+            return elem.style.cssText || undefined;
+        },
+        set: function( elem, value ) {
+            return ( elem.style.cssText = value + "" );
+        }
+    };
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+    jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+        get: function( elem ) {
+            var parent = elem.parentNode;
+
+            if ( parent ) {
+                parent.selectedIndex;
+
+                // Make sure that it also works with optgroups, see #5701
+                if ( parent.parentNode ) {
+                    parent.parentNode.selectedIndex;
+                }
+            }
+            return null;
+        }
+    });
+}
+
+// IE6/7 call enctype encoding
+if ( !jQuery.support.enctype ) {
+    jQuery.propFix.enctype = "encoding";
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+    jQuery.each([ "radio", "checkbox" ], function() {
+        jQuery.valHooks[ this ] = {
+            get: function( elem ) {
+                // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+                return elem.getAttribute("value") === null ? "on" : elem.value;
+            }
+        };
+    });
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+    jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+        set: function( elem, value ) {
+            if ( jQuery.isArray( value ) ) {
+                return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+            }
+        }
+    });
+});
+var rformElems = /^(?:input|select|textarea)$/i,
+    rkeyEvent = /^key/,
+    rmouseEvent = /^(?:mouse|contextmenu)|click/,
+    rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+    rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+
+function returnTrue() {
+    return true;
+}
+
+function returnFalse() {
+    return false;
+}
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+    global: {},
+
+    add: function( elem, types, handler, data, selector ) {
+
+        var handleObjIn, eventHandle, tmp,
+            events, t, handleObj,
+            special, handlers, type, namespaces, origType,
+            // Don't attach events to noData or text/comment nodes (but allow plain objects)
+            elemData = elem.nodeType !== 3 && elem.nodeType !== 8 && jQuery._data( elem );
+
+        if ( !elemData ) {
+            return;
+        }
+
+        // Caller can pass in an object of custom data in lieu of the handler
+        if ( handler.handler ) {
+            handleObjIn = handler;
+            handler = handleObjIn.handler;
+            selector = handleObjIn.selector;
+        }
+
+        // Make sure that the handler has a unique ID, used to find/remove it later
+        if ( !handler.guid ) {
+            handler.guid = jQuery.guid++;
+        }
+
+        // Init the element's event structure and main handler, if this is the first
+        if ( !(events = elemData.events) ) {
+            events = elemData.events = {};
+        }
+        if ( !(eventHandle = elemData.handle) ) {
+            eventHandle = elemData.handle = function( e ) {
+                // Discard the second event of a jQuery.event.trigger() and
+                // when an event is called after a page has unloaded
+                return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
+                    jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+                    undefined;
+            };
+            // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+            eventHandle.elem = elem;
+        }
+
+        // Handle multiple events separated by a space
+        // jQuery(...).bind("mouseover mouseout", fn);
+        types = ( types || "" ).match( core_rnotwhite ) || [""];
+        t = types.length;
+        while ( t-- ) {
+            tmp = rtypenamespace.exec( types[t] ) || [];
+            type = origType = tmp[1];
+            namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+            // If event changes its type, use the special event handlers for the changed type
+            special = jQuery.event.special[ type ] || {};
+
+            // If selector defined, determine special event api type, otherwise given type
+            type = ( selector ? special.delegateType : special.bindType ) || type;
+
+            // Update special based on newly reset type
+            special = jQuery.event.special[ type ] || {};
+
+            // handleObj is passed to all event handlers
+            handleObj = jQuery.extend({
+                type: type,
+                origType: origType,
+                data: data,
+                handler: handler,
+                guid: handler.guid,
+                selector: selector,
+                needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
+                namespace: namespaces.join(".")
+            }, handleObjIn );
+
+            // Init the event handler queue if we're the first
+            if ( !(handlers = events[ type ]) ) {
+                handlers = events[ type ] = [];
+                handlers.delegateCount = 0;
+
+                // Only use addEventListener/attachEvent if the special events handler returns false
+                if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+                    // Bind the global event handler to the element
+                    if ( elem.addEventListener ) {
+                        elem.addEventListener( type, eventHandle, false );
+
+                    } else if ( elem.attachEvent ) {
+                        elem.attachEvent( "on" + type, eventHandle );
+                    }
+                }
+            }
+
+            if ( special.add ) {
+                special.add.call( elem, handleObj );
+
+                if ( !handleObj.handler.guid ) {
+                    handleObj.handler.guid = handler.guid;
+                }
+            }
+
+            // Add to the element's handler list, delegates in front
+            if ( selector ) {
+                handlers.splice( handlers.delegateCount++, 0, handleObj );
+            } else {
+                handlers.push( handleObj );
+            }
+
+            // Keep track of which events have ever been used, for event optimization
+            jQuery.event.global[ type ] = true;
+        }
+
+        // Nullify elem to prevent memory leaks in IE
+        elem = null;
+    },
+
+    // Detach an event or set of events from an element
+    remove: function( elem, types, handler, selector, mappedTypes ) {
+
+        var j, origCount, tmp,
+            events, t, handleObj,
+            special, handlers, type, namespaces, origType,
+            elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+
+        if ( !elemData || !(events = elemData.events) ) {
+            return;
+        }
+
+        // Once for each type.namespace in types; type may be omitted
+        types = ( types || "" ).match( core_rnotwhite ) || [""];
+        t = types.length;
+        while ( t-- ) {
+            tmp = rtypenamespace.exec( types[t] ) || [];
+            type = origType = tmp[1];
+            namespaces = ( tmp[2] || "" ).split( "." ).sort();
+
+            // Unbind all events (on this namespace, if provided) for the element
+            if ( !type ) {
+                for ( type in events ) {
+                    jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+                }
+                continue;
+            }
+
+            special = jQuery.event.special[ type ] || {};
+            type = ( selector ? special.delegateType : special.bindType ) || type;
+            handlers = events[ type ] || [];
+            tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+
+            // Remove matching events
+            origCount = j = handlers.length;
+            while ( j-- ) {
+                handleObj = handlers[ j ];
+
+                if ( ( mappedTypes || origType === handleObj.origType ) &&
+                    ( !handler || handler.guid === handleObj.guid ) &&
+                    ( !tmp || tmp.test( handleObj.namespace ) ) &&
+                    ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+                    handlers.splice( j, 1 );
+
+                    if ( handleObj.selector ) {
+                        handlers.delegateCount--;
+                    }
+                    if ( special.remove ) {
+                        special.remove.call( elem, handleObj );
+                    }
+                }
+            }
+
+            // Remove generic event handler if we removed something and no more handlers exist
+            // (avoids potential for endless recursion during removal of special event handlers)
+            if ( origCount && !handlers.length ) {
+                if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
+                    jQuery.removeEvent( elem, type, elemData.handle );
+                }
+
+                delete events[ type ];
+            }
+        }
+
+        // Remove the expando if it's no longer used
+        if ( jQuery.isEmptyObject( events ) ) {
+            delete elemData.handle;
+
+            // removeData also checks for emptiness and clears the expando if empty
+            // so use it instead of delete
+            jQuery._removeData( elem, "events" );
+        }
+    },
+
+    trigger: function( event, data, elem, onlyHandlers ) {
+
+        var i, cur, tmp, bubbleType, ontype, handle, special,
+            eventPath = [ elem || document ],
+            type = event.type || event,
+            namespaces = event.namespace ? event.namespace.split(".") : [];
+
+        cur = tmp = elem = elem || document;
+
+        // Don't do events on text and comment nodes
+        if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+            return;
+        }
+
+        // focus/blur morphs to focusin/out; ensure we're not firing them right now
+        if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+            return;
+        }
+
+        if ( type.indexOf(".") >= 0 ) {
+            // Namespaced trigger; create a regexp to match event type in handle()
+            namespaces = type.split(".");
+            type = namespaces.shift();
+            namespaces.sort();
+        }
+        ontype = type.indexOf(":") < 0 && "on" + type;
+
+        // Caller can pass in a jQuery.Event object, Object, or just an event type string
+        event = event[ jQuery.expando ] ?
+            event :
+            new jQuery.Event( type, typeof event === "object" && event );
+
+        event.isTrigger = true;
+        event.namespace = namespaces.join(".");
+        event.namespace_re = event.namespace ?
+            new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+            null;
+
+        // Clean up the event in case it is being reused
+        event.result = undefined;
+        if ( !event.target ) {
+            event.target = elem;
+        }
+
+        // Clone any incoming data and prepend the event, creating the handler arg list
+        data = data == null ?
+            [ event ] :
+            jQuery.makeArray( data, [ event ] );
+
+        // Allow special events to draw outside the lines
+        special = jQuery.event.special[ type ] || {};
+        if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+            return;
+        }
+
+        // Determine event propagation path in advance, per W3C events spec (#9951)
+        // Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+        if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+            bubbleType = special.delegateType || type;
+            if ( !rfocusMorph.test( bubbleType + type ) ) {
+                cur = cur.parentNode;
+            }
+            for ( ; cur; cur = cur.parentNode ) {
+                eventPath.push( cur );
+                tmp = cur;
+            }
+
+            // Only add window if we got to document (e.g., not plain obj or detached DOM)
+            if ( tmp === (elem.ownerDocument || document) ) {
+                eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+            }
+        }
+
+        // Fire handlers on the event path
+        i = 0;
+        while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+
+            event.type = i > 1 ?
+                bubbleType :
+                special.bindType || type;
+
+            // jQuery handler
+            handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+            if ( handle ) {
+                handle.apply( cur, data );
+            }
+
+            // Native handler
+            handle = ontype && cur[ ontype ];
+            if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
+                event.preventDefault();
+            }
+        }
+        event.type = type;
+
+        // If nobody prevented the default action, do it now
+        if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+            if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
+                !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
+
+                // Call a native DOM method on the target with the same name name as the event.
+                // Can't use an .isFunction() check here because IE6/7 fails that test.
+                // Don't do default actions on window, that's where global variables be (#6170)
+                if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+
+                    // Don't re-trigger an onFOO event when we call its FOO() method
+                    tmp = elem[ ontype ];
+
+                    if ( tmp ) {
+                        elem[ ontype ] = null;
+                    }
+
+                    // Prevent re-triggering of the same event, since we already bubbled it above
+                    jQuery.event.triggered = type;
+                    try {
+                        elem[ type ]();
+                    } catch ( e ) {
+                        // IE<9 dies on focus/blur to hidden element (#1486,#12518)
+                        // only reproducible on winXP IE8 native, not IE9 in IE8 mode
+                    }
+                    jQuery.event.triggered = undefined;
+
+                    if ( tmp ) {
+                        elem[ ontype ] = tmp;
+                    }
+                }
+            }
+        }
+
+        return event.result;
+    },
+
+    dispatch: function( event ) {
+
+        // Make a writable jQuery.Event from the native event object
+        event = jQuery.event.fix( event );
+
+        var i, j, ret, matched, handleObj,
+            handlerQueue = [],
+            args = core_slice.call( arguments ),
+            handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
+            special = jQuery.event.special[ event.type ] || {};
+
+        // Use the fix-ed jQuery.Event rather than the (read-only) native event
+        args[0] = event;
+        event.delegateTarget = this;
+
+        // Call the preDispatch hook for the mapped type, and let it bail if desired
+        if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
+            return;
+        }
+
+        // Determine handlers
+        handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+
+        // Run delegates first; they may want to stop propagation beneath us
+        i = 0;
+        while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
+            event.currentTarget = matched.elem;
+
+            j = 0;
+            while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+
+                // Triggered event must either 1) have no namespace, or
+                // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+                if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+
+                    event.handleObj = handleObj;
+                    event.data = handleObj.data;
+
+                    ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+                            .apply( matched.elem, args );
+
+                    if ( ret !== undefined ) {
+                        if ( (event.result = ret) === false ) {
+                            event.preventDefault();
+                            event.stopPropagation();
+                        }
+                    }
+                }
+            }
+        }
+
+        // Call the postDispatch hook for the mapped type
+        if ( special.postDispatch ) {
+            special.postDispatch.call( this, event );
+        }
+
+        return event.result;
+    },
+
+    handlers: function( event, handlers ) {
+        var i, matches, sel, handleObj,
+            handlerQueue = [],
+            delegateCount = handlers.delegateCount,
+            cur = event.target;
+
+        // Find delegate handlers
+        // Black-hole SVG <use> instance trees (#13180)
+        // Avoid non-left-click bubbling in Firefox (#3861)
+        if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+
+            for ( ; cur != this; cur = cur.parentNode || this ) {
+
+                // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+                if ( cur.disabled !== true || event.type !== "click" ) {
+                    matches = [];
+                    for ( i = 0; i < delegateCount; i++ ) {
+                        handleObj = handlers[ i ];
+
+                        // Don't conflict with Object.prototype properties (#13203)
+                        sel = handleObj.selector + " ";
+
+                        if ( matches[ sel ] === undefined ) {
+                            matches[ sel ] = handleObj.needsContext ?
+                                jQuery( sel, this ).index( cur ) >= 0 :
+                                jQuery.find( sel, this, null, [ cur ] ).length;
+                        }
+                        if ( matches[ sel ] ) {
+                            matches.push( handleObj );
+                        }
+                    }
+                    if ( matches.length ) {
+                        handlerQueue.push({ elem: cur, handlers: matches });
+                    }
+                }
+            }
+        }
+
+        // Add the remaining (directly-bound) handlers
+        if ( delegateCount < handlers.length ) {
+            handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
+        }
+
+        return handlerQueue;
+    },
+
+    fix: function( event ) {
+        if ( event[ jQuery.expando ] ) {
+            return event;
+        }
+
+        // Create a writable copy of the event object and normalize some properties
+        var i, prop,
+            originalEvent = event,
+            fixHook = jQuery.event.fixHooks[ event.type ] || {},
+            copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+        event = new jQuery.Event( originalEvent );
+
+        i = copy.length;
+        while ( i-- ) {
+            prop = copy[ i ];
+            event[ prop ] = originalEvent[ prop ];
+        }
+
+        // Support: IE<9
+        // Fix target property (#1925)
+        if ( !event.target ) {
+            event.target = originalEvent.srcElement || document;
+        }
+
+        // Support: Chrome 23+, Safari?
+        // Target should not be a text node (#504, #13143)
+        if ( event.target.nodeType === 3 ) {
+            event.target = event.target.parentNode;
+        }
+
+        // Support: IE<9
+        // For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+        event.metaKey = !!event.metaKey;
+
+        return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
+    },
+
+    // Includes some event props shared by KeyEvent and MouseEvent
+    props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+    fixHooks: {},
+
+    keyHooks: {
+        props: "char charCode key keyCode".split(" "),
+        filter: function( event, original ) {
+
+            // Add which for key events
+            if ( event.which == null ) {
+                event.which = original.charCode != null ? original.charCode : original.keyCode;
+            }
+
+            return event;
+        }
+    },
+
+    mouseHooks: {
+        props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+        filter: function( event, original ) {
+            var eventDoc, doc, body,
+                button = original.button,
+                fromElement = original.fromElement;
+
+            // Calculate pageX/Y if missing and clientX/Y available
+            if ( event.pageX == null && original.clientX != null ) {
+                eventDoc = event.target.ownerDocument || document;
+                doc = eventDoc.documentElement;
+                body = eventDoc.body;
+
+                event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+                event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+            }
+
+            // Add relatedTarget, if necessary
+            if ( !event.relatedTarget && fromElement ) {
+                event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+            }
+
+            // Add which for click: 1 === left; 2 === middle; 3 === right
+            // Note: button is not normalized, so don't use it
+            if ( !event.which && button !== undefined ) {
+                event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+            }
+
+            return event;
+        }
+    },
+
+    special: {
+        load: {
+            // Prevent triggered image.load events from bubbling to window.load
+            noBubble: true
+        },
+        click: {
+            // For checkbox, fire native event so checked state will be right
+            trigger: function() {
+                if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
+                    this.click();
+                    return false;
+                }
+            }
+        },
+        focus: {
+            // Fire native event if possible so blur/focus sequence is correct
+            trigger: function() {
+                if ( this !== document.activeElement && this.focus ) {
+                    try {
+                        this.focus();
+                        return false;
+                    } catch ( e ) {
+                        // Support: IE<9
+                        // If we error on focus to hidden element (#1486, #12518),
+                        // let .trigger() run the handlers
+                    }
+                }
+            },
+            delegateType: "focusin"
+        },
+        blur: {
+            trigger: function() {
+                if ( this === document.activeElement && this.blur ) {
+                    this.blur();
+                    return false;
+                }
+            },
+            delegateType: "focusout"
+        },
+
+        beforeunload: {
+            postDispatch: function( event ) {
+
+                // Even when returnValue equals to undefined Firefox will still show alert
+                if ( event.result !== undefined ) {
+                    event.originalEvent.returnValue = event.result;
+                }
+            }
+        }
+    },
+
+    simulate: function( type, elem, event, bubble ) {
+        // Piggyback on a donor event to simulate a different one.
+        // Fake originalEvent to avoid donor's stopPropagation, but if the
+        // simulated event prevents default then we do the same on the donor.
+        var e = jQuery.extend(
+            new jQuery.Event(),
+            event,
+            { type: type,
+                isSimulated: true,
+                originalEvent: {}
+            }
+        );
+        if ( bubble ) {
+            jQuery.event.trigger( e, null, elem );
+        } else {
+            jQuery.event.dispatch.call( elem, e );
+        }
+        if ( e.isDefaultPrevented() ) {
+            event.preventDefault();
+        }
+    }
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+    function( elem, type, handle ) {
+        if ( elem.removeEventListener ) {
+            elem.removeEventListener( type, handle, false );
+        }
+    } :
+    function( elem, type, handle ) {
+        var name = "on" + type;
+
+        if ( elem.detachEvent ) {
+
+            // #8545, #7054, preventing memory leaks for custom events in IE6-8
+            // detachEvent needed property on element, by name of that event, to properly expose it to GC
+            if ( typeof elem[ name ] === "undefined" ) {
+                elem[ name ] = null;
+            }
+
+            elem.detachEvent( name, handle );
+        }
+    };
+
+jQuery.Event = function( src, props ) {
+    // Allow instantiation without the 'new' keyword
+    if ( !(this instanceof jQuery.Event) ) {
+        return new jQuery.Event( src, props );
+    }
+
+    // Event object
+    if ( src && src.type ) {
+        this.originalEvent = src;
+        this.type = src.type;
+
+        // Events bubbling up the document may have been marked as prevented
+        // by a handler lower down the tree; reflect the correct value.
+        this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
+            src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+
+    // Event type
+    } else {
+        this.type = src;
+    }
+
+    // Put explicitly provided properties onto the event object
+    if ( props ) {
+        jQuery.extend( this, props );
+    }
+
+    // Create a timestamp if incoming event doesn't have one
+    this.timeStamp = src && src.timeStamp || jQuery.now();
+
+    // Mark it as fixed
+    this[ jQuery.expando ] = true;
+};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+    isDefaultPrevented: returnFalse,
+    isPropagationStopped: returnFalse,
+    isImmediatePropagationStopped: returnFalse,
+
+    preventDefault: function() {
+        var e = this.originalEvent;
+
+        this.isDefaultPrevented = returnTrue;
+        if ( !e ) {
+            return;
+        }
+
+        // If preventDefault exists, run it on the original event
+        if ( e.preventDefault ) {
+            e.preventDefault();
+
+        // Support: IE
+        // Otherwise set the returnValue property of the original event to false
+        } else {
+            e.returnValue = false;
+        }
+    },
+    stopPropagation: function() {
+        var e = this.originalEvent;
+
+        this.isPropagationStopped = returnTrue;
+        if ( !e ) {
+            return;
+        }
+        // If stopPropagation exists, run it on the original event
+        if ( e.stopPropagation ) {
+            e.stopPropagation();
+        }
+
+        // Support: IE
+        // Set the cancelBubble property of the original event to true
+        e.cancelBubble = true;
+    },
+    stopImmediatePropagation: function() {
+        this.isImmediatePropagationStopped = returnTrue;
+        this.stopPropagation();
+    }
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+    mouseenter: "mouseover",
+    mouseleave: "mouseout"
+}, function( orig, fix ) {
+    jQuery.event.special[ orig ] = {
+        delegateType: fix,
+        bindType: fix,
+
+        handle: function( event ) {
+            var ret,
+                target = this,
+                related = event.relatedTarget,
+                handleObj = event.handleObj;
+
+            // For mousenter/leave call the handler if related is outside the target.
+            // NB: No relatedTarget if the mouse left/entered the browser window
+            if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+                event.type = handleObj.origType;
+                ret = handleObj.handler.apply( this, arguments );
+                event.type = fix;
+            }
+            return ret;
+        }
+    };
+});
+
+// IE submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+    jQuery.event.special.submit = {
+        setup: function() {
+            // Only need this for delegated form submit events
+            if ( jQuery.nodeName( this, "form" ) ) {
+                return false;
+            }
+
+            // Lazy-add a submit handler when a descendant form may potentially be submitted
+            jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+                // Node name check avoids a VML-related crash in IE (#9807)
+                var elem = e.target,
+                    form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+                if ( form && !jQuery._data( form, "submitBubbles" ) ) {
+                    jQuery.event.add( form, "submit._submit", function( event ) {
+                        event._submit_bubble = true;
+                    });
+                    jQuery._data( form, "submitBubbles", true );
+                }
+            });
+            // return undefined since we don't need an event listener
+        },
+
+        postDispatch: function( event ) {
+            // If form was submitted by the user, bubble the event up the tree
+            if ( event._submit_bubble ) {
+                delete event._submit_bubble;
+                if ( this.parentNode && !event.isTrigger ) {
+                    jQuery.event.simulate( "submit", this.parentNode, event, true );
+                }
+            }
+        },
+
+        teardown: function() {
+            // Only need this for delegated form submit events
+            if ( jQuery.nodeName( this, "form" ) ) {
+                return false;
+            }
+
+            // Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+            jQuery.event.remove( this, "._submit" );
+        }
+    };
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !jQuery.support.changeBubbles ) {
+
+    jQuery.event.special.change = {
+
+        setup: function() {
+
+            if ( rformElems.test( this.nodeName ) ) {
+                // IE doesn't fire change on a check/radio until blur; trigger it on click
+                // after a propertychange. Eat the blur-change in special.change.handle.
+                // This still fires onchange a second time for check/radio after blur.
+                if ( this.type === "checkbox" || this.type === "radio" ) {
+                    jQuery.event.add( this, "propertychange._change", function( event ) {
+                        if ( event.originalEvent.propertyName === "checked" ) {
+                            this._just_changed = true;
+                        }
+                    });
+                    jQuery.event.add( this, "click._change", function( event ) {
+                        if ( this._just_changed && !event.isTrigger ) {
+                            this._just_changed = false;
+                        }
+                        // Allow triggered, simulated change events (#11500)
+                        jQuery.event.simulate( "change", this, event, true );
+                    });
+                }
+                return false;
+            }
+            // Delegated event; lazy-add a change handler on descendant inputs
+            jQuery.event.add( this, "beforeactivate._change", function( e ) {
+                var elem = e.target;
+
+                if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
+                    jQuery.event.add( elem, "change._change", function( event ) {
+                        if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+                            jQuery.event.simulate( "change", this.parentNode, event, true );
+                        }
+                    });
+                    jQuery._data( elem, "changeBubbles", true );
+                }
+            });
+        },
+
+        handle: function( event ) {
+            var elem = event.target;
+
+            // Swallow native change events from checkbox/radio, we already triggered them above
+            if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+                return event.handleObj.handler.apply( this, arguments );
+            }
+        },
+
+        teardown: function() {
+            jQuery.event.remove( this, "._change" );
+
+            return !rformElems.test( this.nodeName );
+        }
+    };
+}
+
+// Create "bubbling" focus and blur events
+if ( !jQuery.support.focusinBubbles ) {
+    jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+        // Attach a single capturing handler while someone wants focusin/focusout
+        var attaches = 0,
+            handler = function( event ) {
+                jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+            };
+
+        jQuery.event.special[ fix ] = {
+            setup: function() {
+                if ( attaches++ === 0 ) {
+                    document.addEventListener( orig, handler, true );
+                }
+            },
+            teardown: function() {
+                if ( --attaches === 0 ) {
+                    document.removeEventListener( orig, handler, true );
+                }
+            }
+        };
+    });
+}
+
+jQuery.fn.extend({
+
+    on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+        var origFn, type;
+
+        // Types can be a map of types/handlers
+        if ( typeof types === "object" ) {
+            // ( types-Object, selector, data )
+            if ( typeof selector !== "string" ) {
+                // ( types-Object, data )
+                data = data || selector;
+                selector = undefined;
+            }
+            for ( type in types ) {
+                this.on( type, selector, data, types[ type ], one );
+            }
+            return this;
+        }
+
+        if ( data == null && fn == null ) {
+            // ( types, fn )
+            fn = selector;
+            data = selector = undefined;
+        } else if ( fn == null ) {
+            if ( typeof selector === "string" ) {
+                // ( types, selector, fn )
+                fn = data;
+                data = undefined;
+            } else {
+                // ( types, data, fn )
+                fn = data;
+                data = selector;
+                selector = undefined;
+            }
+        }
+        if ( fn === false ) {
+            fn = returnFalse;
+        } else if ( !fn ) {
+            return this;
+        }
+
+        if ( one === 1 ) {
+            origFn = fn;
+            fn = function( event ) {
+                // Can use an empty set, since event contains the info
+                jQuery().off( event );
+                return origFn.apply( this, arguments );
+            };
+            // Use same guid so caller can remove using origFn
+            fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+        }
+        return this.each( function() {
+            jQuery.event.add( this, types, fn, data, selector );
+        });
+    },
+    one: function( types, selector, data, fn ) {
+        return this.on( types, selector, data, fn, 1 );
+    },
+    off: function( types, selector, fn ) {
+        var handleObj, type;
+        if ( types && types.preventDefault && types.handleObj ) {
+            // ( event )  dispatched jQuery.Event
+            handleObj = types.handleObj;
+            jQuery( types.delegateTarget ).off(
+                handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+                handleObj.selector,
+                handleObj.handler
+            );
+            return this;
+        }
+        if ( typeof types === "object" ) {
+            // ( types-object [, selector] )
+            for ( type in types ) {
+                this.off( type, selector, types[ type ] );
+            }
+            return this;
+        }
+        if ( selector === false || typeof selector === "function" ) {
+            // ( types [, fn] )
+            fn = selector;
+            selector = undefined;
+        }
+        if ( fn === false ) {
+            fn = returnFalse;
+        }
+        return this.each(function() {
+            jQuery.event.remove( this, types, fn, selector );
+        });
+    },
+
+    bind: function( types, data, fn ) {
+        return this.on( types, null, data, fn );
+    },
+    unbind: function( types, fn ) {
+        return this.off( types, null, fn );
+    },
+
+    delegate: function( selector, types, data, fn ) {
+        return this.on( types, selector, data, fn );
+    },
+    undelegate: function( selector, types, fn ) {
+        // ( namespace ) or ( selector, types [, fn] )
+        return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
+    },
+
+    trigger: function( type, data ) {
+        return this.each(function() {
+            jQuery.event.trigger( type, data, this );
+        });
+    },
+    triggerHandler: function( type, data ) {
+        var elem = this[0];
+        if ( elem ) {
+            return jQuery.event.trigger( type, data, elem, true );
+        }
+    },
+
+    hover: function( fnOver, fnOut ) {
+        return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+    }
+});
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+    "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+    "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+    // Handle event binding
+    jQuery.fn[ name ] = function( data, fn ) {
+        return arguments.length > 0 ?
+            this.on( name, null, data, fn ) :
+            this.trigger( name );
+    };
+
+    if ( rkeyEvent.test( name ) ) {
+        jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
+    }
+
+    if ( rmouseEvent.test( name ) ) {
+        jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
+    }
+});
+/*!
+ * Sizzle CSS Selector Engine
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://sizzlejs.com/
+ */
+(function( window, undefined ) {
+
+var i,
+    cachedruns,
+    Expr,
+    getText,
+    isXML,
+    compile,
+    hasDuplicate,
+    outermostContext,
+
+    // Local document vars
+    setDocument,
+    document,
+    docElem,
+    documentIsXML,
+    rbuggyQSA,
+    rbuggyMatches,
+    matches,
+    contains,
+    sortOrder,
+
+    // Instance-specific data
+    expando = "sizzle" + -(new Date()),
+    preferredDoc = window.document,
+    support = {},
+    dirruns = 0,
+    done = 0,
+    classCache = createCache(),
+    tokenCache = createCache(),
+    compilerCache = createCache(),
+
+    // General-purpose constants
+    strundefined = typeof undefined,
+    MAX_NEGATIVE = 1 << 31,
+
+    // Array methods
+    arr = [],
+    pop = arr.pop,
+    push = arr.push,
+    slice = arr.slice,
+    // Use a stripped-down indexOf if we can't use a native one
+    indexOf = arr.indexOf || function( elem ) {
+        var i = 0,
+            len = this.length;
+        for ( ; i < len; i++ ) {
+            if ( this[i] === elem ) {
+                return i;
+            }
+        }
+        return -1;
+    },
+
+
+    // Regular expressions
+
+    // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+    whitespace = "[\\x20\\t\\r\\n\\f]",
+    // http://www.w3.org/TR/css3-syntax/#characters
+    characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+    // Loosely modeled on CSS identifier characters
+    // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+    // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+    identifier = characterEncoding.replace( "w", "w#" ),
+
+    // Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
+    operators = "([*^$|!~]?=)",
+    attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
+        "*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
+
+    // Prefer arguments quoted,
+    //   then not containing pseudos/brackets,
+    //   then attribute selectors/non-parenthetical expressions,
+    //   then anything else
+    // These preferences are here to reduce the number of selectors
+    //   needing tokenize in the PSEUDO preFilter
+    pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
+
+    // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+    rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+
+    rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
+    rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
+    rpseudo = new RegExp( pseudos ),
+    ridentifier = new RegExp( "^" + identifier + "$" ),
+
+    matchExpr = {
+        "ID": new RegExp( "^#(" + characterEncoding + ")" ),
+        "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
+        "NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
+        "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
+        "ATTR": new RegExp( "^" + attributes ),
+        "PSEUDO": new RegExp( "^" + pseudos ),
+        "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+            "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+            "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+        // For use in libraries implementing .is()
+        // We use this for POS matching in `select`
+        "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+            whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+    },
+
+    rsibling = /[\x20\t\r\n\f]*[+~]/,
+
+    rnative = /\{\s*\[native code\]\s*\}/,
+
+    // Easily-parseable/retrievable ID or TAG or CLASS selectors
+    rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+    rinputs = /^(?:input|select|textarea|button)$/i,
+    rheader = /^h\d$/i,
+
+    rescape = /'|\\/g,
+    rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
+
+    // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+    runescape = /\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,
+    funescape = function( _, escaped ) {
+        var high = "0x" + escaped - 0x10000;
+        // NaN means non-codepoint
+        return high !== high ?
+            escaped :
+            // BMP codepoint
+            high < 0 ?
+                String.fromCharCode( high + 0x10000 ) :
+                // Supplemental Plane codepoint (surrogate pair)
+                String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
+    };
+
+// Use a stripped-down slice if we can't use a native one
+try {
+    slice.call( docElem.childNodes, 0 )[0].nodeType;
+} catch ( e ) {
+    slice = function( i ) {
+        var elem,
+            results = [];
+        for ( ; (elem = this[i]); i++ ) {
+            results.push( elem );
+        }
+        return results;
+    };
+}
+
+/**
+ * For feature detection
+ * @param {Function} fn The function to test for native support
+ */
+function isNative( fn ) {
+    return rnative.test( fn + "" );
+}
+
+/**
+ * Create key-value caches of limited size
+ * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+ *  property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+ *  deleting the oldest entry
+ */
+function createCache() {
+    var cache,
+        keys = [];
+
+    return (cache = function( key, value ) {
+        // Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+        if ( keys.push( key += " " ) > Expr.cacheLength ) {
+            // Only keep the most recent entries
+            delete cache[ keys.shift() ];
+        }
+        return (cache[ key ] = value);
+    });
+}
+
+/**
+ * Mark a function for special use by Sizzle
+ * @param {Function} fn The function to mark
+ */
+function markFunction( fn ) {
+    fn[ expando ] = true;
+    return fn;
+}
+
+/**
+ * Support testing using an element
+ * @param {Function} fn Passed the created div and expects a boolean result
+ */
+function assert( fn ) {
+    var div = document.createElement("div");
+
+    try {
+        return fn( div );
+    } catch (e) {
+        return false;
+    } finally {
+        // release memory in IE
+        div = null;
+    }
+}
+
+function Sizzle( selector, context, results, seed ) {
+    var match, elem, m, nodeType,
+        // QSA vars
+        i, groups, old, nid, newContext, newSelector;
+
+    if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
+        setDocument( context );
+    }
+
+    context = context || document;
+    results = results || [];
+
+    if ( !selector || typeof selector !== "string" ) {
+        return results;
+    }
+
+    if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
+        return [];
+    }
+
+    if ( !documentIsXML && !seed ) {
+
+        // Shortcuts
+        if ( (match = rquickExpr.exec( selector )) ) {
+            // Speed-up: Sizzle("#ID")
+            if ( (m = match[1]) ) {
+                if ( nodeType === 9 ) {
+                    elem = context.getElementById( m );
+                    // Check parentNode to catch when Blackberry 4.6 returns
+                    // nodes that are no longer in the document #6963
+                    if ( elem && elem.parentNode ) {
+                        // Handle the case where IE, Opera, and Webkit return items
+                        // by name instead of ID
+                        if ( elem.id === m ) {
+                            results.push( elem );
+                            return results;
+                        }
+                    } else {
+                        return results;
+                    }
+                } else {
+                    // Context is not a document
+                    if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
+                        contains( context, elem ) && elem.id === m ) {
+                        results.push( elem );
+                        return results;
+                    }
+                }
+
+            // Speed-up: Sizzle("TAG")
+            } else if ( match[2] ) {
+                push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
+                return results;
+
+            // Speed-up: Sizzle(".CLASS")
+            } else if ( (m = match[3]) && support.getByClassName && context.getElementsByClassName ) {
+                push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
+                return results;
+            }
+        }
+
+        // QSA path
+        if ( support.qsa && !rbuggyQSA.test(selector) ) {
+            old = true;
+            nid = expando;
+            newContext = context;
+            newSelector = nodeType === 9 && selector;
+
+            // qSA works strangely on Element-rooted queries
+            // We can work around this by specifying an extra ID on the root
+            // and working up from there (Thanks to Andrew Dupont for the technique)
+            // IE 8 doesn't work on object elements
+            if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+                groups = tokenize( selector );
+
+                if ( (old = context.getAttribute("id")) ) {
+                    nid = old.replace( rescape, "\\$&" );
+                } else {
+                    context.setAttribute( "id", nid );
+                }
+                nid = "[id='" + nid + "'] ";
+
+                i = groups.length;
+                while ( i-- ) {
+                    groups[i] = nid + toSelector( groups[i] );
+                }
+                newContext = rsibling.test( selector ) && context.parentNode || context;
+                newSelector = groups.join(",");
+            }
+
+            if ( newSelector ) {
+                try {
+                    push.apply( results, slice.call( newContext.querySelectorAll(
+                        newSelector
+                    ), 0 ) );
+                    return results;
+                } catch(qsaError) {
+                } finally {
+                    if ( !old ) {
+                        context.removeAttribute("id");
+                    }
+                }
+            }
+        }
+    }
+
+    // All others
+    return select( selector.replace( rtrim, "$1" ), context, results, seed );
+}
+
+/**
+ * Detect xml
+ * @param {Element|Object} elem An element or a document
+ */
+isXML = Sizzle.isXML = function( elem ) {
+    // documentElement is verified for cases where it doesn't yet exist
+    // (such as loading iframes in IE - #4833)
+    var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+    return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+/**
+ * Sets document-related variables once based on the current document
+ * @param {Element|Object} [doc] An element or document object to use to set the document
+ * @returns {Object} Returns the current document
+ */
+setDocument = Sizzle.setDocument = function( node ) {
+    var doc = node ? node.ownerDocument || node : preferredDoc;
+
+    // If no document and documentElement is available, return
+    if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+        return document;
+    }
+
+    // Set our document
+    document = doc;
+    docElem = doc.documentElement;
+
+    // Support tests
+    documentIsXML = isXML( doc );
+
+    // Check if getElementsByTagName("*") returns only elements
+    support.tagNameNoComments = assert(function( div ) {
+        div.appendChild( doc.createComment("") );
+        return !div.getElementsByTagName("*").length;
+    });
+
+    // Check if attributes should be retrieved by attribute nodes
+    support.attributes = assert(function( div ) {
+        div.innerHTML = "<select></select>";
+        var type = typeof div.lastChild.getAttribute("multiple");
+        // IE8 returns a string for some attributes even when not present
+        return type !== "boolean" && type !== "string";
+    });
+
+    // Check if getElementsByClassName can be trusted
+    support.getByClassName = assert(function( div ) {
+        // Opera can't find a second classname (in 9.6)
+        div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
+        if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
+            return false;
+        }
+
+        // Safari 3.2 caches class attributes and doesn't catch changes
+        div.lastChild.className = "e";
+        return div.getElementsByClassName("e").length === 2;
+    });
+
+    // Check if getElementById returns elements by name
+    // Check if getElementsByName privileges form controls or returns elements by ID
+    support.getByName = assert(function( div ) {
+        // Inject content
+        div.id = expando + 0;
+        div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
+        docElem.insertBefore( div, docElem.firstChild );
+
+        // Test
+        var pass = doc.getElementsByName &&
+            // buggy browsers will return fewer than the correct 2
+            doc.getElementsByName( expando ).length === 2 +
+            // buggy browsers will return more than the correct 0
+            doc.getElementsByName( expando + 0 ).length;
+        support.getIdNotName = !doc.getElementById( expando );
+
+        // Cleanup
+        docElem.removeChild( div );
+
+        return pass;
+    });
+
+    // IE6/7 return modified attributes
+    Expr.attrHandle = assert(function( div ) {
+        div.innerHTML = "<a href='#'></a>";
+        return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
+            div.firstChild.getAttribute("href") === "#";
+    }) ?
+        {} :
+        {
+            "href": function( elem ) {
+                return elem.getAttribute( "href", 2 );
+            },
+            "type": function( elem ) {
+                return elem.getAttribute("type");
+            }
+        };
+
+    // ID find and filter
+    if ( support.getIdNotName ) {
+        Expr.find["ID"] = function( id, context ) {
+            if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
+                var m = context.getElementById( id );
+                // Check parentNode to catch when Blackberry 4.6 returns
+                // nodes that are no longer in the document #6963
+                return m && m.parentNode ? [m] : [];
+            }
+        };
+        Expr.filter["ID"] = function( id ) {
+            var attrId = id.replace( runescape, funescape );
+            return function( elem ) {
+                return elem.getAttribute("id") === attrId;
+            };
+        };
+    } else {
+        Expr.find["ID"] = function( id, context ) {
+            if ( typeof context.getElementById !== strundefined && !documentIsXML ) {
+                var m = context.getElementById( id );
+
+                return m ?
+                    m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
+                        [m] :
+                        undefined :
+                    [];
+            }
+        };
+        Expr.filter["ID"] =  function( id ) {
+            var attrId = id.replace( runescape, funescape );
+            return function( elem ) {
+                var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+                return node && node.value === attrId;
+            };
+        };
+    }
+
+    // Tag
+    Expr.find["TAG"] = support.tagNameNoComments ?
+        function( tag, context ) {
+            if ( typeof context.getElementsByTagName !== strundefined ) {
+                return context.getElementsByTagName( tag );
+            }
+        } :
+        function( tag, context ) {
+            var elem,
+                tmp = [],
+                i = 0,
+                results = context.getElementsByTagName( tag );
+
+            // Filter out possible comments
+            if ( tag === "*" ) {
+                for ( ; (elem = results[i]); i++ ) {
+                    if ( elem.nodeType === 1 ) {
+                        tmp.push( elem );
+                    }
+                }
+
+                return tmp;
+            }
+            return results;
+        };
+
+    // Name
+    Expr.find["NAME"] = support.getByName && function( tag, context ) {
+        if ( typeof context.getElementsByName !== strundefined ) {
+            return context.getElementsByName( name );
+        }
+    };
+
+    // Class
+    Expr.find["CLASS"] = support.getByClassName && function( className, context ) {
+        if ( typeof context.getElementsByClassName !== strundefined && !documentIsXML ) {
+            return context.getElementsByClassName( className );
+        }
+    };
+
+    // QSA and matchesSelector support
+
+    // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+    rbuggyMatches = [];
+
+    // qSa(:focus) reports false when true (Chrome 21),
+    // no need to also add to buggyMatches since matches checks buggyQSA
+    // A support test would require too much code (would include document ready)
+    rbuggyQSA = [ ":focus" ];
+
+    if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
+        // Build QSA regex
+        // Regex strategy adopted from Diego Perini
+        assert(function( div ) {
+            // Select is set to empty string on purpose
+            // This is to test IE's treatment of not explictly
+            // setting a boolean content attribute,
+            // since its presence should be enough
+            // http://bugs.jquery.com/ticket/12359
+            div.innerHTML = "<select><option selected=''></option></select>";
+
+            // IE8 - Some boolean attributes are not treated correctly
+            if ( !div.querySelectorAll("[selected]").length ) {
+                rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
+            }
+
+            // Webkit/Opera - :checked should return selected option elements
+            // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+            // IE8 throws error here and will not see later tests
+            if ( !div.querySelectorAll(":checked").length ) {
+                rbuggyQSA.push(":checked");
+            }
+        });
+
+        assert(function( div ) {
+
+            // Opera 10-12/IE8 - ^= $= *= and empty values
+            // Should not select anything
+            div.innerHTML = "<input type='hidden' i=''/>";
+            if ( div.querySelectorAll("[i^='']").length ) {
+                rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
+            }
+
+            // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+            // IE8 throws error here and will not see later tests
+            if ( !div.querySelectorAll(":enabled").length ) {
+                rbuggyQSA.push( ":enabled", ":disabled" );
+            }
+
+            // Opera 10-11 does not throw on post-comma invalid pseudos
+            div.querySelectorAll("*,:x");
+            rbuggyQSA.push(",.*:");
+        });
+    }
+
+    if ( (support.matchesSelector = isNative( (matches = docElem.matchesSelector ||
+        docElem.mozMatchesSelector ||
+        docElem.webkitMatchesSelector ||
+        docElem.oMatchesSelector ||
+        docElem.msMatchesSelector) )) ) {
+
+        assert(function( div ) {
+            // Check to see if it's possible to do matchesSelector
+            // on a disconnected node (IE 9)
+            support.disconnectedMatch = matches.call( div, "div" );
+
+            // This should fail with an exception
+            // Gecko does not error, returns false instead
+            matches.call( div, "[s!='']:x" );
+            rbuggyMatches.push( "!=", pseudos );
+        });
+    }
+
+    rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
+    rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
+
+    // Element contains another
+    // Purposefully does not implement inclusive descendent
+    // As in, an element does not contain itself
+    contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
+        function( a, b ) {
+            var adown = a.nodeType === 9 ? a.documentElement : a,
+                bup = b && b.parentNode;
+            return a === bup || !!( bup && bup.nodeType === 1 && (
+                adown.contains ?
+                    adown.contains( bup ) :
+                    a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
+            ));
+        } :
+        function( a, b ) {
+            if ( b ) {
+                while ( (b = b.parentNode) ) {
+                    if ( b === a ) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        };
+
+    // Document order sorting
+    sortOrder = docElem.compareDocumentPosition ?
+    function( a, b ) {
+        var compare;
+
+        if ( a === b ) {
+            hasDuplicate = true;
+            return 0;
+        }
+
+        if ( (compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b )) ) {
+            if ( compare & 1 || a.parentNode && a.parentNode.nodeType === 11 ) {
+                if ( a === doc || contains( preferredDoc, a ) ) {
+                    return -1;
+                }
+                if ( b === doc || contains( preferredDoc, b ) ) {
+                    return 1;
+                }
+                return 0;
+            }
+            return compare & 4 ? -1 : 1;
+        }
+
+        return a.compareDocumentPosition ? -1 : 1;
+    } :
+    function( a, b ) {
+        var cur,
+            i = 0,
+            aup = a.parentNode,
+            bup = b.parentNode,
+            ap = [ a ],
+            bp = [ b ];
+
+        // The nodes are identical, we can exit early
+        if ( a === b ) {
+            hasDuplicate = true;
+            return 0;
+
+        // Fallback to using sourceIndex (in IE) if it's available on both nodes
+        } else if ( a.sourceIndex && b.sourceIndex ) {
+            return ( ~b.sourceIndex || MAX_NEGATIVE ) - ( contains( preferredDoc, a ) && ~a.sourceIndex || MAX_NEGATIVE );
+
+        // Parentless nodes are either documents or disconnected
+        } else if ( !aup || !bup ) {
+            return a === doc ? -1 :
+                b === doc ? 1 :
+                aup ? -1 :
+                bup ? 1 :
+                0;
+
+        // If the nodes are siblings, we can do a quick check
+        } else if ( aup === bup ) {
+            return siblingCheck( a, b );
+        }
+
+        // Otherwise we need full lists of their ancestors for comparison
+        cur = a;
+        while ( (cur = cur.parentNode) ) {
+            ap.unshift( cur );
+        }
+        cur = b;
+        while ( (cur = cur.parentNode) ) {
+            bp.unshift( cur );
+        }
+
+        // Walk down the tree looking for a discrepancy
+        while ( ap[i] === bp[i] ) {
+            i++;
+        }
+
+        return i ?
+            // Do a sibling check if the nodes have a common ancestor
+            siblingCheck( ap[i], bp[i] ) :
+
+            // Otherwise nodes in our document sort first
+            ap[i] === preferredDoc ? -1 :
+            bp[i] === preferredDoc ? 1 :
+            0;
+    };
+
+    // Always assume the presence of duplicates if sort doesn't
+    // pass them to our comparison function (as in Google Chrome).
+    hasDuplicate = false;
+    [0, 0].sort( sortOrder );
+    support.detectDuplicates = hasDuplicate;
+
+    return document;
+};
+
+Sizzle.matches = function( expr, elements ) {
+    return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+    // Set document vars if needed
+    if ( ( elem.ownerDocument || elem ) !== document ) {
+        setDocument( elem );
+    }
+
+    // Make sure that attribute selectors are quoted
+    expr = expr.replace( rattributeQuotes, "='$1']" );
+
+    // rbuggyQSA always contains :focus, so no need for an existence check
+    if ( support.matchesSelector && !documentIsXML && (!rbuggyMatches || !rbuggyMatches.test(expr)) && !rbuggyQSA.test(expr) ) {
+        try {
+            var ret = matches.call( elem, expr );
+
+            // IE 9's matchesSelector returns false on disconnected nodes
+            if ( ret || support.disconnectedMatch ||
+                    // As well, disconnected nodes are said to be in a document
+                    // fragment in IE 9
+                    elem.document && elem.document.nodeType !== 11 ) {
+                return ret;
+            }
+        } catch(e) {}
+    }
+
+    return Sizzle( expr, document, null, [elem] ).length > 0;
+};
+
+Sizzle.contains = function( context, elem ) {
+    // Set document vars if needed
+    if ( ( context.ownerDocument || context ) !== document ) {
+        setDocument( context );
+    }
+    return contains( context, elem );
+};
+
+Sizzle.attr = function( elem, name ) {
+    var val;
+
+    // Set document vars if needed
+    if ( ( elem.ownerDocument || elem ) !== document ) {
+        setDocument( elem );
+    }
+
+    if ( !documentIsXML ) {
+        name = name.toLowerCase();
+    }
+    if ( (val = Expr.attrHandle[ name ]) ) {
+        return val( elem );
+    }
+    if ( documentIsXML || support.attributes ) {
+        return elem.getAttribute( name );
+    }
+    return ( (val = elem.getAttributeNode( name )) || elem.getAttribute( name ) ) && elem[ name ] === true ?
+        name :
+        val && val.specified ? val.value : null;
+};
+
+Sizzle.error = function( msg ) {
+    throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+// Document sorting and removing duplicates
+Sizzle.uniqueSort = function( results ) {
+    var elem,
+        duplicates = [],
+        i = 1,
+        j = 0;
+
+    // Unless we *know* we can detect duplicates, assume their presence
+    hasDuplicate = !support.detectDuplicates;
+    results.sort( sortOrder );
+
+    if ( hasDuplicate ) {
+        for ( ; (elem = results[i]); i++ ) {
+            if ( elem === results[ i - 1 ] ) {
+                j = duplicates.push( i );
+            }
+        }
+        while ( j-- ) {
+            results.splice( duplicates[ j ], 1 );
+        }
+    }
+
+    return results;
+};
+
+function siblingCheck( a, b ) {
+    var cur = a && b && a.nextSibling;
+
+    for ( ; cur; cur = cur.nextSibling ) {
+        if ( cur === b ) {
+            return -1;
+        }
+    }
+
+    return a ? 1 : -1;
+}
+
+// Returns a function to use in pseudos for input types
+function createInputPseudo( type ) {
+    return function( elem ) {
+        var name = elem.nodeName.toLowerCase();
+        return name === "input" && elem.type === type;
+    };
+}
+
+// Returns a function to use in pseudos for buttons
+function createButtonPseudo( type ) {
+    return function( elem ) {
+        var name = elem.nodeName.toLowerCase();
+        return (name === "input" || name === "button") && elem.type === type;
+    };
+}
+
+// Returns a function to use in pseudos for positionals
+function createPositionalPseudo( fn ) {
+    return markFunction(function( argument ) {
+        argument = +argument;
+        return markFunction(function( seed, matches ) {
+            var j,
+                matchIndexes = fn( [], seed.length, argument ),
+                i = matchIndexes.length;
+
+            // Match elements found at the specified indexes
+            while ( i-- ) {
+                if ( seed[ (j = matchIndexes[i]) ] ) {
+                    seed[j] = !(matches[j] = seed[j]);
+                }
+            }
+        });
+    });
+}
+
+/**
+ * Utility function for retrieving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+getText = Sizzle.getText = function( elem ) {
+    var node,
+        ret = "",
+        i = 0,
+        nodeType = elem.nodeType;
+
+    if ( !nodeType ) {
+        // If no nodeType, this is expected to be an array
+        for ( ; (node = elem[i]); i++ ) {
+            // Do not traverse comment nodes
+            ret += getText( node );
+        }
+    } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+        // Use textContent for elements
+        // innerText usage removed for consistency of new lines (see #11153)
+        if ( typeof elem.textContent === "string" ) {
+            return elem.textContent;
+        } else {
+            // Traverse its children
+            for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+                ret += getText( elem );
+            }
+        }
+    } else if ( nodeType === 3 || nodeType === 4 ) {
+        return elem.nodeValue;
+    }
+    // Do not include comment or processing instruction nodes
+
+    return ret;
+};
+
+Expr = Sizzle.selectors = {
+
+    // Can be adjusted by the user
+    cacheLength: 50,
+
+    createPseudo: markFunction,
+
+    match: matchExpr,
+
+    find: {},
+
+    relative: {
+        ">": { dir: "parentNode", first: true },
+        " ": { dir: "parentNode" },
+        "+": { dir: "previousSibling", first: true },
+        "~": { dir: "previousSibling" }
+    },
+
+    preFilter: {
+        "ATTR": function( match ) {
+            match[1] = match[1].replace( runescape, funescape );
+
+            // Move the given value to match[3] whether quoted or unquoted
+            match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+
+            if ( match[2] === "~=" ) {
+                match[3] = " " + match[3] + " ";
+            }
+
+            return match.slice( 0, 4 );
+        },
+
+        "CHILD": function( match ) {
+            /* matches from matchExpr["CHILD"]
+                1 type (only|nth|...)
+                2 what (child|of-type)
+                3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+                4 xn-component of xn+y argument ([+-]?\d*n|)
+                5 sign of xn-component
+                6 x of xn-component
+                7 sign of y-component
+                8 y of y-component
+            */
+            match[1] = match[1].toLowerCase();
+
+            if ( match[1].slice( 0, 3 ) === "nth" ) {
+                // nth-* requires argument
+                if ( !match[3] ) {
+                    Sizzle.error( match[0] );
+                }
+
+                // numeric x and y parameters for Expr.filter.CHILD
+                // remember that false/true cast respectively to 0/1
+                match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
+                match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+
+            // other types prohibit arguments
+            } else if ( match[3] ) {
+                Sizzle.error( match[0] );
+            }
+
+            return match;
+        },
+
+        "PSEUDO": function( match ) {
+            var excess,
+                unquoted = !match[5] && match[2];
+
+            if ( matchExpr["CHILD"].test( match[0] ) ) {
+                return null;
+            }
+
+            // Accept quoted arguments as-is
+            if ( match[4] ) {
+                match[2] = match[4];
+
+            // Strip excess characters from unquoted arguments
+            } else if ( unquoted && rpseudo.test( unquoted ) &&
+                // Get excess from tokenize (recursively)
+                (excess = tokenize( unquoted, true )) &&
+                // advance to the next closing parenthesis
+                (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+
+                // excess is a negative index
+                match[0] = match[0].slice( 0, excess );
+                match[2] = unquoted.slice( 0, excess );
+            }
+
+            // Return only captures needed by the pseudo filter method (type and argument)
+            return match.slice( 0, 3 );
+        }
+    },
+
+    filter: {
+
+        "TAG": function( nodeName ) {
+            if ( nodeName === "*" ) {
+                return function() { return true; };
+            }
+
+            nodeName = nodeName.replace( runescape, funescape ).toLowerCase();
+            return function( elem ) {
+                return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+            };
+        },
+
+        "CLASS": function( className ) {
+            var pattern = classCache[ className + " " ];
+
+            return pattern ||
+                (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
+                classCache( className, function( elem ) {
+                    return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
+                });
+        },
+
+        "ATTR": function( name, operator, check ) {
+            return function( elem ) {
+                var result = Sizzle.attr( elem, name );
+
+                if ( result == null ) {
+                    return operator === "!=";
+                }
+                if ( !operator ) {
+                    return true;
+                }
+
+                result += "";
+
+                return operator === "=" ? result === check :
+                    operator === "!=" ? result !== check :
+                    operator === "^=" ? check && result.indexOf( check ) === 0 :
+                    operator === "*=" ? check && result.indexOf( check ) > -1 :
+                    operator === "$=" ? check && result.substr( result.length - check.length ) === check :
+                    operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
+                    operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" :
+                    false;
+            };
+        },
+
+        "CHILD": function( type, what, argument, first, last ) {
+            var simple = type.slice( 0, 3 ) !== "nth",
+                forward = type.slice( -4 ) !== "last",
+                ofType = what === "of-type";
+
+            return first === 1 && last === 0 ?
+
+                // Shortcut for :nth-*(n)
+                function( elem ) {
+                    return !!elem.parentNode;
+                } :
+
+                function( elem, context, xml ) {
+                    var cache, outerCache, node, diff, nodeIndex, start,
+                        dir = simple !== forward ? "nextSibling" : "previousSibling",
+                        parent = elem.parentNode,
+                        name = ofType && elem.nodeName.toLowerCase(),
+                        useCache = !xml && !ofType;
+
+                    if ( parent ) {
+
+                        // :(first|last|only)-(child|of-type)
+                        if ( simple ) {
+                            while ( dir ) {
+                                node = elem;
+                                while ( (node = node[ dir ]) ) {
+                                    if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
+                                        return false;
+                                    }
+                                }
+                                // Reverse direction for :only-* (if we haven't yet done so)
+                                start = dir = type === "only" && !start && "nextSibling";
+                            }
+                            return true;
+                        }
+
+                        start = [ forward ? parent.firstChild : parent.lastChild ];
+
+                        // non-xml :nth-child(...) stores cache data on `parent`
+                        if ( forward && useCache ) {
+                            // Seek `elem` from a previously-cached index
+                            outerCache = parent[ expando ] || (parent[ expando ] = {});
+                            cache = outerCache[ type ] || [];
+                            nodeIndex = cache[0] === dirruns && cache[1];
+                            diff = cache[0] === dirruns && cache[2];
+                            node = nodeIndex && parent.childNodes[ nodeIndex ];
+
+                            while ( (node = ++nodeIndex && node && node[ dir ] ||
+
+                                // Fallback to seeking `elem` from the start
+                                (diff = nodeIndex = 0) || start.pop()) ) {
+
+                                // When found, cache indexes on `parent` and break
+                                if ( node.nodeType === 1 && ++diff && node === elem ) {
+                                    outerCache[ type ] = [ dirruns, nodeIndex, diff ];
+                                    break;
+                                }
+                            }
+
+                        // Use previously-cached element index if available
+                        } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
+                            diff = cache[1];
+
+                        // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+                        } else {
+                            // Use the same loop as above to seek `elem` from the start
+                            while ( (node = ++nodeIndex && node && node[ dir ] ||
+                                (diff = nodeIndex = 0) || start.pop()) ) {
+
+                                if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
+                                    // Cache the index of each encountered element
+                                    if ( useCache ) {
+                                        (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+                                    }
+
+                                    if ( node === elem ) {
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+
+                        // Incorporate the offset, then check against cycle size
+                        diff -= last;
+                        return diff === first || ( diff % first === 0 && diff / first >= 0 );
+                    }
+                };
+        },
+
+        "PSEUDO": function( pseudo, argument ) {
+            // pseudo-class names are case-insensitive
+            // http://www.w3.org/TR/selectors/#pseudo-classes
+            // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+            // Remember that setFilters inherits from pseudos
+            var args,
+                fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
+                    Sizzle.error( "unsupported pseudo: " + pseudo );
+
+            // The user may use createPseudo to indicate that
+            // arguments are needed to create the filter function
+            // just as Sizzle does
+            if ( fn[ expando ] ) {
+                return fn( argument );
+            }
+
+            // But maintain support for old signatures
+            if ( fn.length > 1 ) {
+                args = [ pseudo, pseudo, "", argument ];
+                return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
+                    markFunction(function( seed, matches ) {
+                        var idx,
+                            matched = fn( seed, argument ),
+                            i = matched.length;
+                        while ( i-- ) {
+                            idx = indexOf.call( seed, matched[i] );
+                            seed[ idx ] = !( matches[ idx ] = matched[i] );
+                        }
+                    }) :
+                    function( elem ) {
+                        return fn( elem, 0, args );
+                    };
+            }
+
+            return fn;
+        }
+    },
+
+    pseudos: {
+        // Potentially complex pseudos
+        "not": markFunction(function( selector ) {
+            // Trim the selector passed to compile
+            // to avoid treating leading and trailing
+            // spaces as combinators
+            var input = [],
+                results = [],
+                matcher = compile( selector.replace( rtrim, "$1" ) );
+
+            return matcher[ expando ] ?
+                markFunction(function( seed, matches, context, xml ) {
+                    var elem,
+                        unmatched = matcher( seed, null, xml, [] ),
+                        i = seed.length;
+
+                    // Match elements unmatched by `matcher`
+                    while ( i-- ) {
+                        if ( (elem = unmatched[i]) ) {
+                            seed[i] = !(matches[i] = elem);
+                        }
+                    }
+                }) :
+                function( elem, context, xml ) {
+                    input[0] = elem;
+                    matcher( input, null, xml, results );
+                    return !results.pop();
+                };
+        }),
+
+        "has": markFunction(function( selector ) {
+            return function( elem ) {
+                return Sizzle( selector, elem ).length > 0;
+            };
+        }),
+
+        "contains": markFunction(function( text ) {
+            return function( elem ) {
+                return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+            };
+        }),
+
+        // "Whether an element is represented by a :lang() selector
+        // is based solely on the element's language value
+        // being equal to the identifier C,
+        // or beginning with the identifier C immediately followed by "-".
+        // The matching of C against the element's language value is performed case-insensitively.
+        // The identifier C does not have to be a valid language name."
+        // http://www.w3.org/TR/selectors/#lang-pseudo
+        "lang": markFunction( function( lang ) {
+            // lang value must be a valid identifider
+            if ( !ridentifier.test(lang || "") ) {
+                Sizzle.error( "unsupported lang: " + lang );
+            }
+            lang = lang.replace( runescape, funescape ).toLowerCase();
+            return function( elem ) {
+                var elemLang;
+                do {
+                    if ( (elemLang = documentIsXML ?
+                        elem.getAttribute("xml:lang") || elem.getAttribute("lang") :
+                        elem.lang) ) {
+
+                        elemLang = elemLang.toLowerCase();
+                        return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
+                    }
+                } while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+                return false;
+            };
+        }),
+
+        // Miscellaneous
+        "target": function( elem ) {
+            var hash = window.location && window.location.hash;
+            return hash && hash.slice( 1 ) === elem.id;
+        },
+
+        "root": function( elem ) {
+            return elem === docElem;
+        },
+
+        "focus": function( elem ) {
+            return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+        },
+
+        // Boolean properties
+        "enabled": function( elem ) {
+            return elem.disabled === false;
+        },
+
+        "disabled": function( elem ) {
+            return elem.disabled === true;
+        },
+
+        "checked": function( elem ) {
+            // In CSS3, :checked should return both checked and selected elements
+            // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+            var nodeName = elem.nodeName.toLowerCase();
+            return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+        },
+
+        "selected": function( elem ) {
+            // Accessing this property makes selected-by-default
+            // options in Safari work properly
+            if ( elem.parentNode ) {
+                elem.parentNode.selectedIndex;
+            }
+
+            return elem.selected === true;
+        },
+
+        // Contents
+        "empty": function( elem ) {
+            // http://www.w3.org/TR/selectors/#empty-pseudo
+            // :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
+            //   not comment, processing instructions, or others
+            // Thanks to Diego Perini for the nodeName shortcut
+            //   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+            for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
+                if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
+                    return false;
+                }
+            }
+            return true;
+        },
+
+        "parent": function( elem ) {
+            return !Expr.pseudos["empty"]( elem );
+        },
+
+        // Element/input types
+        "header": function( elem ) {
+            return rheader.test( elem.nodeName );
+        },
+
+        "input": function( elem ) {
+            return rinputs.test( elem.nodeName );
+        },
+
+        "button": function( elem ) {
+            var name = elem.nodeName.toLowerCase();
+            return name === "input" && elem.type === "button" || name === "button";
+        },
+
+        "text": function( elem ) {
+            var attr;
+            // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+            // use getAttribute instead to test this case
+            return elem.nodeName.toLowerCase() === "input" &&
+                elem.type === "text" &&
+                ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
+        },
+
+        // Position-in-collection
+        "first": createPositionalPseudo(function() {
+            return [ 0 ];
+        }),
+
+        "last": createPositionalPseudo(function( matchIndexes, length ) {
+            return [ length - 1 ];
+        }),
+
+        "eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+            return [ argument < 0 ? argument + length : argument ];
+        }),
+
+        "even": createPositionalPseudo(function( matchIndexes, length ) {
+            var i = 0;
+            for ( ; i < length; i += 2 ) {
+                matchIndexes.push( i );
+            }
+            return matchIndexes;
+        }),
+
+        "odd": createPositionalPseudo(function( matchIndexes, length ) {
+            var i = 1;
+            for ( ; i < length; i += 2 ) {
+                matchIndexes.push( i );
+            }
+            return matchIndexes;
+        }),
+
+        "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+            var i = argument < 0 ? argument + length : argument;
+            for ( ; --i >= 0; ) {
+                matchIndexes.push( i );
+            }
+            return matchIndexes;
+        }),
+
+        "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+            var i = argument < 0 ? argument + length : argument;
+            for ( ; ++i < length; ) {
+                matchIndexes.push( i );
+            }
+            return matchIndexes;
+        })
+    }
+};
+
+// Add button/input type pseudos
+for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
+    Expr.pseudos[ i ] = createInputPseudo( i );
+}
+for ( i in { submit: true, reset: true } ) {
+    Expr.pseudos[ i ] = createButtonPseudo( i );
+}
+
+function tokenize( selector, parseOnly ) {
+    var matched, match, tokens, type,
+        soFar, groups, preFilters,
+        cached = tokenCache[ selector + " " ];
+
+    if ( cached ) {
+        return parseOnly ? 0 : cached.slice( 0 );
+    }
+
+    soFar = selector;
+    groups = [];
+    preFilters = Expr.preFilter;
+
+    while ( soFar ) {
+
+        // Comma and first run
+        if ( !matched || (match = rcomma.exec( soFar )) ) {
+            if ( match ) {
+                // Don't consume trailing commas as valid
+                soFar = soFar.slice( match[0].length ) || soFar;
+            }
+            groups.push( tokens = [] );
+        }
+
+        matched = false;
+
+        // Combinators
+        if ( (match = rcombinators.exec( soFar )) ) {
+            matched = match.shift();
+            tokens.push( {
+                value: matched,
+                // Cast descendant combinators to space
+                type: match[0].replace( rtrim, " " )
+            } );
+            soFar = soFar.slice( matched.length );
+        }
+
+        // Filters
+        for ( type in Expr.filter ) {
+            if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+                (match = preFilters[ type ]( match ))) ) {
+                matched = match.shift();
+                tokens.push( {
+                    value: matched,
+                    type: type,
+                    matches: match
+                } );
+                soFar = soFar.slice( matched.length );
+            }
+        }
+
+        if ( !matched ) {
+            break;
+        }
+    }
+
+    // Return the length of the invalid excess
+    // if we're just parsing
+    // Otherwise, throw an error or return tokens
+    return parseOnly ?
+        soFar.length :
+        soFar ?
+            Sizzle.error( selector ) :
+            // Cache the tokens
+            tokenCache( selector, groups ).slice( 0 );
+}
+
+function toSelector( tokens ) {
+    var i = 0,
+        len = tokens.length,
+        selector = "";
+    for ( ; i < len; i++ ) {
+        selector += tokens[i].value;
+    }
+    return selector;
+}
+
+function addCombinator( matcher, combinator, base ) {
+    var dir = combinator.dir,
+        checkNonElements = base && combinator.dir === "parentNode",
+        doneName = done++;
+
+    return combinator.first ?
+        // Check against closest ancestor/preceding element
+        function( elem, context, xml ) {
+            while ( (elem = elem[ dir ]) ) {
+                if ( elem.nodeType === 1 || checkNonElements ) {
+                    return matcher( elem, context, xml );
+                }
+            }
+        } :
+
+        // Check against all ancestor/preceding elements
+        function( elem, context, xml ) {
+            var data, cache, outerCache,
+                dirkey = dirruns + " " + doneName;
+
+            // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+            if ( xml ) {
+                while ( (elem = elem[ dir ]) ) {
+                    if ( elem.nodeType === 1 || checkNonElements ) {
+                        if ( matcher( elem, context, xml ) ) {
+                            return true;
+                        }
+                    }
+                }
+            } else {
+                while ( (elem = elem[ dir ]) ) {
+                    if ( elem.nodeType === 1 || checkNonElements ) {
+                        outerCache = elem[ expando ] || (elem[ expando ] = {});
+                        if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
+                            if ( (data = cache[1]) === true || data === cachedruns ) {
+                                return data === true;
+                            }
+                        } else {
+                            cache = outerCache[ dir ] = [ dirkey ];
+                            cache[1] = matcher( elem, context, xml ) || cachedruns;
+                            if ( cache[1] === true ) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+        };
+}
+
+function elementMatcher( matchers ) {
+    return matchers.length > 1 ?
+        function( elem, context, xml ) {
+            var i = matchers.length;
+            while ( i-- ) {
+                if ( !matchers[i]( elem, context, xml ) ) {
+                    return false;
+                }
+            }
+            return true;
+        } :
+        matchers[0];
+}
+
+function condense( unmatched, map, filter, context, xml ) {
+    var elem,
+        newUnmatched = [],
+        i = 0,
+        len = unmatched.length,
+        mapped = map != null;
+
+    for ( ; i < len; i++ ) {
+        if ( (elem = unmatched[i]) ) {
+            if ( !filter || filter( elem, context, xml ) ) {
+                newUnmatched.push( elem );
+                if ( mapped ) {
+                    map.push( i );
+                }
+            }
+        }
+    }
+
+    return newUnmatched;
+}
+
+function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
+    if ( postFilter && !postFilter[ expando ] ) {
+        postFilter = setMatcher( postFilter );
+    }
+    if ( postFinder && !postFinder[ expando ] ) {
+        postFinder = setMatcher( postFinder, postSelector );
+    }
+    return markFunction(function( seed, results, context, xml ) {
+        var temp, i, elem,
+            preMap = [],
+            postMap = [],
+            preexisting = results.length,
+
+            // Get initial elements from seed or context
+            elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+
+            // Prefilter to get matcher input, preserving a map for seed-results synchronization
+            matcherIn = preFilter && ( seed || !selector ) ?
+                condense( elems, preMap, preFilter, context, xml ) :
+                elems,
+
+            matcherOut = matcher ?
+                // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+                postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+
+                    // ...intermediate processing is necessary
+                    [] :
+
+                    // ...otherwise use results directly
+                    results :
+                matcherIn;
+
+        // Find primary matches
+        if ( matcher ) {
+            matcher( matcherIn, matcherOut, context, xml );
+        }
+
+        // Apply postFilter
+        if ( postFilter ) {
+            temp = condense( matcherOut, postMap );
+            postFilter( temp, [], context, xml );
+
+            // Un-match failing elements by moving them back to matcherIn
+            i = temp.length;
+            while ( i-- ) {
+                if ( (elem = temp[i]) ) {
+                    matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+                }
+            }
+        }
+
+        if ( seed ) {
+            if ( postFinder || preFilter ) {
+                if ( postFinder ) {
+                    // Get the final matcherOut by condensing this intermediate into postFinder contexts
+                    temp = [];
+                    i = matcherOut.length;
+                    while ( i-- ) {
+                        if ( (elem = matcherOut[i]) ) {
+                            // Restore matcherIn since elem is not yet a final match
+                            temp.push( (matcherIn[i] = elem) );
+                        }
+                    }
+                    postFinder( null, (matcherOut = []), temp, xml );
+                }
+
+                // Move matched elements from seed to results to keep them synchronized
+                i = matcherOut.length;
+                while ( i-- ) {
+                    if ( (elem = matcherOut[i]) &&
+                        (temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+
+                        seed[temp] = !(results[temp] = elem);
+                    }
+                }
+            }
+
+        // Add elements to results, through postFinder if defined
+        } else {
+            matcherOut = condense(
+                matcherOut === results ?
+                    matcherOut.splice( preexisting, matcherOut.length ) :
+                    matcherOut
+            );
+            if ( postFinder ) {
+                postFinder( null, results, matcherOut, xml );
+            } else {
+                push.apply( results, matcherOut );
+            }
+        }
+    });
+}
+
+function matcherFromTokens( tokens ) {
+    var checkContext, matcher, j,
+        len = tokens.length,
+        leadingRelative = Expr.relative[ tokens[0].type ],
+        implicitRelative = leadingRelative || Expr.relative[" "],
+        i = leadingRelative ? 1 : 0,
+
+        // The foundational matcher ensures that elements are reachable from top-level context(s)
+        matchContext = addCombinator( function( elem ) {
+            return elem === checkContext;
+        }, implicitRelative, true ),
+        matchAnyContext = addCombinator( function( elem ) {
+            return indexOf.call( checkContext, elem ) > -1;
+        }, implicitRelative, true ),
+        matchers = [ function( elem, context, xml ) {
+            return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
+                (checkContext = context).nodeType ?
+                    matchContext( elem, context, xml ) :
+                    matchAnyContext( elem, context, xml ) );
+        } ];
+
+    for ( ; i < len; i++ ) {
+        if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
+            matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+        } else {
+            matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+
+            // Return special upon seeing a positional matcher
+            if ( matcher[ expando ] ) {
+                // Find the next relative operator (if any) for proper handling
+                j = ++i;
+                for ( ; j < len; j++ ) {
+                    if ( Expr.relative[ tokens[j].type ] ) {
+                        break;
+                    }
+                }
+                return setMatcher(
+                    i > 1 && elementMatcher( matchers ),
+                    i > 1 && toSelector( tokens.slice( 0, i - 1 ) ).replace( rtrim, "$1" ),
+                    matcher,
+                    i < j && matcherFromTokens( tokens.slice( i, j ) ),
+                    j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+                    j < len && toSelector( tokens )
+                );
+            }
+            matchers.push( matcher );
+        }
+    }
+
+    return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+    // A counter to specify which element is currently being matched
+    var matcherCachedRuns = 0,
+        bySet = setMatchers.length > 0,
+        byElement = elementMatchers.length > 0,
+        superMatcher = function( seed, context, xml, results, expandContext ) {
+            var elem, j, matcher,
+                setMatched = [],
+                matchedCount = 0,
+                i = "0",
+                unmatched = seed && [],
+                outermost = expandContext != null,
+                contextBackup = outermostContext,
+                // We must always have either seed elements or context
+                elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
+                // Nested matchers should use non-integer dirruns
+                dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E);
+
+            if ( outermost ) {
+                outermostContext = context !== document && context;
+                cachedruns = matcherCachedRuns;
+            }
+
+            // Add elements passing elementMatchers directly to results
+            for ( ; (elem = elems[i]) != null; i++ ) {
+                if ( byElement && elem ) {
+                    for ( j = 0; (matcher = elementMatchers[j]); j++ ) {
+                        if ( matcher( elem, context, xml ) ) {
+                            results.push( elem );
+                            break;
+                        }
+                    }
+                    if ( outermost ) {
+                        dirruns = dirrunsUnique;
+                        cachedruns = ++matcherCachedRuns;
+                    }
+                }
+
+                // Track unmatched elements for set filters
+                if ( bySet ) {
+                    // They will have gone through all possible matchers
+                    if ( (elem = !matcher && elem) ) {
+                        matchedCount--;
+                    }
+
+                    // Lengthen the array for every element, matched or not
+                    if ( seed ) {
+                        unmatched.push( elem );
+                    }
+                }
+            }
+
+            // Apply set filters to unmatched elements
+            // `i` starts as a string, so matchedCount would equal "00" if there are no elements
+            matchedCount += i;
+            if ( bySet && i !== matchedCount ) {
+                for ( j = 0; (matcher = setMatchers[j]); j++ ) {
+                    matcher( unmatched, setMatched, context, xml );
+                }
+
+                if ( seed ) {
+                    // Reintegrate element matches to eliminate the need for sorting
+                    if ( matchedCount > 0 ) {
+                        while ( i-- ) {
+                            if ( !(unmatched[i] || setMatched[i]) ) {
+                                setMatched[i] = pop.call( results );
+                            }
+                        }
+                    }
+
+                    // Discard index placeholder values to get only actual matches
+                    setMatched = condense( setMatched );
+                }
+
+                // Add matches to results
+                push.apply( results, setMatched );
+
+                // Seedless set matches succeeding multiple successful matchers stipulate sorting
+                if ( outermost && !seed && setMatched.length > 0 &&
+                    ( matchedCount + setMatchers.length ) > 1 ) {
+
+                    Sizzle.uniqueSort( results );
+                }
+            }
+
+            // Override manipulation of globals by nested matchers
+            if ( outermost ) {
+                dirruns = dirrunsUnique;
+                outermostContext = contextBackup;
+            }
+
+            return unmatched;
+        };
+
+    return bySet ?
+        markFunction( superMatcher ) :
+        superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+    var i,
+        setMatchers = [],
+        elementMatchers = [],
+        cached = compilerCache[ selector + " " ];
+
+    if ( !cached ) {
+        // Generate a function of recursive functions that can be used to check each element
+        if ( !group ) {
+            group = tokenize( selector );
+        }
+        i = group.length;
+        while ( i-- ) {
+            cached = matcherFromTokens( group[i] );
+            if ( cached[ expando ] ) {
+                setMatchers.push( cached );
+            } else {
+                elementMatchers.push( cached );
+            }
+        }
+
+        // Cache the compiled function
+        cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+    }
+    return cached;
+};
+
+function multipleContexts( selector, contexts, results ) {
+    var i = 0,
+        len = contexts.length;
+    for ( ; i < len; i++ ) {
+        Sizzle( selector, contexts[i], results );
+    }
+    return results;
+}
+
+function select( selector, context, results, seed ) {
+    var i, tokens, token, type, find,
+        match = tokenize( selector );
+
+    if ( !seed ) {
+        // Try to minimize operations if there is only one group
+        if ( match.length === 1 ) {
+
+            // Take a shortcut and set the context if the root selector is an ID
+            tokens = match[0] = match[0].slice( 0 );
+            if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+                    context.nodeType === 9 && !documentIsXML &&
+                    Expr.relative[ tokens[1].type ] ) {
+
+                context = Expr.find["ID"]( token.matches[0].replace( runescape, funescape ), context )[0];
+                if ( !context ) {
+                    return results;
+                }
+
+                selector = selector.slice( tokens.shift().value.length );
+            }
+
+            // Fetch a seed set for right-to-left matching
+            for ( i = matchExpr["needsContext"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) {
+                token = tokens[i];
+
+                // Abort if we hit a combinator
+                if ( Expr.relative[ (type = token.type) ] ) {
+                    break;
+                }
+                if ( (find = Expr.find[ type ]) ) {
+                    // Search, expanding context for leading sibling combinators
+                    if ( (seed = find(
+                        token.matches[0].replace( runescape, funescape ),
+                        rsibling.test( tokens[0].type ) && context.parentNode || context
+                    )) ) {
+
+                        // If seed is empty or no tokens remain, we can return early
+                        tokens.splice( i, 1 );
+                        selector = seed.length && toSelector( tokens );
+                        if ( !selector ) {
+                            push.apply( results, slice.call( seed, 0 ) );
+                            return results;
+                        }
+
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    // Compile and execute a filtering function
+    // Provide `match` to avoid retokenization if we modified the selector above
+    compile( selector, match )(
+        seed,
+        context,
+        documentIsXML,
+        results,
+        rsibling.test( selector )
+    );
+    return results;
+}
+
+// Deprecated
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Easy API for creating new setFilters
+function setFilters() {}
+Expr.filters = setFilters.prototype = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+// Initialize with the default document
+setDocument();
+
+// Override sizzle attribute retrieval
+Sizzle.attr = jQuery.attr;
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.pseudos;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})( window );
+var runtil = /Until$/,
+    rparentsprev = /^(?:parents|prev(?:Until|All))/,
+    isSimple = /^.[^:#\[\.,]*$/,
+    rneedsContext = jQuery.expr.match.needsContext,
+    // methods guaranteed to produce a unique set when starting from a unique set
+    guaranteedUnique = {
+        children: true,
+        contents: true,
+        next: true,
+        prev: true
+    };
+
+jQuery.fn.extend({
+    find: function( selector ) {
+        var i, ret, self;
+
+        if ( typeof selector !== "string" ) {
+            self = this;
+            return this.pushStack( jQuery( selector ).filter(function() {
+                for ( i = 0; i < self.length; i++ ) {
+                    if ( jQuery.contains( self[ i ], this ) ) {
+                        return true;
+                    }
+                }
+            }) );
+        }
+
+        ret = [];
+        for ( i = 0; i < this.length; i++ ) {
+            jQuery.find( selector, this[ i ], ret );
+        }
+
+        // Needed because $( selector, context ) becomes $( context ).find( selector )
+        ret = this.pushStack( jQuery.unique( ret ) );
+        ret.selector = ( this.selector ? this.selector + " " : "" ) + selector;
+        return ret;
+    },
+
+    has: function( target ) {
+        var i,
+            targets = jQuery( target, this ),
+            len = targets.length;
+
+        return this.filter(function() {
+            for ( i = 0; i < len; i++ ) {
+                if ( jQuery.contains( this, targets[i] ) ) {
+                    return true;
+                }
+            }
+        });
+    },
+
+    not: function( selector ) {
+        return this.pushStack( winnow(this, selector, false) );
+    },
+
+    filter: function( selector ) {
+        return this.pushStack( winnow(this, selector, true) );
+    },
+
+    is: function( selector ) {
+        return !!selector && (
+            typeof selector === "string" ?
+                // If this is a positional/relative selector, check membership in the returned set
+                // so $("p:first").is("p:last") won't return true for a doc with two "p".
+                rneedsContext.test( selector ) ?
+                    jQuery( selector, this.context ).index( this[0] ) >= 0 :
+                    jQuery.filter( selector, this ).length > 0 :
+                this.filter( selector ).length > 0 );
+    },
+
+    closest: function( selectors, context ) {
+        var cur,
+            i = 0,
+            l = this.length,
+            ret = [],
+            pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
+                jQuery( selectors, context || this.context ) :
+                0;
+
+        for ( ; i < l; i++ ) {
+            cur = this[i];
+
+            while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
+                if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+                    ret.push( cur );
+                    break;
+                }
+                cur = cur.parentNode;
+            }
+        }
+
+        return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
+    },
+
+    // Determine the position of an element within
+    // the matched set of elements
+    index: function( elem ) {
+
+        // No argument, return index in parent
+        if ( !elem ) {
+            return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
+        }
+
+        // index in selector
+        if ( typeof elem === "string" ) {
+            return jQuery.inArray( this[0], jQuery( elem ) );
+        }
+
+        // Locate the position of the desired element
+        return jQuery.inArray(
+            // If it receives a jQuery object, the first element is used
+            elem.jquery ? elem[0] : elem, this );
+    },
+
+    add: function( selector, context ) {
+        var set = typeof selector === "string" ?
+                jQuery( selector, context ) :
+                jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+            all = jQuery.merge( this.get(), set );
+
+        return this.pushStack( jQuery.unique(all) );
+    },
+
+    addBack: function( selector ) {
+        return this.add( selector == null ?
+            this.prevObject : this.prevObject.filter(selector)
+        );
+    }
+});
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+function sibling( cur, dir ) {
+    do {
+        cur = cur[ dir ];
+    } while ( cur && cur.nodeType !== 1 );
+
+    return cur;
+}
+
+jQuery.each({
+    parent: function( elem ) {
+        var parent = elem.parentNode;
+        return parent && parent.nodeType !== 11 ? parent : null;
+    },
+    parents: function( elem ) {
+        return jQuery.dir( elem, "parentNode" );
+    },
+    parentsUntil: function( elem, i, until ) {
+        return jQuery.dir( elem, "parentNode", until );
+    },
+    next: function( elem ) {
+        return sibling( elem, "nextSibling" );
+    },
+    prev: function( elem ) {
+        return sibling( elem, "previousSibling" );
+    },
+    nextAll: function( elem ) {
+        return jQuery.dir( elem, "nextSibling" );
+    },
+    prevAll: function( elem ) {
+        return jQuery.dir( elem, "previousSibling" );
+    },
+    nextUntil: function( elem, i, until ) {
+        return jQuery.dir( elem, "nextSibling", until );
+    },
+    prevUntil: function( elem, i, until ) {
+        return jQuery.dir( elem, "previousSibling", until );
+    },
+    siblings: function( elem ) {
+        return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
+    },
+    children: function( elem ) {
+        return jQuery.sibling( elem.firstChild );
+    },
+    contents: function( elem ) {
+        return jQuery.nodeName( elem, "iframe" ) ?
+            elem.contentDocument || elem.contentWindow.document :
+            jQuery.merge( [], elem.childNodes );
+    }
+}, function( name, fn ) {
+    jQuery.fn[ name ] = function( until, selector ) {
+        var ret = jQuery.map( this, fn, until );
+
+        if ( !runtil.test( name ) ) {
+            selector = until;
+        }
+
+        if ( selector && typeof selector === "string" ) {
+            ret = jQuery.filter( selector, ret );
+        }
+
+        ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+        if ( this.length > 1 && rparentsprev.test( name ) ) {
+            ret = ret.reverse();
+        }
+
+        return this.pushStack( ret );
+    };
+});
+
+jQuery.extend({
+    filter: function( expr, elems, not ) {
+        if ( not ) {
+            expr = ":not(" + expr + ")";
+        }
+
+        return elems.length === 1 ?
+            jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+            jQuery.find.matches(expr, elems);
+    },
+
+    dir: function( elem, dir, until ) {
+        var matched = [],
+            cur = elem[ dir ];
+
+        while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+            if ( cur.nodeType === 1 ) {
+                matched.push( cur );
+            }
+            cur = cur[dir];
+        }
+        return matched;
+    },
+
+    sibling: function( n, elem ) {
+        var r = [];
+
+        for ( ; n; n = n.nextSibling ) {
+            if ( n.nodeType === 1 && n !== elem ) {
+                r.push( n );
+            }
+        }
+
+        return r;
+    }
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+    // Can't pass null or undefined to indexOf in Firefox 4
+    // Set to 0 to skip string check
+    qualifier = qualifier || 0;
+
+    if ( jQuery.isFunction( qualifier ) ) {
+        return jQuery.grep(elements, function( elem, i ) {
+            var retVal = !!qualifier.call( elem, i, elem );
+            return retVal === keep;
+        });
+
+    } else if ( qualifier.nodeType ) {
+        return jQuery.grep(elements, function( elem ) {
+            return ( elem === qualifier ) === keep;
+        });
+
+    } else if ( typeof qualifier === "string" ) {
+        var filtered = jQuery.grep(elements, function( elem ) {
+            return elem.nodeType === 1;
+        });
+
+        if ( isSimple.test( qualifier ) ) {
+            return jQuery.filter(qualifier, filtered, !keep);
+        } else {
+            qualifier = jQuery.filter( qualifier, filtered );
+        }
+    }
+
+    return jQuery.grep(elements, function( elem ) {
+        return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
+    });
+}
+function createSafeFragment( document ) {
+    var list = nodeNames.split( "|" ),
+        safeFrag = document.createDocumentFragment();
+
+    if ( safeFrag.createElement ) {
+        while ( list.length ) {
+            safeFrag.createElement(
+                list.pop()
+            );
+        }
+    }
+    return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+        "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+    rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+    rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+    rleadingWhitespace = /^\s+/,
+    rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+    rtagName = /<([\w:]+)/,
+    rtbody = /<tbody/i,
+    rhtml = /<|&#?\w+;/,
+    rnoInnerhtml = /<(?:script|style|link)/i,
+    manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
+    // checked="checked" or checked
+    rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+    rscriptType = /^$|\/(?:java|ecma)script/i,
+    rscriptTypeMasked = /^true\/(.*)/,
+    rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+    // We have to close these tags to support XHTML (#13200)
+    wrapMap = {
+        option: [ 1, "<select multiple='multiple'>", "</select>" ],
+        legend: [ 1, "<fieldset>", "</fieldset>" ],
+        area: [ 1, "<map>", "</map>" ],
+        param: [ 1, "<object>", "</object>" ],
+        thead: [ 1, "<table>", "</table>" ],
+        tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+        col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+        td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+
+        // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+        // unless wrapped in a div with non-breaking characters in front of it.
+        _default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
+    },
+    safeFragment = createSafeFragment( document ),
+    fragmentDiv = safeFragment.appendChild( document.createElement("div") );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+jQuery.fn.extend({
+    text: function( value ) {
+        return jQuery.access( this, function( value ) {
+            return value === undefined ?
+                jQuery.text( this ) :
+                this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+        }, null, value, arguments.length );
+    },
+
+    wrapAll: function( html ) {
+        if ( jQuery.isFunction( html ) ) {
+            return this.each(function(i) {
+                jQuery(this).wrapAll( html.call(this, i) );
+            });
+        }
+
+        if ( this[0] ) {
+            // The elements to wrap the target around
+            var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+            if ( this[0].parentNode ) {
+                wrap.insertBefore( this[0] );
+            }
+
+            wrap.map(function() {
+                var elem = this;
+
+                while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+                    elem = elem.firstChild;
+                }
+
+                return elem;
+            }).append( this );
+        }
+
+        return this;
+    },
+
+    wrapInner: function( html ) {
+        if ( jQuery.isFunction( html ) ) {
+            return this.each(function(i) {
+                jQuery(this).wrapInner( html.call(this, i) );
+            });
+        }
+
+        return this.each(function() {
+            var self = jQuery( this ),
+                contents = self.contents();
+
+            if ( contents.length ) {
+                contents.wrapAll( html );
+
+            } else {
+                self.append( html );
+            }
+        });
+    },
+
+    wrap: function( html ) {
+        var isFunction = jQuery.isFunction( html );
+
+        return this.each(function(i) {
+            jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+        });
+    },
+
+    unwrap: function() {
+        return this.parent().each(function() {
+            if ( !jQuery.nodeName( this, "body" ) ) {
+                jQuery( this ).replaceWith( this.childNodes );
+            }
+        }).end();
+    },
+
+    append: function() {
+        return this.domManip(arguments, true, function( elem ) {
+            if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+                this.appendChild( elem );
+            }
+        });
+    },
+
+    prepend: function() {
+        return this.domManip(arguments, true, function( elem ) {
+            if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
+                this.insertBefore( elem, this.firstChild );
+            }
+        });
+    },
+
+    before: function() {
+        return this.domManip( arguments, false, function( elem ) {
+            if ( this.parentNode ) {
+                this.parentNode.insertBefore( elem, this );
+            }
+        });
+    },
+
+    after: function() {
+        return this.domManip( arguments, false, function( elem ) {
+            if ( this.parentNode ) {
+                this.parentNode.insertBefore( elem, this.nextSibling );
+            }
+        });
+    },
+
+    // keepData is for internal use only--do not document
+    remove: function( selector, keepData ) {
+        var elem,
+            i = 0;
+
+        for ( ; (elem = this[i]) != null; i++ ) {
+            if ( !selector || jQuery.filter( selector, [ elem ] ).length > 0 ) {
+                if ( !keepData && elem.nodeType === 1 ) {
+                    jQuery.cleanData( getAll( elem ) );
+                }
+
+                if ( elem.parentNode ) {
+                    if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
+                        setGlobalEval( getAll( elem, "script" ) );
+                    }
+                    elem.parentNode.removeChild( elem );
+                }
+            }
+        }
+
+        return this;
+    },
+
+    empty: function() {
+        var elem,
+            i = 0;
+
+        for ( ; (elem = this[i]) != null; i++ ) {
+            // Remove element nodes and prevent memory leaks
+            if ( elem.nodeType === 1 ) {
+                jQuery.cleanData( getAll( elem, false ) );
+            }
+
+            // Remove any remaining nodes
+            while ( elem.firstChild ) {
+                elem.removeChild( elem.firstChild );
+            }
+
+            // If this is a select, ensure that it displays empty (#12336)
+            // Support: IE<9
+            if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
+                elem.options.length = 0;
+            }
+        }
+
+        return this;
+    },
+
+    clone: function( dataAndEvents, deepDataAndEvents ) {
+        dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+        deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+        return this.map( function () {
+            return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+        });
+    },
+
+    html: function( value ) {
+        return jQuery.access( this, function( value ) {
+            var elem = this[0] || {},
+                i = 0,
+                l = this.length;
+
+            if ( value === undefined ) {
+                return elem.nodeType === 1 ?
+                    elem.innerHTML.replace( rinlinejQuery, "" ) :
+                    undefined;
+            }
+
+            // See if we can take a shortcut and just use innerHTML
+            if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+                ( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
+                ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+                !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
+
+                value = value.replace( rxhtmlTag, "<$1></$2>" );
+
+                try {
+                    for (; i < l; i++ ) {
+                        // Remove element nodes and prevent memory leaks
+                        elem = this[i] || {};
+                        if ( elem.nodeType === 1 ) {
+                            jQuery.cleanData( getAll( elem, false ) );
+                            elem.innerHTML = value;
+                        }
+                    }
+
+                    elem = 0;
+
+                // If using innerHTML throws an exception, use the fallback method
+                } catch(e) {}
+            }
+
+            if ( elem ) {
+                this.empty().append( value );
+            }
+        }, null, value, arguments.length );
+    },
+
+    replaceWith: function( value ) {
+        var isFunc = jQuery.isFunction( value );
+
+        // Make sure that the elements are removed from the DOM before they are inserted
+        // this can help fix replacing a parent with child elements
+        if ( !isFunc && typeof value !== "string" ) {
+            value = jQuery( value ).not( this ).detach();
+        }
+
+        return this.domManip( [ value ], true, function( elem ) {
+            var next = this.nextSibling,
+                parent = this.parentNode;
+
+            if ( parent && this.nodeType === 1 || this.nodeType === 11 ) {
+
+                jQuery( this ).remove();
+
+                if ( next ) {
+                    next.parentNode.insertBefore( elem, next );
+                } else {
+                    parent.appendChild( elem );
+                }
+            }
+        });
+    },
+
+    detach: function( selector ) {
+        return this.remove( selector, true );
+    },
+
+    domManip: function( args, table, callback ) {
+
+        // Flatten any nested arrays
+        args = core_concat.apply( [], args );
+
+        var fragment, first, scripts, hasScripts, node, doc,
+            i = 0,
+            l = this.length,
+            set = this,
+            iNoClone = l - 1,
+            value = args[0],
+            isFunction = jQuery.isFunction( value );
+
+        // We can't cloneNode fragments that contain checked, in WebKit
+        if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
+            return this.each(function( index ) {
+                var self = set.eq( index );
+                if ( isFunction ) {
+                    args[0] = value.call( this, index, table ? self.html() : undefined );
+                }
+                self.domManip( args, table, callback );
+            });
+        }
+
+        if ( l ) {
+            fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this );
+            first = fragment.firstChild;
+
+            if ( fragment.childNodes.length === 1 ) {
+                fragment = first;
+            }
+
+            if ( first ) {
+                table = table && jQuery.nodeName( first, "tr" );
+                scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
+                hasScripts = scripts.length;
+
+                // Use the original fragment for the last item instead of the first because it can end up
+                // being emptied incorrectly in certain situations (#8070).
+                for ( ; i < l; i++ ) {
+                    node = fragment;
+
+                    if ( i !== iNoClone ) {
+                        node = jQuery.clone( node, true, true );
+
+                        // Keep references to cloned scripts for later restoration
+                        if ( hasScripts ) {
+                            jQuery.merge( scripts, getAll( node, "script" ) );
+                        }
+                    }
+
+                    callback.call(
+                        table && jQuery.nodeName( this[i], "table" ) ?
+                            findOrAppend( this[i], "tbody" ) :
+                            this[i],
+                        node,
+                        i
+                    );
+                }
+
+                if ( hasScripts ) {
+                    doc = scripts[ scripts.length - 1 ].ownerDocument;
+
+                    // Reenable scripts
+                    jQuery.map( scripts, restoreScript );
+
+                    // Evaluate executable scripts on first document insertion
+                    for ( i = 0; i < hasScripts; i++ ) {
+                        node = scripts[ i ];
+                        if ( rscriptType.test( node.type || "" ) &&
+                            !jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+
+                            if ( node.src ) {
+                                // Hope ajax is available...
+                                jQuery.ajax({
+                                    url: node.src,
+                                    type: "GET",
+                                    dataType: "script",
+                                    async: false,
+                                    global: false,
+                                    "throws": true
+                                });
+                            } else {
+                                jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
+                            }
+                        }
+                    }
+                }
+
+                // Fix #11809: Avoid leaking memory
+                fragment = first = null;
+            }
+        }
+
+        return this;
+    }
+});
+
+function findOrAppend( elem, tag ) {
+    return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
+}
+
+// Replace/restore the type attribute of script elements for safe DOM manipulation
+function disableScript( elem ) {
+    var attr = elem.getAttributeNode("type");
+    elem.type = ( attr && attr.specified ) + "/" + elem.type;
+    return elem;
+}
+function restoreScript( elem ) {
+    var match = rscriptTypeMasked.exec( elem.type );
+    if ( match ) {
+        elem.type = match[1];
+    } else {
+        elem.removeAttribute("type");
+    }
+    return elem;
+}
+
+// Mark scripts as having already been evaluated
+function setGlobalEval( elems, refElements ) {
+    var elem,
+        i = 0;
+    for ( ; (elem = elems[i]) != null; i++ ) {
+        jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
+    }
+}
+
+function cloneCopyEvent( src, dest ) {
+
+    if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+        return;
+    }
+
+    var type, i, l,
+        oldData = jQuery._data( src ),
+        curData = jQuery._data( dest, oldData ),
+        events = oldData.events;
+
+    if ( events ) {
+        delete curData.handle;
+        curData.events = {};
+
+        for ( type in events ) {
+            for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+                jQuery.event.add( dest, type, events[ type ][ i ] );
+            }
+        }
+    }
+
+    // make the cloned public data object a copy from the original
+    if ( curData.data ) {
+        curData.data = jQuery.extend( {}, curData.data );
+    }
+}
+
+function fixCloneNodeIssues( src, dest ) {
+    var nodeName, data, e;
+
+    // We do not need to do anything for non-Elements
+    if ( dest.nodeType !== 1 ) {
+        return;
+    }
+
+    nodeName = dest.nodeName.toLowerCase();
+
+    // IE6-8 copies events bound via attachEvent when using cloneNode.
+    if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
+        data = jQuery._data( dest );
+
+        for ( e in data.events ) {
+            jQuery.removeEvent( dest, e, data.handle );
+        }
+
+        // Event data gets referenced instead of copied if the expando gets copied too
+        dest.removeAttribute( jQuery.expando );
+    }
+
+    // IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+    if ( nodeName === "script" && dest.text !== src.text ) {
+        disableScript( dest ).text = src.text;
+        restoreScript( dest );
+
+    // IE6-10 improperly clones children of object elements using classid.
+    // IE10 throws NoModificationAllowedError if parent is null, #12132.
+    } else if ( nodeName === "object" ) {
+        if ( dest.parentNode ) {
+            dest.outerHTML = src.outerHTML;
+        }
+
+        // This path appears unavoidable for IE9. When cloning an object
+        // element in IE9, the outerHTML strategy above is not sufficient.
+        // If the src has innerHTML and the destination does not,
+        // copy the src.innerHTML into the dest.innerHTML. #10324
+        if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
+            dest.innerHTML = src.innerHTML;
+        }
+
+    } else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
+        // IE6-8 fails to persist the checked state of a cloned checkbox
+        // or radio button. Worse, IE6-7 fail to give the cloned element
+        // a checked appearance if the defaultChecked value isn't also set
+
+        dest.defaultChecked = dest.checked = src.checked;
+
+        // IE6-7 get confused and end up setting the value of a cloned
+        // checkbox/radio button to an empty string instead of "on"
+        if ( dest.value !== src.value ) {
+            dest.value = src.value;
+        }
+
+    // IE6-8 fails to return the selected option to the default selected
+    // state when cloning options
+    } else if ( nodeName === "option" ) {
+        dest.defaultSelected = dest.selected = src.defaultSelected;
+
+    // IE6-8 fails to set the defaultValue to the correct value when
+    // cloning other types of input fields
+    } else if ( nodeName === "input" || nodeName === "textarea" ) {
+        dest.defaultValue = src.defaultValue;
+    }
+}
+
+jQuery.each({
+    appendTo: "append",
+    prependTo: "prepend",
+    insertBefore: "before",
+    insertAfter: "after",
+    replaceAll: "replaceWith"
+}, function( name, original ) {
+    jQuery.fn[ name ] = function( selector ) {
+        var elems,
+            i = 0,
+            ret = [],
+            insert = jQuery( selector ),
+            last = insert.length - 1;
+
+        for ( ; i <= last; i++ ) {
+            elems = i === last ? this : this.clone(true);
+            jQuery( insert[i] )[ original ]( elems );
+
+            // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+            core_push.apply( ret, elems.get() );
+        }
+
+        return this.pushStack( ret );
+    };
+});
+
+function getAll( context, tag ) {
+    var elems, elem,
+        i = 0,
+        found = typeof context.getElementsByTagName !== "undefined" ? context.getElementsByTagName( tag || "*" ) :
+            typeof context.querySelectorAll !== "undefined" ? context.querySelectorAll( tag || "*" ) :
+            undefined;
+
+    if ( !found ) {
+        for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
+            if ( !tag || jQuery.nodeName( elem, tag ) ) {
+                found.push( elem );
+            } else {
+                jQuery.merge( found, getAll( elem, tag ) );
+            }
+        }
+    }
+
+    return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
+        jQuery.merge( [ context ], found ) :
+        found;
+}
+
+// Used in buildFragment, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+    if ( manipulation_rcheckableType.test( elem.type ) ) {
+        elem.defaultChecked = elem.checked;
+    }
+}
+
+jQuery.extend({
+    clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+        var destElements, srcElements, node, i, clone,
+            inPage = jQuery.contains( elem.ownerDocument, elem );
+
+        if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
+            clone = elem.cloneNode( true );
+
+        // IE<=8 does not properly clone detached, unknown element nodes
+        } else {
+            fragmentDiv.innerHTML = elem.outerHTML;
+            fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
+        }
+
+        if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+                (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+
+            // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+            destElements = getAll( clone );
+            srcElements = getAll( elem );
+
+            // Fix all IE cloning issues
+            for ( i = 0; (node = srcElements[i]) != null; ++i ) {
+                // Ensure that the destination node is not null; Fixes #9587
+                if ( destElements[i] ) {
+                    fixCloneNodeIssues( node, destElements[i] );
+                }
+            }
+        }
+
+        // Copy the events from the original to the clone
+        if ( dataAndEvents ) {
+            if ( deepDataAndEvents ) {
+                srcElements = srcElements || getAll( elem );
+                destElements = destElements || getAll( clone );
+
+                for ( i = 0; (node = srcElements[i]) != null; i++ ) {
+                    cloneCopyEvent( node, destElements[i] );
+                }
+            } else {
+                cloneCopyEvent( elem, clone );
+            }
+        }
+
+        // Preserve script evaluation history
+        destElements = getAll( clone, "script" );
+        if ( destElements.length > 0 ) {
+            setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
+        }
+
+        destElements = srcElements = node = null;
+
+        // Return the cloned set
+        return clone;
+    },
+
+    buildFragment: function( elems, context, scripts, selection ) {
+        var contains, elem, tag, tmp, wrap, tbody, j,
+            l = elems.length,
+
+            // Ensure a safe fragment
+            safe = createSafeFragment( context ),
+
+            nodes = [],
+            i = 0;
+
+        for ( ; i < l; i++ ) {
+            elem = elems[ i ];
+
+            if ( elem || elem === 0 ) {
+
+                // Add nodes directly
+                if ( jQuery.type( elem ) === "object" ) {
+                    jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+
+                // Convert non-html into a text node
+                } else if ( !rhtml.test( elem ) ) {
+                    nodes.push( context.createTextNode( elem ) );
+
+                // Convert html into DOM nodes
+                } else {
+                    tmp = tmp || safe.appendChild( context.createElement("div") );
+
+                    // Deserialize a standard representation
+                    tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
+                    wrap = wrapMap[ tag ] || wrapMap._default;
+
+                    tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
+
+                    // Descend through wrappers to the right content
+                    j = wrap[0];
+                    while ( j-- ) {
+                        tmp = tmp.lastChild;
+                    }
+
+                    // Manually add leading whitespace removed by IE
+                    if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+                        nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
+                    }
+
+                    // Remove IE's autoinserted <tbody> from table fragments
+                    if ( !jQuery.support.tbody ) {
+
+                        // String was a <table>, *may* have spurious <tbody>
+                        elem = tag === "table" && !rtbody.test( elem ) ?
+                            tmp.firstChild :
+
+                            // String was a bare <thead> or <tfoot>
+                            wrap[1] === "<table>" && !rtbody.test( elem ) ?
+                                tmp :
+                                0;
+
+                        j = elem && elem.childNodes.length;
+                        while ( j-- ) {
+                            if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
+                                elem.removeChild( tbody );
+                            }
+                        }
+                    }
+
+                    jQuery.merge( nodes, tmp.childNodes );
+
+                    // Fix #12392 for WebKit and IE > 9
+                    tmp.textContent = "";
+
+                    // Fix #12392 for oldIE
+                    while ( tmp.firstChild ) {
+                        tmp.removeChild( tmp.firstChild );
+                    }
+
+                    // Remember the top-level container for proper cleanup
+                    tmp = safe.lastChild;
+                }
+            }
+        }
+
+        // Fix #11356: Clear elements from fragment
+        if ( tmp ) {
+            safe.removeChild( tmp );
+        }
+
+        // Reset defaultChecked for any radios and checkboxes
+        // about to be appended to the DOM in IE 6/7 (#8060)
+        if ( !jQuery.support.appendChecked ) {
+            jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
+        }
+
+        i = 0;
+        while ( (elem = nodes[ i++ ]) ) {
+
+            // #4087 - If origin and destination elements are the same, and this is
+            // that element, do not do anything
+            if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
+                continue;
+            }
+
+            contains = jQuery.contains( elem.ownerDocument, elem );
+
+            // Append to fragment
+            tmp = getAll( safe.appendChild( elem ), "script" );
+
+            // Preserve script evaluation history
+            if ( contains ) {
+                setGlobalEval( tmp );
+            }
+
+            // Capture executables
+            if ( scripts ) {
+                j = 0;
+                while ( (elem = tmp[ j++ ]) ) {
+                    if ( rscriptType.test( elem.type || "" ) ) {
+                        scripts.push( elem );
+                    }
+                }
+            }
+        }
+
+        tmp = null;
+
+        return safe;
+    },
+
+    cleanData: function( elems, /* internal */ acceptData ) {
+        var data, id, elem, type,
+            i = 0,
+            internalKey = jQuery.expando,
+            cache = jQuery.cache,
+            deleteExpando = jQuery.support.deleteExpando,
+            special = jQuery.event.special;
+
+        for ( ; (elem = elems[i]) != null; i++ ) {
+
+            if ( acceptData || jQuery.acceptData( elem ) ) {
+
+                id = elem[ internalKey ];
+                data = id && cache[ id ];
+
+                if ( data ) {
+                    if ( data.events ) {
+                        for ( type in data.events ) {
+                            if ( special[ type ] ) {
+                                jQuery.event.remove( elem, type );
+
+                            // This is a shortcut to avoid jQuery.event.remove's overhead
+                            } else {
+                                jQuery.removeEvent( elem, type, data.handle );
+                            }
+                        }
+                    }
+
+                    // Remove cache only if it was not already removed by jQuery.event.remove
+                    if ( cache[ id ] ) {
+
+                        delete cache[ id ];
+
+                        // IE does not allow us to delete expando properties from nodes,
+                        // nor does it have a removeAttribute function on Document nodes;
+                        // we must handle all of these cases
+                        if ( deleteExpando ) {
+                            delete elem[ internalKey ];
+
+                        } else if ( typeof elem.removeAttribute !== "undefined" ) {
+                            elem.removeAttribute( internalKey );
+
+                        } else {
+                            elem[ internalKey ] = null;
+                        }
+
+                        core_deletedIds.push( id );
+                    }
+                }
+            }
+        }
+    }
+});
+var curCSS, getStyles, iframe,
+    ralpha = /alpha\([^)]*\)/i,
+    ropacity = /opacity\s*=\s*([^)]*)/,
+    rposition = /^(top|right|bottom|left)$/,
+    // swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+    // see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+    rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+    rmargin = /^margin/,
+    rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
+    rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
+    rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
+    elemdisplay = { BODY: "block" },
+
+    cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+    cssNormalTransform = {
+        letterSpacing: 0,
+        fontWeight: 400
+    },
+
+    cssExpand = [ "Top", "Right", "Bottom", "Left" ],
+    cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+
+// return a css property mapped to a potentially vendor prefixed property
+function vendorPropName( style, name ) {
+
+    // shortcut for names that are not vendor prefixed
+    if ( name in style ) {
+        return name;
+    }
+
+    // check for vendor prefixed names
+    var capName = name.charAt(0).toUpperCase() + name.slice(1),
+        origName = name,
+        i = cssPrefixes.length;
+
+    while ( i-- ) {
+        name = cssPrefixes[ i ] + capName;
+        if ( name in style ) {
+            return name;
+        }
+    }
+
+    return origName;
+}
+
+function isHidden( elem, el ) {
+    // isHidden might be called from jQuery#filter function;
+    // in that case, element will be second argument
+    elem = el || elem;
+    return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+}
+
+function showHide( elements, show ) {
+    var elem,
+        values = [],
+        index = 0,
+        length = elements.length;
+
+    for ( ; index < length; index++ ) {
+        elem = elements[ index ];
+        if ( !elem.style ) {
+            continue;
+        }
+        values[ index ] = jQuery._data( elem, "olddisplay" );
+        if ( show ) {
+            // Reset the inline display of this element to learn if it is
+            // being hidden by cascaded rules or not
+            if ( !values[ index ] && elem.style.display === "none" ) {
+                elem.style.display = "";
+            }
+
+            // Set elements which have been overridden with display: none
+            // in a stylesheet to whatever the default browser style is
+            // for such an element
+            if ( elem.style.display === "" && isHidden( elem ) ) {
+                values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
+            }
+        } else if ( !values[ index ] && !isHidden( elem ) ) {
+            jQuery._data( elem, "olddisplay", jQuery.css( elem, "display" ) );
+        }
+    }
+
+    // Set the display of most of the elements in a second loop
+    // to avoid the constant reflow
+    for ( index = 0; index < length; index++ ) {
+        elem = elements[ index ];
+        if ( !elem.style ) {
+            continue;
+        }
+        if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+            elem.style.display = show ? values[ index ] || "" : "none";
+        }
+    }
+
+    return elements;
+}
+
+jQuery.fn.extend({
+    css: function( name, value ) {
+        return jQuery.access( this, function( elem, name, value ) {
+            var styles, len,
+                map = {},
+                i = 0;
+
+            if ( jQuery.isArray( name ) ) {
+                styles = getStyles( elem );
+                len = name.length;
+
+                for ( ; i < len; i++ ) {
+                    map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+                }
+
+                return map;
+            }
+
+            return value !== undefined ?
+                jQuery.style( elem, name, value ) :
+                jQuery.css( elem, name );
+        }, name, value, arguments.length > 1 );
+    },
+    show: function() {
+        return showHide( this, true );
+    },
+    hide: function() {
+        return showHide( this );
+    },
+    toggle: function( state ) {
+        var bool = typeof state === "boolean";
+
+        return this.each(function() {
+            if ( bool ? state : isHidden( this ) ) {
+                jQuery( this ).show();
+            } else {
+                jQuery( this ).hide();
+            }
+        });
+    }
+});
+
+jQuery.extend({
+    // Add in style property hooks for overriding the default
+    // behavior of getting and setting a style property
+    cssHooks: {
+        opacity: {
+            get: function( elem, computed ) {
+                if ( computed ) {
+                    // We should always get a number back from opacity
+                    var ret = curCSS( elem, "opacity" );
+                    return ret === "" ? "1" : ret;
+                }
+            }
+        }
+    },
+
+    // Exclude the following css properties to add px
+    cssNumber: {
+        "columnCount": true,
+        "fillOpacity": true,
+        "fontWeight": true,
+        "lineHeight": true,
+        "opacity": true,
+        "orphans": true,
+        "widows": true,
+        "zIndex": true,
+        "zoom": true
+    },
+
+    // Add in properties whose names you wish to fix before
+    // setting or getting the value
+    cssProps: {
+        // normalize float css property
+        "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+    },
+
+    // Get and set the style property on a DOM Node
+    style: function( elem, name, value, extra ) {
+        // Don't set styles on text and comment nodes
+        if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+            return;
+        }
+
+        // Make sure that we're working with the right name
+        var ret, type, hooks,
+            origName = jQuery.camelCase( name ),
+            style = elem.style;
+
+        name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+
+        // gets hook for the prefixed version
+        // followed by the unprefixed version
+        hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+        // Check if we're setting a value
+        if ( value !== undefined ) {
+            type = typeof value;
+
+            // convert relative number strings (+= or -=) to relative numbers. #7345
+            if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+                value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
+                // Fixes bug #9237
+                type = "number";
+            }
+
+            // Make sure that NaN and null values aren't set. See: #7116
+            if ( value == null || type === "number" && isNaN( value ) ) {
+                return;
+            }
+
+            // If a number was passed in, add 'px' to the (except for certain CSS properties)
+            if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+                value += "px";
+            }
+
+            // Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+            // but it would mean to define eight (for every problematic property) identical functions
+            if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
+                style[ name ] = "inherit";
+            }
+
+            // If a hook was provided, use that value, otherwise just set the specified value
+            if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+
+                // Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+                // Fixes bug #5509
+                try {
+                    style[ name ] = value;
+                } catch(e) {}
+            }
+
+        } else {
+            // If a hook was provided get the non-computed value from there
+            if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+                return ret;
+            }
+
+            // Otherwise just get the value from the style object
+            return style[ name ];
+        }
+    },
+
+    css: function( elem, name, extra, styles ) {
+        var val, num, hooks,
+            origName = jQuery.camelCase( name );
+
+        // Make sure that we're working with the right name
+        name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+
+        // gets hook for the prefixed version
+        // followed by the unprefixed version
+        hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+
+        // If a hook was provided get the computed value from there
+        if ( hooks && "get" in hooks ) {
+            val = hooks.get( elem, true, extra );
+        }
+
+        // Otherwise, if a way to get the computed value exists, use that
+        if ( val === undefined ) {
+            val = curCSS( elem, name, styles );
+        }
+
+        //convert "normal" to computed value
+        if ( val === "normal" && name in cssNormalTransform ) {
+            val = cssNormalTransform[ name ];
+        }
+
+        // Return, converting to number if forced or a qualifier was provided and val looks numeric
+        if ( extra ) {
+            num = parseFloat( val );
+            return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+        }
+        return val;
+    },
+
+    // A method for quickly swapping in/out CSS properties to get correct calculations
+    swap: function( elem, options, callback, args ) {
+        var ret, name,
+            old = {};
+
+        // Remember the old values, and insert the new ones
+        for ( name in options ) {
+            old[ name ] = elem.style[ name ];
+            elem.style[ name ] = options[ name ];
+        }
+
+        ret = callback.apply( elem, args || [] );
+
+        // Revert the old values
+        for ( name in options ) {
+            elem.style[ name ] = old[ name ];
+        }
+
+        return ret;
+    }
+});
+
+// NOTE: we've included the "window" in window.getComputedStyle
+// because jsdom on node.js will break without it.
+if ( window.getComputedStyle ) {
+    getStyles = function( elem ) {
+        return window.getComputedStyle( elem, null );
+    };
+
+    curCSS = function( elem, name, _computed ) {
+        var width, minWidth, maxWidth,
+            computed = _computed || getStyles( elem ),
+
+            // getPropertyValue is only needed for .css('filter') in IE9, see #12537
+            ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
+            style = elem.style;
+
+        if ( computed ) {
+
+            if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+                ret = jQuery.style( elem, name );
+            }
+
+            // A tribute to the "awesome hack by Dean Edwards"
+            // Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+            // Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+            // this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+            if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+
+                // Remember the original values
+                width = style.width;
+                minWidth = style.minWidth;
+                maxWidth = style.maxWidth;
+
+                // Put in the new values to get a computed value out
+                style.minWidth = style.maxWidth = style.width = ret;
+                ret = computed.width;
+
+                // Revert the changed values
+                style.width = width;
+                style.minWidth = minWidth;
+                style.maxWidth = maxWidth;
+            }
+        }
+
+        return ret;
+    };
+} else if ( document.documentElement.currentStyle ) {
+    getStyles = function( elem ) {
+        return elem.currentStyle;
+    };
+
+    curCSS = function( elem, name, _computed ) {
+        var left, rs, rsLeft,
+            computed = _computed || getStyles( elem ),
+            ret = computed ? computed[ name ] : undefined,
+            style = elem.style;
+
+        // Avoid setting ret to empty string here
+        // so we don't default to auto
+        if ( ret == null && style && style[ name ] ) {
+            ret = style[ name ];
+        }
+
+        // From the awesome hack by Dean Edwards
+        // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+        // If we're not dealing with a regular pixel number
+        // but a number that has a weird ending, we need to convert it to pixels
+        // but not position css attributes, as those are proportional to the parent element instead
+        // and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+        if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+
+            // Remember the original values
+            left = style.left;
+            rs = elem.runtimeStyle;
+            rsLeft = rs && rs.left;
+
+            // Put in the new values to get a computed value out
+            if ( rsLeft ) {
+                rs.left = elem.currentStyle.left;
+            }
+            style.left = name === "fontSize" ? "1em" : ret;
+            ret = style.pixelLeft + "px";
+
+            // Revert the changed values
+            style.left = left;
+            if ( rsLeft ) {
+                rs.left = rsLeft;
+            }
+        }
+
+        return ret === "" ? "auto" : ret;
+    };
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+    var matches = rnumsplit.exec( value );
+    return matches ?
+        // Guard against undefined "subtract", e.g., when used as in cssHooks
+        Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+        value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
+    var i = extra === ( isBorderBox ? "border" : "content" ) ?
+        // If we already have the right measurement, avoid augmentation
+        4 :
+        // Otherwise initialize for horizontal or vertical properties
+        name === "width" ? 1 : 0,
+
+        val = 0;
+
+    for ( ; i < 4; i += 2 ) {
+        // both box models exclude margin, so add it if we want it
+        if ( extra === "margin" ) {
+            val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
+        }
+
+        if ( isBorderBox ) {
+            // border-box includes padding, so remove it if we want content
+            if ( extra === "content" ) {
+                val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+            }
+
+            // at this point, extra isn't border nor margin, so remove border
+            if ( extra !== "margin" ) {
+                val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+            }
+        } else {
+            // at this point, extra isn't content, so add padding
+            val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+
+            // at this point, extra isn't content nor padding, so add border
+            if ( extra !== "padding" ) {
+                val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+            }
+        }
+    }
+
+    return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+    // Start with offset property, which is equivalent to the border-box value
+    var valueIsBorderBox = true,
+        val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+        styles = getStyles( elem ),
+        isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+    // some non-html elements return undefined for offsetWidth, so check for null/undefined
+    // svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+    // MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+    if ( val <= 0 || val == null ) {
+        // Fall back to computed then uncomputed css if necessary
+        val = curCSS( elem, name, styles );
+        if ( val < 0 || val == null ) {
+            val = elem.style[ name ];
+        }
+
+        // Computed unit is not pixels. Stop here and return.
+        if ( rnumnonpx.test(val) ) {
+            return val;
+        }
+
+        // we need the check for style in case a browser which returns unreliable values
+        // for getComputedStyle silently falls back to the reliable elem.style
+        valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
+
+        // Normalize "", auto, and prepare for extra
+        val = parseFloat( val ) || 0;
+    }
+
+    // use the active box-sizing model to add/subtract irrelevant styles
+    return ( val +
+        augmentWidthOrHeight(
+            elem,
+            name,
+            extra || ( isBorderBox ? "border" : "content" ),
+            valueIsBorderBox,
+            styles
+        )
+    ) + "px";
+}
+
+// Try to determine the default display value of an element
+function css_defaultDisplay( nodeName ) {
+    var doc = document,
+        display = elemdisplay[ nodeName ];
+
+    if ( !display ) {
+        display = actualDisplay( nodeName, doc );
+
+        // If the simple way fails, read from inside an iframe
+        if ( display === "none" || !display ) {
+            // Use the already-created iframe if possible
+            iframe = ( iframe ||
+                jQuery("<iframe frameborder='0' width='0' height='0'/>")
+                .css( "cssText", "display:block !important" )
+            ).appendTo( doc.documentElement );
+
+            // Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+            doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
+            doc.write("<!doctype html><html><body>");
+            doc.close();
+
+            display = actualDisplay( nodeName, doc );
+            iframe.detach();
+        }
+
+        // Store the correct default display
+        elemdisplay[ nodeName ] = display;
+    }
+
+    return display;
+}
+
+// Called ONLY from within css_defaultDisplay
+function actualDisplay( name, doc ) {
+    var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+        display = jQuery.css( elem[0], "display" );
+    elem.remove();
+    return display;
+}
+
+jQuery.each([ "height", "width" ], function( i, name ) {
+    jQuery.cssHooks[ name ] = {
+        get: function( elem, computed, extra ) {
+            if ( computed ) {
+                // certain elements can have dimension info if we invisibly show them
+                // however, it must have a current display style that would benefit from this
+                return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
+                    jQuery.swap( elem, cssShow, function() {
+                        return getWidthOrHeight( elem, name, extra );
+                    }) :
+                    getWidthOrHeight( elem, name, extra );
+            }
+        },
+
+        set: function( elem, value, extra ) {
+            var styles = extra && getStyles( elem );
+            return setPositiveNumber( elem, value, extra ?
+                augmentWidthOrHeight(
+                    elem,
+                    name,
+                    extra,
+                    jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+                    styles
+                ) : 0
+            );
+        }
+    };
+});
+
+if ( !jQuery.support.opacity ) {
+    jQuery.cssHooks.opacity = {
+        get: function( elem, computed ) {
+            // IE uses filters for opacity
+            return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+                ( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
+                computed ? "1" : "";
+        },
+
+        set: function( elem, value ) {
+            var style = elem.style,
+                currentStyle = elem.currentStyle,
+                opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+                filter = currentStyle && currentStyle.filter || style.filter || "";
+
+            // IE has trouble with opacity if it does not have layout
+            // Force it by setting the zoom level
+            style.zoom = 1;
+
+            // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+            // if value === "", then remove inline opacity #12685
+            if ( ( value >= 1 || value === "" ) &&
+                    jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
+                    style.removeAttribute ) {
+
+                // Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+                // if "filter:" is present at all, clearType is disabled, we want to avoid this
+                // style.removeAttribute is IE Only, but so apparently is this code path...
+                style.removeAttribute( "filter" );
+
+                // if there is no filter style applied in a css rule or unset inline opacity, we are done
+                if ( value === "" || currentStyle && !currentStyle.filter ) {
+                    return;
+                }
+            }
+
+            // otherwise, set new filter values
+            style.filter = ralpha.test( filter ) ?
+                filter.replace( ralpha, opacity ) :
+                filter + " " + opacity;
+        }
+    };
+}
+
+// These hooks cannot be added until DOM ready because the support test
+// for it is not run until after DOM ready
+jQuery(function() {
+    if ( !jQuery.support.reliableMarginRight ) {
+        jQuery.cssHooks.marginRight = {
+            get: function( elem, computed ) {
+                if ( computed ) {
+                    // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+                    // Work around by temporarily setting element display to inline-block
+                    return jQuery.swap( elem, { "display": "inline-block" },
+                        curCSS, [ elem, "marginRight" ] );
+                }
+            }
+        };
+    }
+
+    // Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+    // getComputedStyle returns percent when specified for top/left/bottom/right
+    // rather than make the css module depend on the offset module, we just check for it here
+    if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
+        jQuery.each( [ "top", "left" ], function( i, prop ) {
+            jQuery.cssHooks[ prop ] = {
+                get: function( elem, computed ) {
+                    if ( computed ) {
+                        computed = curCSS( elem, prop );
+                        // if curCSS returns percentage, fallback to offset
+                        return rnumnonpx.test( computed ) ?
+                            jQuery( elem ).position()[ prop ] + "px" :
+                            computed;
+                    }
+                }
+            };
+        });
+    }
+
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+    jQuery.expr.filters.hidden = function( elem ) {
+        return ( elem.offsetWidth === 0 && elem.offsetHeight === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
+    };
+
+    jQuery.expr.filters.visible = function( elem ) {
+        return !jQuery.expr.filters.hidden( elem );
+    };
+}
+
+// These hooks are used by animate to expand properties
+jQuery.each({
+    margin: "",
+    padding: "",
+    border: "Width"
+}, function( prefix, suffix ) {
+    jQuery.cssHooks[ prefix + suffix ] = {
+        expand: function( value ) {
+            var i = 0,
+                expanded = {},
+
+                // assumes a single number if not a string
+                parts = typeof value === "string" ? value.split(" ") : [ value ];
+
+            for ( ; i < 4; i++ ) {
+                expanded[ prefix + cssExpand[ i ] + suffix ] =
+                    parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+            }
+
+            return expanded;
+        }
+    };
+
+    if ( !rmargin.test( prefix ) ) {
+        jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
+    }
+});
+var r20 = /%20/g,
+    rbracket = /\[\]$/,
+    rCRLF = /\r?\n/g,
+    rsubmitterTypes = /^(?:submit|button|image|reset)$/i,
+    rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+jQuery.fn.extend({
+    serialize: function() {
+        return jQuery.param( this.serializeArray() );
+    },
+    serializeArray: function() {
+        return this.map(function(){
+            // Can add propHook for "elements" to filter or add form elements
+            var elements = jQuery.prop( this, "elements" );
+            return elements ? jQuery.makeArray( elements ) : this;
+        })
+        .filter(function(){
+            var type = this.type;
+            // Use .is(":disabled") so that fieldset[disabled] works
+            return this.name && !jQuery( this ).is( ":disabled" ) &&
+                rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
+                ( this.checked || !manipulation_rcheckableType.test( type ) );
+        })
+        .map(function( i, elem ){
+            var val = jQuery( this ).val();
+
+            return val == null ?
+                null :
+                jQuery.isArray( val ) ?
+                    jQuery.map( val, function( val ){
+                        return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+                    }) :
+                    { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+        }).get();
+    }
+});
+
+//Serialize an array of form elements or a set of
+//key/values into a query string
+jQuery.param = function( a, traditional ) {
+    var prefix,
+        s = [],
+        add = function( key, value ) {
+            // If value is a function, invoke it and return its value
+            value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
+            s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+        };
+
+    // Set traditional to true for jQuery <= 1.3.2 behavior.
+    if ( traditional === undefined ) {
+        traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+    }
+
+    // If an array was passed in, assume that it is an array of form elements.
+    if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+        // Serialize the form elements
+        jQuery.each( a, function() {
+            add( this.name, this.value );
+        });
+
+    } else {
+        // If traditional, encode the "old" way (the way 1.3.2 or older
+        // did it), otherwise encode params recursively.
+        for ( prefix in a ) {
+            buildParams( prefix, a[ prefix ], traditional, add );
+        }
+    }
+
+    // Return the resulting serialization
+    return s.join( "&" ).replace( r20, "+" );
+};
+
+function buildParams( prefix, obj, traditional, add ) {
+    var name;
+
+    if ( jQuery.isArray( obj ) ) {
+        // Serialize array item.
+        jQuery.each( obj, function( i, v ) {
+            if ( traditional || rbracket.test( prefix ) ) {
+                // Treat each array item as a scalar.
+                add( prefix, v );
+
+            } else {
+                // Item is non-scalar (array or object), encode its numeric index.
+                buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+            }
+        });
+
+    } else if ( !traditional && jQuery.type( obj ) === "object" ) {
+        // Serialize object item.
+        for ( name in obj ) {
+            buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+        }
+
+    } else {
+        // Serialize scalar item.
+        add( prefix, obj );
+    }
+}
+var
+    // Document location
+    ajaxLocParts,
+    ajaxLocation,
+    
+    ajax_nonce = jQuery.now(),
+
+    ajax_rquery = /\?/,
+    rhash = /#.*$/,
+    rts = /([?&])_=[^&]*/,
+    rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+    // #7653, #8125, #8152: local protocol detection
+    rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+    rnoContent = /^(?:GET|HEAD)$/,
+    rprotocol = /^\/\//,
+    rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
+
+    // Keep a copy of the old load method
+    _load = jQuery.fn.load,
+
+    /* Prefilters
+     * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+     * 2) These are called:
+     *    - BEFORE asking for a transport
+     *    - AFTER param serialization (s.data is a string if s.processData is true)
+     * 3) key is the dataType
+     * 4) the catchall symbol "*" can be used
+     * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+     */
+    prefilters = {},
+
+    /* Transports bindings
+     * 1) key is the dataType
+     * 2) the catchall symbol "*" can be used
+     * 3) selection will start with transport dataType and THEN go to "*" if needed
+     */
+    transports = {},
+
+    // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+    allTypes = "*/".concat("*");
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+    ajaxLocation = location.href;
+} catch( e ) {
+    // Use the href attribute of an A element
+    // since IE will modify it given document.location
+    ajaxLocation = document.createElement( "a" );
+    ajaxLocation.href = "";
+    ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+    // dataTypeExpression is optional and defaults to "*"
+    return function( dataTypeExpression, func ) {
+
+        if ( typeof dataTypeExpression !== "string" ) {
+            func = dataTypeExpression;
+            dataTypeExpression = "*";
+        }
+
+        var dataType,
+            i = 0,
+            dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
+
+        if ( jQuery.isFunction( func ) ) {
+            // For each dataType in the dataTypeExpression
+            while ( (dataType = dataTypes[i++]) ) {
+                // Prepend if requested
+                if ( dataType[0] === "+" ) {
+                    dataType = dataType.slice( 1 ) || "*";
+                    (structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+
+                // Otherwise append
+                } else {
+                    (structure[ dataType ] = structure[ dataType ] || []).push( func );
+                }
+            }
+        }
+    };
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
+
+    var inspected = {},
+        seekingTransport = ( structure === transports );
+
+    function inspect( dataType ) {
+        var selected;
+        inspected[ dataType ] = true;
+        jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
+            var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
+            if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
+                options.dataTypes.unshift( dataTypeOrTransport );
+                inspect( dataTypeOrTransport );
+                return false;
+            } else if ( seekingTransport ) {
+                return !( selected = dataTypeOrTransport );
+            }
+        });
+        return selected;
+    }
+
+    return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+    var key, deep,
+        flatOptions = jQuery.ajaxSettings.flatOptions || {};
+
+    for ( key in src ) {
+        if ( src[ key ] !== undefined ) {
+            ( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+        }
+    }
+    if ( deep ) {
+        jQuery.extend( true, target, deep );
+    }
+
+    return target;
+}
+
+jQuery.fn.load = function( url, params, callback ) {
+    if ( typeof url !== "string" && _load ) {
+        return _load.apply( this, arguments );
+    }
+
+    var selector, type, response,
+        self = this,
+        off = url.indexOf(" ");
+
+    if ( off >= 0 ) {
+        selector = url.slice( off, url.length );
+        url = url.slice( 0, off );
+    }
+
+    // If it's a function
+    if ( jQuery.isFunction( params ) ) {
+
+        // We assume that it's the callback
+        callback = params;
+        params = undefined;
+
+    // Otherwise, build a param string
+    } else if ( params && typeof params === "object" ) {
+        type = "POST";
+    }
+
+    // If we have elements to modify, make the request
+    if ( self.length > 0 ) {
+        jQuery.ajax({
+            url: url,
+
+            // if "type" variable is undefined, then "GET" method will be used
+            type: type,
+            dataType: "html",
+            data: params
+        }).done(function( responseText ) {
+
+            // Save response for use in complete callback
+            response = arguments;
+
+            self.html( selector ?
+
+                // If a selector was specified, locate the right elements in a dummy div
+                // Exclude scripts to avoid IE 'Permission Denied' errors
+                jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+
+                // Otherwise use the full result
+                responseText );
+
+        }).complete( callback && function( jqXHR, status ) {
+            self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+        });
+    }
+
+    return this;
+};
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
+    jQuery.fn[ type ] = function( fn ){
+        return this.on( type, fn );
+    };
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+    jQuery[ method ] = function( url, data, callback, type ) {
+        // shift arguments if data argument was omitted
+        if ( jQuery.isFunction( data ) ) {
+            type = type || callback;
+            callback = data;
+            data = undefined;
+        }
+
+        return jQuery.ajax({
+            url: url,
+            type: method,
+            dataType: type,
+            data: data,
+            success: callback
+        });
+    };
+});
+
+jQuery.extend({
+
+    // Counter for holding the number of active queries
+    active: 0,
+
+    // Last-Modified header cache for next request
+    lastModified: {},
+    etag: {},
+
+    ajaxSettings: {
+        url: ajaxLocation,
+        type: "GET",
+        isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+        global: true,
+        processData: true,
+        async: true,
+        contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+        /*
+        timeout: 0,
+        data: null,
+        dataType: null,
+        username: null,
+        password: null,
+        cache: null,
+        throws: false,
+        traditional: false,
+        headers: {},
+        */
+
+        accepts: {
+            "*": allTypes,
+            text: "text/plain",
+            html: "text/html",
+            xml: "application/xml, text/xml",
+            json: "application/json, text/javascript"
+        },
+
+        contents: {
+            xml: /xml/,
+            html: /html/,
+            json: /json/
+        },
+
+        responseFields: {
+            xml: "responseXML",
+            text: "responseText"
+        },
+
+        // Data converters
+        // Keys separate source (or catchall "*") and destination types with a single space
+        converters: {
+
+            // Convert anything to text
+            "* text": window.String,
+
+            // Text to html (true = no transformation)
+            "text html": true,
+
+            // Evaluate text as a json expression
+            "text json": jQuery.parseJSON,
+
+            // Parse text as xml
+            "text xml": jQuery.parseXML
+        },
+
+        // For options that shouldn't be deep extended:
+        // you can add your own custom options here if
+        // and when you create one that shouldn't be
+        // deep extended (see ajaxExtend)
+        flatOptions: {
+            url: true,
+            context: true
+        }
+    },
+
+    // Creates a full fledged settings object into target
+    // with both ajaxSettings and settings fields.
+    // If target is omitted, writes into ajaxSettings.
+    ajaxSetup: function( target, settings ) {
+        return settings ?
+
+            // Building a settings object
+            ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
+
+            // Extending ajaxSettings
+            ajaxExtend( jQuery.ajaxSettings, target );
+    },
+
+    ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+    ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+    // Main method
+    ajax: function( url, options ) {
+
+        // If url is an object, simulate pre-1.5 signature
+        if ( typeof url === "object" ) {
+            options = url;
+            url = undefined;
+        }
+
+        // Force options to be an object
+        options = options || {};
+
+        var transport,
+            // URL without anti-cache param
+            cacheURL,
+            // Response headers
+            responseHeadersString,
+            responseHeaders,
+            // timeout handle
+            timeoutTimer,
+            // Cross-domain detection vars
+            parts,
+            // To know if global events are to be dispatched
+            fireGlobals,
+            // Loop variable
+            i,
+            // Create the final options object
+            s = jQuery.ajaxSetup( {}, options ),
+            // Callbacks context
+            callbackContext = s.context || s,
+            // Context for global events is callbackContext if it is a DOM node or jQuery collection
+            globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
+                jQuery( callbackContext ) :
+                jQuery.event,
+            // Deferreds
+            deferred = jQuery.Deferred(),
+            completeDeferred = jQuery.Callbacks("once memory"),
+            // Status-dependent callbacks
+            statusCode = s.statusCode || {},
+            // Headers (they are sent all at once)
+            requestHeaders = {},
+            requestHeadersNames = {},
+            // The jqXHR state
+            state = 0,
+            // Default abort message
+            strAbort = "canceled",
+            // Fake xhr
+            jqXHR = {
+                readyState: 0,
+
+                // Builds headers hashtable if needed
+                getResponseHeader: function( key ) {
+                    var match;
+                    if ( state === 2 ) {
+                        if ( !responseHeaders ) {
+                            responseHeaders = {};
+                            while ( (match = rheaders.exec( responseHeadersString )) ) {
+                                responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+                            }
+                        }
+                        match = responseHeaders[ key.toLowerCase() ];
+                    }
+                    return match == null ? null : match;
+                },
+
+                // Raw string
+                getAllResponseHeaders: function() {
+                    return state === 2 ? responseHeadersString : null;
+                },
+
+                // Caches the header
+                setRequestHeader: function( name, value ) {
+                    var lname = name.toLowerCase();
+                    if ( !state ) {
+                        name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+                        requestHeaders[ name ] = value;
+                    }
+                    return this;
+                },
+
+                // Overrides response content-type header
+                overrideMimeType: function( type ) {
+                    if ( !state ) {
+                        s.mimeType = type;
+                    }
+                    return this;
+                },
+
+                // Status-dependent callbacks
+                statusCode: function( map ) {
+                    var code;
+                    if ( map ) {
+                        if ( state < 2 ) {
+                            for ( code in map ) {
+                                // Lazy-add the new callback in a way that preserves old ones
+                                statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+                            }
+                        } else {
+                            // Execute the appropriate callbacks
+                            jqXHR.always( map[ jqXHR.status ] );
+                        }
+                    }
+                    return this;
+                },
+
+                // Cancel the request
+                abort: function( statusText ) {
+                    var finalText = statusText || strAbort;
+                    if ( transport ) {
+                        transport.abort( finalText );
+                    }
+                    done( 0, finalText );
+                    return this;
+                }
+            };
+
+        // Attach deferreds
+        deferred.promise( jqXHR ).complete = completeDeferred.add;
+        jqXHR.success = jqXHR.done;
+        jqXHR.error = jqXHR.fail;
+
+        // Remove hash character (#7531: and string promotion)
+        // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+        // Handle falsy url in the settings object (#10093: consistency with old signature)
+        // We also use the url parameter if available
+        s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+        // Alias method option to type as per ticket #12004
+        s.type = options.method || options.type || s.method || s.type;
+
+        // Extract dataTypes list
+        s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
+
+        // A cross-domain request is in order when we have a protocol:host:port mismatch
+        if ( s.crossDomain == null ) {
+            parts = rurl.exec( s.url.toLowerCase() );
+            s.crossDomain = !!( parts &&
+                ( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
+                    ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+                        ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+            );
+        }
+
+        // Convert data if not already a string
+        if ( s.data && s.processData && typeof s.data !== "string" ) {
+            s.data = jQuery.param( s.data, s.traditional );
+        }
+
+        // Apply prefilters
+        inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+        // If request was aborted inside a prefilter, stop there
+        if ( state === 2 ) {
+            return jqXHR;
+        }
+
+        // We can fire global events as of now if asked to
+        fireGlobals = s.global;
+
+        // Watch for a new set of requests
+        if ( fireGlobals && jQuery.active++ === 0 ) {
+            jQuery.event.trigger("ajaxStart");
+        }
+
+        // Uppercase the type
+        s.type = s.type.toUpperCase();
+
+        // Determine if request has content
+        s.hasContent = !rnoContent.test( s.type );
+
+        // Save the URL in case we're toying with the If-Modified-Since
+        // and/or If-None-Match header later on
+        cacheURL = s.url;
+
+        // More options handling for requests with no content
+        if ( !s.hasContent ) {
+
+            // If data is available, append data to url
+            if ( s.data ) {
+                cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
+                // #9682: remove data so that it's not used in an eventual retry
+                delete s.data;
+            }
+
+            // Add anti-cache in url if needed
+            if ( s.cache === false ) {
+                s.url = rts.test( cacheURL ) ?
+
+                    // If there is already a '_' parameter, set its value
+                    cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
+
+                    // Otherwise add one to the end
+                    cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
+            }
+        }
+
+        // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+        if ( s.ifModified ) {
+            if ( jQuery.lastModified[ cacheURL ] ) {
+                jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
+            }
+            if ( jQuery.etag[ cacheURL ] ) {
+                jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+            }
+        }
+
+        // Set the correct header, if data is being sent
+        if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+            jqXHR.setRequestHeader( "Content-Type", s.contentType );
+        }
+
+        // Set the Accepts header for the server, depending on the dataType
+        jqXHR.setRequestHeader(
+            "Accept",
+            s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+                s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+                s.accepts[ "*" ]
+        );
+
+        // Check for headers option
+        for ( i in s.headers ) {
+            jqXHR.setRequestHeader( i, s.headers[ i ] );
+        }
+
+        // Allow custom headers/mimetypes and early abort
+        if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+            // Abort if not done already and return
+            return jqXHR.abort();
+        }
+
+        // aborting is no longer a cancellation
+        strAbort = "abort";
+
+        // Install callbacks on deferreds
+        for ( i in { success: 1, error: 1, complete: 1 } ) {
+            jqXHR[ i ]( s[ i ] );
+        }
+
+        // Get transport
+        transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+        // If no transport, we auto-abort
+        if ( !transport ) {
+            done( -1, "No Transport" );
+        } else {
+            jqXHR.readyState = 1;
+
+            // Send global event
+            if ( fireGlobals ) {
+                globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+            }
+            // Timeout
+            if ( s.async && s.timeout > 0 ) {
+                timeoutTimer = setTimeout(function() {
+                    jqXHR.abort("timeout");
+                }, s.timeout );
+            }
+
+            try {
+                state = 1;
+                transport.send( requestHeaders, done );
+            } catch ( e ) {
+                // Propagate exception as error if not done
+                if ( state < 2 ) {
+                    done( -1, e );
+                // Simply rethrow otherwise
+                } else {
+                    throw e;
+                }
+            }
+        }
+
+        // Callback for when everything is done
+        function done( status, nativeStatusText, responses, headers ) {
+            var isSuccess, success, error, response, modified,
+                statusText = nativeStatusText;
+
+            // Called once
+            if ( state === 2 ) {
+                return;
+            }
+
+            // State is "done" now
+            state = 2;
+
+            // Clear timeout if it exists
+            if ( timeoutTimer ) {
+                clearTimeout( timeoutTimer );
+            }
+
+            // Dereference transport for early garbage collection
+            // (no matter how long the jqXHR object will be used)
+            transport = undefined;
+
+            // Cache response headers
+            responseHeadersString = headers || "";
+
+            // Set readyState
+            jqXHR.readyState = status > 0 ? 4 : 0;
+
+            // Get response data
+            if ( responses ) {
+                response = ajaxHandleResponses( s, jqXHR, responses );
+            }
+
+            // If successful, handle type chaining
+            if ( status >= 200 && status < 300 || status === 304 ) {
+
+                // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+                if ( s.ifModified ) {
+                    modified = jqXHR.getResponseHeader("Last-Modified");
+                    if ( modified ) {
+                        jQuery.lastModified[ cacheURL ] = modified;
+                    }
+                    modified = jqXHR.getResponseHeader("etag");
+                    if ( modified ) {
+                        jQuery.etag[ cacheURL ] = modified;
+                    }
+                }
+
+                // If not modified
+                if ( status === 304 ) {
+                    isSuccess = true;
+                    statusText = "notmodified";
+
+                // If we have data
+                } else {
+                    isSuccess = ajaxConvert( s, response );
+                    statusText = isSuccess.state;
+                    success = isSuccess.data;
+                    error = isSuccess.error;
+                    isSuccess = !error;
+                }
+            } else {
+                // We extract error from statusText
+                // then normalize statusText and status for non-aborts
+                error = statusText;
+                if ( status || !statusText ) {
+                    statusText = "error";
+                    if ( status < 0 ) {
+                        status = 0;
+                    }
+                }
+            }
+
+            // Set data for the fake xhr object
+            jqXHR.status = status;
+            jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+
+            // Success/Error
+            if ( isSuccess ) {
+                deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+            } else {
+                deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+            }
+
+            // Status-dependent callbacks
+            jqXHR.statusCode( statusCode );
+            statusCode = undefined;
+
+            if ( fireGlobals ) {
+                globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
+                    [ jqXHR, s, isSuccess ? success : error ] );
+            }
+
+            // Complete
+            completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+            if ( fireGlobals ) {
+                globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+                // Handle the global AJAX counter
+                if ( !( --jQuery.active ) ) {
+                    jQuery.event.trigger("ajaxStop");
+                }
+            }
+        }
+
+        return jqXHR;
+    },
+
+    getScript: function( url, callback ) {
+        return jQuery.get( url, undefined, callback, "script" );
+    },
+
+    getJSON: function( url, data, callback ) {
+        return jQuery.get( url, data, callback, "json" );
+    }
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+    var ct, type, finalDataType, firstDataType,
+        contents = s.contents,
+        dataTypes = s.dataTypes,
+        responseFields = s.responseFields;
+
+    // Fill responseXXX fields
+    for ( type in responseFields ) {
+        if ( type in responses ) {
+            jqXHR[ responseFields[type] ] = responses[ type ];
+        }
+    }
+
+    // Remove auto dataType and get content-type in the process
+    while( dataTypes[ 0 ] === "*" ) {
+        dataTypes.shift();
+        if ( ct === undefined ) {
+            ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+        }
+    }
+
+    // Check if we're dealing with a known content-type
+    if ( ct ) {
+        for ( type in contents ) {
+            if ( contents[ type ] && contents[ type ].test( ct ) ) {
+                dataTypes.unshift( type );
+                break;
+            }
+        }
+    }
+
+    // Check to see if we have a response for the expected dataType
+    if ( dataTypes[ 0 ] in responses ) {
+        finalDataType = dataTypes[ 0 ];
+    } else {
+        // Try convertible dataTypes
+        for ( type in responses ) {
+            if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+                finalDataType = type;
+                break;
+            }
+            if ( !firstDataType ) {
+                firstDataType = type;
+            }
+        }
+        // Or just use first one
+        finalDataType = finalDataType || firstDataType;
+    }
+
+    // If we found a dataType
+    // We add the dataType to the list if needed
+    // and return the corresponding response
+    if ( finalDataType ) {
+        if ( finalDataType !== dataTypes[ 0 ] ) {
+            dataTypes.unshift( finalDataType );
+        }
+        return responses[ finalDataType ];
+    }
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+    var conv, conv2, current, tmp,
+        converters = {},
+        i = 0,
+        // Work with a copy of dataTypes in case we need to modify it for conversion
+        dataTypes = s.dataTypes.slice(),
+        prev = dataTypes[ 0 ];
+
+    // Apply the dataFilter if provided
+    if ( s.dataFilter ) {
+        response = s.dataFilter( response, s.dataType );
+    }
+
+    // Create converters map with lowercased keys
+    if ( dataTypes[ 1 ] ) {
+        for ( conv in s.converters ) {
+            converters[ conv.toLowerCase() ] = s.converters[ conv ];
+        }
+    }
+
+    // Convert to each sequential dataType, tolerating list modification
+    for ( ; (current = dataTypes[++i]); ) {
+
+        // There's only work to do if current dataType is non-auto
+        if ( current !== "*" ) {
+
+            // Convert response if prev dataType is non-auto and differs from current
+            if ( prev !== "*" && prev !== current ) {
+
+                // Seek a direct converter
+                conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+
+                // If none found, seek a pair
+                if ( !conv ) {
+                    for ( conv2 in converters ) {
+
+                        // If conv2 outputs current
+                        tmp = conv2.split(" ");
+                        if ( tmp[ 1 ] === current ) {
+
+                            // If prev can be converted to accepted input
+                            conv = converters[ prev + " " + tmp[ 0 ] ] ||
+                                converters[ "* " + tmp[ 0 ] ];
+                            if ( conv ) {
+                                // Condense equivalence converters
+                                if ( conv === true ) {
+                                    conv = converters[ conv2 ];
+
+                                // Otherwise, insert the intermediate dataType
+                                } else if ( converters[ conv2 ] !== true ) {
+                                    current = tmp[ 0 ];
+                                    dataTypes.splice( i--, 0, current );
+                                }
+
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // Apply converter (if not an equivalence)
+                if ( conv !== true ) {
+
+                    // Unless errors are allowed to bubble, catch and return them
+                    if ( conv && s["throws"] ) {
+                        response = conv( response );
+                    } else {
+                        try {
+                            response = conv( response );
+                        } catch ( e ) {
+                            return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+                        }
+                    }
+                }
+            }
+
+            // Update prev for next iteration
+            prev = current;
+        }
+    }
+
+    return { state: "success", data: response };
+}
+// Install script dataType
+jQuery.ajaxSetup({
+    accepts: {
+        script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+    },
+    contents: {
+        script: /(?:java|ecma)script/
+    },
+    converters: {
+        "text script": function( text ) {
+            jQuery.globalEval( text );
+            return text;
+        }
+    }
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+    if ( s.cache === undefined ) {
+        s.cache = false;
+    }
+    if ( s.crossDomain ) {
+        s.type = "GET";
+        s.global = false;
+    }
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+    // This transport only deals with cross domain requests
+    if ( s.crossDomain ) {
+
+        var script,
+            head = document.head || jQuery("head")[0] || document.documentElement;
+
+        return {
+
+            send: function( _, callback ) {
+
+                script = document.createElement("script");
+
+                script.async = true;
+
+                if ( s.scriptCharset ) {
+                    script.charset = s.scriptCharset;
+                }
+
+                script.src = s.url;
+
+                // Attach handlers for all browsers
+                script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+                    if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+                        // Handle memory leak in IE
+                        script.onload = script.onreadystatechange = null;
+
+                        // Remove the script
+                        if ( script.parentNode ) {
+                            script.parentNode.removeChild( script );
+                        }
+
+                        // Dereference the script
+                        script = null;
+
+                        // Callback if not abort
+                        if ( !isAbort ) {
+                            callback( 200, "success" );
+                        }
+                    }
+                };
+
+                // Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+                // Use native DOM manipulation to avoid our domManip AJAX trickery
+                head.insertBefore( script, head.firstChild );
+            },
+
+            abort: function() {
+                if ( script ) {
+                    script.onload( undefined, true );
+                }
+            }
+        };
+    }
+});
+var oldCallbacks = [],
+    rjsonp = /(=)\?(?=&|$)|\?\?/;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+    jsonp: "callback",
+    jsonpCallback: function() {
+        var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
+        this[ callback ] = true;
+        return callback;
+    }
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+    var callbackName, overwritten, responseContainer,
+        jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
+            "url" :
+            typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
+        );
+
+    // Handle iff the expected data type is "jsonp" or we have a parameter to set
+    if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+
+        // Get callback name, remembering preexisting value associated with it
+        callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+            s.jsonpCallback() :
+            s.jsonpCallback;
+
+        // Insert callback into url or form data
+        if ( jsonProp ) {
+            s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
+        } else if ( s.jsonp !== false ) {
+            s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
+        }
+
+        // Use data converter to retrieve json after script execution
+        s.converters["script json"] = function() {
+            if ( !responseContainer ) {
+                jQuery.error( callbackName + " was not called" );
+            }
+            return responseContainer[ 0 ];
+        };
+
+        // force json dataType
+        s.dataTypes[ 0 ] = "json";
+
+        // Install callback
+        overwritten = window[ callbackName ];
+        window[ callbackName ] = function() {
+            responseContainer = arguments;
+        };
+
+        // Clean-up function (fires after converters)
+        jqXHR.always(function() {
+            // Restore preexisting value
+            window[ callbackName ] = overwritten;
+
+            // Save back as free
+            if ( s[ callbackName ] ) {
+                // make sure that re-using the options doesn't screw things around
+                s.jsonpCallback = originalSettings.jsonpCallback;
+
+                // save the callback name for future use
+                oldCallbacks.push( callbackName );
+            }
+
+            // Call if it was a function and we have a response
+            if ( responseContainer && jQuery.isFunction( overwritten ) ) {
+                overwritten( responseContainer[ 0 ] );
+            }
+
+            responseContainer = overwritten = undefined;
+        });
+
+        // Delegate to script
+        return "script";
+    }
+});
+var xhrCallbacks, xhrSupported,
+    xhrId = 0,
+    // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+    xhrOnUnloadAbort = window.ActiveXObject && function() {
+        // Abort all pending requests
+        var key;
+        for ( key in xhrCallbacks ) {
+            xhrCallbacks[ key ]( undefined, true );
+        }
+    };
+
+// Functions to create xhrs
+function createStandardXHR() {
+    try {
+        return new window.XMLHttpRequest();
+    } catch( e ) {}
+}
+
+function createActiveXHR() {
+    try {
+        return new window.ActiveXObject("Microsoft.XMLHTTP");
+    } catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+    /* Microsoft failed to properly
+     * implement the XMLHttpRequest in IE7 (can't request local files),
+     * so we use the ActiveXObject when it is available
+     * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+     * we need a fallback.
+     */
+    function() {
+        return !this.isLocal && createStandardXHR() || createActiveXHR();
+    } :
+    // For all other browsers, use the standard XMLHttpRequest object
+    createStandardXHR;
+
+// Determine support properties
+xhrSupported = jQuery.ajaxSettings.xhr();
+jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
+xhrSupported = jQuery.support.ajax = !!xhrSupported;
+
+// Create transport if the browser can provide an xhr
+if ( xhrSupported ) {
+
+    jQuery.ajaxTransport(function( s ) {
+        // Cross domain only allowed if supported through XMLHttpRequest
+        if ( !s.crossDomain || jQuery.support.cors ) {
+
+            var callback;
+
+            return {
+                send: function( headers, complete ) {
+
+                    // Get a new xhr
+                    var handle, i,
+                        xhr = s.xhr();
+
+                    // Open the socket
+                    // Passing null username, generates a login popup on Opera (#2865)
+                    if ( s.username ) {
+                        xhr.open( s.type, s.url, s.async, s.username, s.password );
+                    } else {
+                        xhr.open( s.type, s.url, s.async );
+                    }
+
+                    // Apply custom fields if provided
+                    if ( s.xhrFields ) {
+                        for ( i in s.xhrFields ) {
+                            xhr[ i ] = s.xhrFields[ i ];
+                        }
+                    }
+
+                    // Override mime type if needed
+                    if ( s.mimeType && xhr.overrideMimeType ) {
+                        xhr.overrideMimeType( s.mimeType );
+                    }
+
+                    // X-Requested-With header
+                    // For cross-domain requests, seeing as conditions for a preflight are
+                    // akin to a jigsaw puzzle, we simply never set it to be sure.
+                    // (it can always be set on a per-request basis or even using ajaxSetup)
+                    // For same-domain requests, won't change header if already provided.
+                    if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+                        headers["X-Requested-With"] = "XMLHttpRequest";
+                    }
+
+                    // Need an extra try/catch for cross domain requests in Firefox 3
+                    try {
+                        for ( i in headers ) {
+                            xhr.setRequestHeader( i, headers[ i ] );
+                        }
+                    } catch( err ) {}
+
+                    // Do send the request
+                    // This may raise an exception which is actually
+                    // handled in jQuery.ajax (so no try/catch here)
+                    xhr.send( ( s.hasContent && s.data ) || null );
+
+                    // Listener
+                    callback = function( _, isAbort ) {
+
+                        var status,
+                            statusText,
+                            responseHeaders,
+                            responses,
+                            xml;
+
+                        // Firefox throws exceptions when accessing properties
+                        // of an xhr when a network error occurred
+                        // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+                        try {
+
+                            // Was never called and is aborted or complete
+                            if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+                                // Only called once
+                                callback = undefined;
+
+                                // Do not keep as active anymore
+                                if ( handle ) {
+                                    xhr.onreadystatechange = jQuery.noop;
+                                    if ( xhrOnUnloadAbort ) {
+                                        delete xhrCallbacks[ handle ];
+                                    }
+                                }
+
+                                // If it's an abort
+                                if ( isAbort ) {
+                                    // Abort it manually if needed
+                                    if ( xhr.readyState !== 4 ) {
+                                        xhr.abort();
+                                    }
+                                } else {
+                                    responses = {};
+                                    status = xhr.status;
+                                    xml = xhr.responseXML;
+                                    responseHeaders = xhr.getAllResponseHeaders();
+
+                                    // Construct response list
+                                    if ( xml && xml.documentElement /* #4958 */ ) {
+                                        responses.xml = xml;
+                                    }
+
+                                    // When requesting binary data, IE6-9 will throw an exception
+                                    // on any attempt to access responseText (#11426)
+                                    if ( typeof xhr.responseText === "string" ) {
+                                        responses.text = xhr.responseText;
+                                    }
+
+                                    // Firefox throws an exception when accessing
+                                    // statusText for faulty cross-domain requests
+                                    try {
+                                        statusText = xhr.statusText;
+                                    } catch( e ) {
+                                        // We normalize with Webkit giving an empty statusText
+                                        statusText = "";
+                                    }
+
+                                    // Filter status for non standard behaviors
+
+                                    // If the request is local and we have data: assume a success
+                                    // (success with no data won't get notified, that's the best we
+                                    // can do given current implementations)
+                                    if ( !status && s.isLocal && !s.crossDomain ) {
+                                        status = responses.text ? 200 : 404;
+                                    // IE - #1450: sometimes returns 1223 when it should be 204
+                                    } else if ( status === 1223 ) {
+                                        status = 204;
+                                    }
+                                }
+                            }
+                        } catch( firefoxAccessException ) {
+                            if ( !isAbort ) {
+                                complete( -1, firefoxAccessException );
+                            }
+                        }
+
+                        // Call complete if needed
+                        if ( responses ) {
+                            complete( status, statusText, responses, responseHeaders );
+                        }
+                    };
+
+                    if ( !s.async ) {
+                        // if we're in sync mode we fire the callback
+                        callback();
+                    } else if ( xhr.readyState === 4 ) {
+                        // (IE6 & IE7) if it's in cache and has been
+                        // retrieved directly we need to fire the callback
+                        setTimeout( callback );
+                    } else {
+                        handle = ++xhrId;
+                        if ( xhrOnUnloadAbort ) {
+                            // Create the active xhrs callbacks list if needed
+                            // and attach the unload handler
+                            if ( !xhrCallbacks ) {
+                                xhrCallbacks = {};
+                                jQuery( window ).unload( xhrOnUnloadAbort );
+                            }
+                            // Add to list of active xhrs callbacks
+                            xhrCallbacks[ handle ] = callback;
+                        }
+                        xhr.onreadystatechange = callback;
+                    }
+                },
+
+                abort: function() {
+                    if ( callback ) {
+                        callback( undefined, true );
+                    }
+                }
+            };
+        }
+    });
+}
+var fxNow, timerId,
+    rfxtypes = /^(?:toggle|show|hide)$/,
+    rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
+    rrun = /queueHooks$/,
+    animationPrefilters = [ defaultPrefilter ],
+    tweeners = {
+        "*": [function( prop, value ) {
+            var end, unit,
+                tween = this.createTween( prop, value ),
+                parts = rfxnum.exec( value ),
+                target = tween.cur(),
+                start = +target || 0,
+                scale = 1,
+                maxIterations = 20;
+
+            if ( parts ) {
+                end = +parts[2];
+                unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+
+                // We need to compute starting value
+                if ( unit !== "px" && start ) {
+                    // Iteratively approximate from a nonzero starting point
+                    // Prefer the current property, because this process will be trivial if it uses the same units
+                    // Fallback to end or a simple constant
+                    start = jQuery.css( tween.elem, prop, true ) || end || 1;
+
+                    do {
+                        // If previous iteration zeroed out, double until we get *something*
+                        // Use a string for doubling factor so we don't accidentally see scale as unchanged below
+                        scale = scale || ".5";
+
+                        // Adjust and apply
+                        start = start / scale;
+                        jQuery.style( tween.elem, prop, start + unit );
+
+                    // Update scale, tolerating zero or NaN from tween.cur()
+                    // And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+                    } while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
+                }
+
+                tween.unit = unit;
+                tween.start = start;
+                // If a +=/-= token was provided, we're doing a relative animation
+                tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
+            }
+            return tween;
+        }]
+    };
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+    setTimeout(function() {
+        fxNow = undefined;
+    });
+    return ( fxNow = jQuery.now() );
+}
+
+function createTweens( animation, props ) {
+    jQuery.each( props, function( prop, value ) {
+        var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
+            index = 0,
+            length = collection.length;
+        for ( ; index < length; index++ ) {
+            if ( collection[ index ].call( animation, prop, value ) ) {
+
+                // we're done with this property
+                return;
+            }
+        }
+    });
+}
+
+function Animation( elem, properties, options ) {
+    var result,
+        stopped,
+        index = 0,
+        length = animationPrefilters.length,
+        deferred = jQuery.Deferred().always( function() {
+            // don't match elem in the :animated selector
+            delete tick.elem;
+        }),
+        tick = function() {
+            if ( stopped ) {
+                return false;
+            }
+            var currentTime = fxNow || createFxNow(),
+                remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
+                // archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+                temp = remaining / animation.duration || 0,
+                percent = 1 - temp,
+                index = 0,
+                length = animation.tweens.length;
+
+            for ( ; index < length ; index++ ) {
+                animation.tweens[ index ].run( percent );
+            }
+
+            deferred.notifyWith( elem, [ animation, percent, remaining ]);
+
+            if ( percent < 1 && length ) {
+                return remaining;
+            } else {
+                deferred.resolveWith( elem, [ animation ] );
+                return false;
+            }
+        },
+        animation = deferred.promise({
+            elem: elem,
+            props: jQuery.extend( {}, properties ),
+            opts: jQuery.extend( true, { specialEasing: {} }, options ),
+            originalProperties: properties,
+            originalOptions: options,
+            startTime: fxNow || createFxNow(),
+            duration: options.duration,
+            tweens: [],
+            createTween: function( prop, end ) {
+                var tween = jQuery.Tween( elem, animation.opts, prop, end,
+                        animation.opts.specialEasing[ prop ] || animation.opts.easing );
+                animation.tweens.push( tween );
+                return tween;
+            },
+            stop: function( gotoEnd ) {
+                var index = 0,
+                    // if we are going to the end, we want to run all the tweens
+                    // otherwise we skip this part
+                    length = gotoEnd ? animation.tweens.length : 0;
+                if ( stopped ) {
+                    return this;
+                }
+                stopped = true;
+                for ( ; index < length ; index++ ) {
+                    animation.tweens[ index ].run( 1 );
+                }
+
+                // resolve when we played the last frame
+                // otherwise, reject
+                if ( gotoEnd ) {
+                    deferred.resolveWith( elem, [ animation, gotoEnd ] );
+                } else {
+                    deferred.rejectWith( elem, [ animation, gotoEnd ] );
+                }
+                return this;
+            }
+        }),
+        props = animation.props;
+
+    propFilter( props, animation.opts.specialEasing );
+
+    for ( ; index < length ; index++ ) {
+        result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
+        if ( result ) {
+            return result;
+        }
+    }
+
+    createTweens( animation, props );
+
+    if ( jQuery.isFunction( animation.opts.start ) ) {
+        animation.opts.start.call( elem, animation );
+    }
+
+    jQuery.fx.timer(
+        jQuery.extend( tick, {
+            elem: elem,
+            anim: animation,
+            queue: animation.opts.queue
+        })
+    );
+
+    // attach callbacks from options
+    return animation.progress( animation.opts.progress )
+        .done( animation.opts.done, animation.opts.complete )
+        .fail( animation.opts.fail )
+        .always( animation.opts.always );
+}
+
+function propFilter( props, specialEasing ) {
+    var index, name, easing, value, hooks;
+
+    // camelCase, specialEasing and expand cssHook pass
+    for ( index in props ) {
+        name = jQuery.camelCase( index );
+        easing = specialEasing[ name ];
+        value = props[ index ];
+        if ( jQuery.isArray( value ) ) {
+            easing = value[ 1 ];
+            value = props[ index ] = value[ 0 ];
+        }
+
+        if ( index !== name ) {
+            props[ name ] = value;
+            delete props[ index ];
+        }
+
+        hooks = jQuery.cssHooks[ name ];
+        if ( hooks && "expand" in hooks ) {
+            value = hooks.expand( value );
+            delete props[ name ];
+
+            // not quite $.extend, this wont overwrite keys already present.
+            // also - reusing 'index' from above because we have the correct "name"
+            for ( index in value ) {
+                if ( !( index in props ) ) {
+                    props[ index ] = value[ index ];
+                    specialEasing[ index ] = easing;
+                }
+            }
+        } else {
+            specialEasing[ name ] = easing;
+        }
+    }
+}
+
+jQuery.Animation = jQuery.extend( Animation, {
+
+    tweener: function( props, callback ) {
+        if ( jQuery.isFunction( props ) ) {
+            callback = props;
+            props = [ "*" ];
+        } else {
+            props = props.split(" ");
+        }
+
+        var prop,
+            index = 0,
+            length = props.length;
+
+        for ( ; index < length ; index++ ) {
+            prop = props[ index ];
+            tweeners[ prop ] = tweeners[ prop ] || [];
+            tweeners[ prop ].unshift( callback );
+        }
+    },
+
+    prefilter: function( callback, prepend ) {
+        if ( prepend ) {
+            animationPrefilters.unshift( callback );
+        } else {
+            animationPrefilters.push( callback );
+        }
+    }
+});
+
+function defaultPrefilter( elem, props, opts ) {
+    /*jshint validthis:true */
+    var index, prop, value, length, dataShow, toggle, tween, hooks, oldfire,
+        anim = this,
+        style = elem.style,
+        orig = {},
+        handled = [],
+        hidden = elem.nodeType && isHidden( elem );
+
+    // handle queue: false promises
+    if ( !opts.queue ) {
+        hooks = jQuery._queueHooks( elem, "fx" );
+        if ( hooks.unqueued == null ) {
+            hooks.unqueued = 0;
+            oldfire = hooks.empty.fire;
+            hooks.empty.fire = function() {
+                if ( !hooks.unqueued ) {
+                    oldfire();
+                }
+            };
+        }
+        hooks.unqueued++;
+
+        anim.always(function() {
+            // doing this makes sure that the complete handler will be called
+            // before this completes
+            anim.always(function() {
+                hooks.unqueued--;
+                if ( !jQuery.queue( elem, "fx" ).length ) {
+                    hooks.empty.fire();
+                }
+            });
+        });
+    }
+
+    // height/width overflow pass
+    if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+        // Make sure that nothing sneaks out
+        // Record all 3 overflow attributes because IE does not
+        // change the overflow attribute when overflowX and
+        // overflowY are set to the same value
+        opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
+
+        // Set display property to inline-block for height/width
+        // animations on inline elements that are having width/height animated
+        if ( jQuery.css( elem, "display" ) === "inline" &&
+                jQuery.css( elem, "float" ) === "none" ) {
+
+            // inline-level elements accept inline-block;
+            // block-level elements need to be inline with layout
+            if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
+                style.display = "inline-block";
+
+            } else {
+                style.zoom = 1;
+            }
+        }
+    }
+
+    if ( opts.overflow ) {
+        style.overflow = "hidden";
+        if ( !jQuery.support.shrinkWrapBlocks ) {
+            anim.done(function() {
+                style.overflow = opts.overflow[ 0 ];
+                style.overflowX = opts.overflow[ 1 ];
+                style.overflowY = opts.overflow[ 2 ];
+            });
+        }
+    }
+
+
+    // show/hide pass
+    for ( index in props ) {
+        value = props[ index ];
+        if ( rfxtypes.exec( value ) ) {
+            delete props[ index ];
+            toggle = toggle || value === "toggle";
+            if ( value === ( hidden ? "hide" : "show" ) ) {
+                continue;
+            }
+            handled.push( index );
+        }
+    }
+
+    length = handled.length;
+    if ( length ) {
+        dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
+        if ( "hidden" in dataShow ) {
+            hidden = dataShow.hidden;
+        }
+
+        // store state if its toggle - enables .stop().toggle() to "reverse"
+        if ( toggle ) {
+            dataShow.hidden = !hidden;
+        }
+        if ( hidden ) {
+            jQuery( elem ).show();
+        } else {
+            anim.done(function() {
+                jQuery( elem ).hide();
+            });
+        }
+        anim.done(function() {
+            var prop;
+            jQuery._removeData( elem, "fxshow" );
+            for ( prop in orig ) {
+                jQuery.style( elem, prop, orig[ prop ] );
+            }
+        });
+        for ( index = 0 ; index < length ; index++ ) {
+            prop = handled[ index ];
+            tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
+            orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
+
+            if ( !( prop in dataShow ) ) {
+                dataShow[ prop ] = tween.start;
+                if ( hidden ) {
+                    tween.end = tween.start;
+                    tween.start = prop === "width" || prop === "height" ? 1 : 0;
+                }
+            }
+        }
+    }
+}
+
+function Tween( elem, options, prop, end, easing ) {
+    return new Tween.prototype.init( elem, options, prop, end, easing );
+}
+jQuery.Tween = Tween;
+
+Tween.prototype = {
+    constructor: Tween,
+    init: function( elem, options, prop, end, easing, unit ) {
+        this.elem = elem;
+        this.prop = prop;
+        this.easing = easing || "swing";
+        this.options = options;
+        this.start = this.now = this.cur();
+        this.end = end;
+        this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
+    },
+    cur: function() {
+        var hooks = Tween.propHooks[ this.prop ];
+
+        return hooks && hooks.get ?
+            hooks.get( this ) :
+            Tween.propHooks._default.get( this );
+    },
+    run: function( percent ) {
+        var eased,
+            hooks = Tween.propHooks[ this.prop ];
+
+        if ( this.options.duration ) {
+            this.pos = eased = jQuery.easing[ this.easing ](
+                percent, this.options.duration * percent, 0, 1, this.options.duration
+            );
+        } else {
+            this.pos = eased = percent;
+        }
+        this.now = ( this.end - this.start ) * eased + this.start;
+
+        if ( this.options.step ) {
+            this.options.step.call( this.elem, this.now, this );
+        }
+
+        if ( hooks && hooks.set ) {
+            hooks.set( this );
+        } else {
+            Tween.propHooks._default.set( this );
+        }
+        return this;
+    }
+};
+
+Tween.prototype.init.prototype = Tween.prototype;
+
+Tween.propHooks = {
+    _default: {
+        get: function( tween ) {
+            var result;
+
+            if ( tween.elem[ tween.prop ] != null &&
+                (!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
+                return tween.elem[ tween.prop ];
+            }
+
+            // passing a non empty string as a 3rd parameter to .css will automatically
+            // attempt a parseFloat and fallback to a string if the parse fails
+            // so, simple values such as "10px" are parsed to Float.
+            // complex values such as "rotate(1rad)" are returned as is.
+            result = jQuery.css( tween.elem, tween.prop, "auto" );
+            // Empty strings, null, undefined and "auto" are converted to 0.
+            return !result || result === "auto" ? 0 : result;
+        },
+        set: function( tween ) {
+            // use step hook for back compat - use cssHook if its there - use .style if its
+            // available and use plain properties where available
+            if ( jQuery.fx.step[ tween.prop ] ) {
+                jQuery.fx.step[ tween.prop ]( tween );
+            } else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
+                jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
+            } else {
+                tween.elem[ tween.prop ] = tween.now;
+            }
+        }
+    }
+};
+
+// Remove in 2.0 - this supports IE8's panic based approach
+// to setting things on disconnected nodes
+
+Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+    set: function( tween ) {
+        if ( tween.elem.nodeType && tween.elem.parentNode ) {
+            tween.elem[ tween.prop ] = tween.now;
+        }
+    }
+};
+
+jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
+    var cssFn = jQuery.fn[ name ];
+    jQuery.fn[ name ] = function( speed, easing, callback ) {
+        return speed == null || typeof speed === "boolean" ?
+            cssFn.apply( this, arguments ) :
+            this.animate( genFx( name, true ), speed, easing, callback );
+    };
+});
+
+jQuery.fn.extend({
+    fadeTo: function( speed, to, easing, callback ) {
+
+        // show any hidden elements after setting opacity to 0
+        return this.filter( isHidden ).css( "opacity", 0 ).show()
+
+            // animate to the value specified
+            .end().animate({ opacity: to }, speed, easing, callback );
+    },
+    animate: function( prop, speed, easing, callback ) {
+        var empty = jQuery.isEmptyObject( prop ),
+            optall = jQuery.speed( speed, easing, callback ),
+            doAnimation = function() {
+                // Operate on a copy of prop so per-property easing won't be lost
+                var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+                doAnimation.finish = function() {
+                    anim.stop( true );
+                };
+                // Empty animations, or finishing resolves immediately
+                if ( empty || jQuery._data( this, "finish" ) ) {
+                    anim.stop( true );
+                }
+            };
+            doAnimation.finish = doAnimation;
+
+        return empty || optall.queue === false ?
+            this.each( doAnimation ) :
+            this.queue( optall.queue, doAnimation );
+    },
+    stop: function( type, clearQueue, gotoEnd ) {
+        var stopQueue = function( hooks ) {
+            var stop = hooks.stop;
+            delete hooks.stop;
+            stop( gotoEnd );
+        };
+
+        if ( typeof type !== "string" ) {
+            gotoEnd = clearQueue;
+            clearQueue = type;
+            type = undefined;
+        }
+        if ( clearQueue && type !== false ) {
+            this.queue( type || "fx", [] );
+        }
+
+        return this.each(function() {
+            var dequeue = true,
+                index = type != null && type + "queueHooks",
+                timers = jQuery.timers,
+                data = jQuery._data( this );
+
+            if ( index ) {
+                if ( data[ index ] && data[ index ].stop ) {
+                    stopQueue( data[ index ] );
+                }
+            } else {
+                for ( index in data ) {
+                    if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
+                        stopQueue( data[ index ] );
+                    }
+                }
+            }
+
+            for ( index = timers.length; index--; ) {
+                if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+                    timers[ index ].anim.stop( gotoEnd );
+                    dequeue = false;
+                    timers.splice( index, 1 );
+                }
+            }
+
+            // start the next in the queue if the last step wasn't forced
+            // timers currently will call their complete callbacks, which will dequeue
+            // but only if they were gotoEnd
+            if ( dequeue || !gotoEnd ) {
+                jQuery.dequeue( this, type );
+            }
+        });
+    },
+    finish: function( type ) {
+        if ( type !== false ) {
+            type = type || "fx";
+        }
+        return this.each(function() {
+            var index,
+                data = jQuery._data( this ),
+                queue = data[ type + "queue" ],
+                hooks = data[ type + "queueHooks" ],
+                timers = jQuery.timers,
+                length = queue ? queue.length : 0;
+
+            // enable finishing flag on private data
+            data.finish = true;
+
+            // empty the queue first
+            jQuery.queue( this, type, [] );
+
+            if ( hooks && hooks.cur && hooks.cur.finish ) {
+                hooks.cur.finish.call( this );
+            }
+
+            // look for any active animations, and finish them
+            for ( index = timers.length; index--; ) {
+                if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
+                    timers[ index ].anim.stop( true );
+                    timers.splice( index, 1 );
+                }
+            }
+
+            // look for any animations in the old queue and finish them
+            for ( index = 0; index < length; index++ ) {
+                if ( queue[ index ] && queue[ index ].finish ) {
+                    queue[ index ].finish.call( this );
+                }
+            }
+
+            // turn off finishing flag
+            delete data.finish;
+        });
+    }
+});
+
+// Generate parameters to create a standard animation
+function genFx( type, includeWidth ) {
+    var which,
+        attrs = { height: type },
+        i = 0;
+
+    // if we include width, step value is 1 to do all cssExpand values,
+    // if we don't include width, step value is 2 to skip over Left and Right
+    includeWidth = includeWidth? 1 : 0;
+    for( ; i < 4 ; i += 2 - includeWidth ) {
+        which = cssExpand[ i ];
+        attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
+    }
+
+    if ( includeWidth ) {
+        attrs.opacity = attrs.width = type;
+    }
+
+    return attrs;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+    slideDown: genFx("show"),
+    slideUp: genFx("hide"),
+    slideToggle: genFx("toggle"),
+    fadeIn: { opacity: "show" },
+    fadeOut: { opacity: "hide" },
+    fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+    jQuery.fn[ name ] = function( speed, easing, callback ) {
+        return this.animate( props, speed, easing, callback );
+    };
+});
+
+jQuery.speed = function( speed, easing, fn ) {
+    var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+        complete: fn || !fn && easing ||
+            jQuery.isFunction( speed ) && speed,
+        duration: speed,
+        easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+    };
+
+    opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+        opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+    // normalize opt.queue - true/undefined/null -> "fx"
+    if ( opt.queue == null || opt.queue === true ) {
+        opt.queue = "fx";
+    }
+
+    // Queueing
+    opt.old = opt.complete;
+
+    opt.complete = function() {
+        if ( jQuery.isFunction( opt.old ) ) {
+            opt.old.call( this );
+        }
+
+        if ( opt.queue ) {
+            jQuery.dequeue( this, opt.queue );
+        }
+    };
+
+    return opt;
+};
+
+jQuery.easing = {
+    linear: function( p ) {
+        return p;
+    },
+    swing: function( p ) {
+        return 0.5 - Math.cos( p*Math.PI ) / 2;
+    }
+};
+
+jQuery.timers = [];
+jQuery.fx = Tween.prototype.init;
+jQuery.fx.tick = function() {
+    var timer,
+        timers = jQuery.timers,
+        i = 0;
+
+    fxNow = jQuery.now();
+
+    for ( ; i < timers.length; i++ ) {
+        timer = timers[ i ];
+        // Checks the timer has not already been removed
+        if ( !timer() && timers[ i ] === timer ) {
+            timers.splice( i--, 1 );
+        }
+    }
+
+    if ( !timers.length ) {
+        jQuery.fx.stop();
+    }
+    fxNow = undefined;
+};
+
+jQuery.fx.timer = function( timer ) {
+    if ( timer() && jQuery.timers.push( timer ) ) {
+        jQuery.fx.start();
+    }
+};
+
+jQuery.fx.interval = 13;
+
+jQuery.fx.start = function() {
+    if ( !timerId ) {
+        timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+    }
+};
+
+jQuery.fx.stop = function() {
+    clearInterval( timerId );
+    timerId = null;
+};
+
+jQuery.fx.speeds = {
+    slow: 600,
+    fast: 200,
+    // Default speed
+    _default: 400
+};
+
+// Back Compat <1.8 extension point
+jQuery.fx.step = {};
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+    jQuery.expr.filters.animated = function( elem ) {
+        return jQuery.grep(jQuery.timers, function( fn ) {
+            return elem === fn.elem;
+        }).length;
+    };
+}
+jQuery.fn.offset = function( options ) {
+    if ( arguments.length ) {
+        return options === undefined ?
+            this :
+            this.each(function( i ) {
+                jQuery.offset.setOffset( this, options, i );
+            });
+    }
+
+    var docElem, win,
+        box = { top: 0, left: 0 },
+        elem = this[ 0 ],
+        doc = elem && elem.ownerDocument;
+
+    if ( !doc ) {
+        return;
+    }
+
+    docElem = doc.documentElement;
+
+    // Make sure it's not a disconnected DOM node
+    if ( !jQuery.contains( docElem, elem ) ) {
+        return box;
+    }
+
+    // If we don't have gBCR, just use 0,0 rather than error
+    // BlackBerry 5, iOS 3 (original iPhone)
+    if ( typeof elem.getBoundingClientRect !== "undefined" ) {
+        box = elem.getBoundingClientRect();
+    }
+    win = getWindow( doc );
+    return {
+        top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
+        left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+    };
+};
+
+jQuery.offset = {
+
+    setOffset: function( elem, options, i ) {
+        var position = jQuery.css( elem, "position" );
+
+        // set position first, in-case top/left are set even on static elem
+        if ( position === "static" ) {
+            elem.style.position = "relative";
+        }
+
+        var curElem = jQuery( elem ),
+            curOffset = curElem.offset(),
+            curCSSTop = jQuery.css( elem, "top" ),
+            curCSSLeft = jQuery.css( elem, "left" ),
+            calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+            props = {}, curPosition = {}, curTop, curLeft;
+
+        // need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+        if ( calculatePosition ) {
+            curPosition = curElem.position();
+            curTop = curPosition.top;
+            curLeft = curPosition.left;
+        } else {
+            curTop = parseFloat( curCSSTop ) || 0;
+            curLeft = parseFloat( curCSSLeft ) || 0;
+        }
+
+        if ( jQuery.isFunction( options ) ) {
+            options = options.call( elem, i, curOffset );
+        }
+
+        if ( options.top != null ) {
+            props.top = ( options.top - curOffset.top ) + curTop;
+        }
+        if ( options.left != null ) {
+            props.left = ( options.left - curOffset.left ) + curLeft;
+        }
+
+        if ( "using" in options ) {
+            options.using.call( elem, props );
+        } else {
+            curElem.css( props );
+        }
+    }
+};
+
+
+jQuery.fn.extend({
+
+    position: function() {
+        if ( !this[ 0 ] ) {
+            return;
+        }
+
+        var offsetParent, offset,
+            parentOffset = { top: 0, left: 0 },
+            elem = this[ 0 ];
+
+        // fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+        if ( jQuery.css( elem, "position" ) === "fixed" ) {
+            // we assume that getBoundingClientRect is available when computed position is fixed
+            offset = elem.getBoundingClientRect();
+        } else {
+            // Get *real* offsetParent
+            offsetParent = this.offsetParent();
+
+            // Get correct offsets
+            offset = this.offset();
+            if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
+                parentOffset = offsetParent.offset();
+            }
+
+            // Add offsetParent borders
+            parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
+            parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+        }
+
+        // Subtract parent offsets and element margins
+        // note: when an element has margin: auto the offsetLeft and marginLeft
+        // are the same in Safari causing offset.left to incorrectly be 0
+        return {
+            top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
+            left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
+        };
+    },
+
+    offsetParent: function() {
+        return this.map(function() {
+            var offsetParent = this.offsetParent || document.documentElement;
+            while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
+                offsetParent = offsetParent.offsetParent;
+            }
+            return offsetParent || document.documentElement;
+        });
+    }
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
+    var top = /Y/.test( prop );
+
+    jQuery.fn[ method ] = function( val ) {
+        return jQuery.access( this, function( elem, method, val ) {
+            var win = getWindow( elem );
+
+            if ( val === undefined ) {
+                return win ? (prop in win) ? win[ prop ] :
+                    win.document.documentElement[ method ] :
+                    elem[ method ];
+            }
+
+            if ( win ) {
+                win.scrollTo(
+                    !top ? val : jQuery( win ).scrollLeft(),
+                    top ? val : jQuery( win ).scrollTop()
+                );
+
+            } else {
+                elem[ method ] = val;
+            }
+        }, method, val, arguments.length, null );
+    };
+});
+
+function getWindow( elem ) {
+    return jQuery.isWindow( elem ) ?
+        elem :
+        elem.nodeType === 9 ?
+            elem.defaultView || elem.parentWindow :
+            false;
+}
+// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
+jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
+    jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
+        // margin is only for outerHeight, outerWidth
+        jQuery.fn[ funcName ] = function( margin, value ) {
+            var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
+                extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
+
+            return jQuery.access( this, function( elem, type, value ) {
+                var doc;
+
+                if ( jQuery.isWindow( elem ) ) {
+                    // As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+                    // isn't a whole lot we can do. See pull request at this URL for discussion:
+                    // https://github.com/jquery/jquery/pull/764
+                    return elem.document.documentElement[ "client" + name ];
+                }
+
+                // Get document width or height
+                if ( elem.nodeType === 9 ) {
+                    doc = elem.documentElement;
+
+                    // Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+                    // unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+                    return Math.max(
+                        elem.body[ "scroll" + name ], doc[ "scroll" + name ],
+                        elem.body[ "offset" + name ], doc[ "offset" + name ],
+                        doc[ "client" + name ]
+                    );
+                }
+
+                return value === undefined ?
+                    // Get width or height on the element, requesting but not forcing parseFloat
+                    jQuery.css( elem, type, extra ) :
+
+                    // Set width or height on the element
+                    jQuery.style( elem, type, value, extra );
+            }, type, chainable ? margin : undefined, chainable, null );
+        };
+    });
+});
+// Limit scope pollution from any deprecated API
+// (function() {
+
+// })();
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+// Expose jQuery as an AMD module, but only for AMD loaders that
+// understand the issues with loading multiple versions of jQuery
+// in a page that all might call define(). The loader will indicate
+// they have special allowances for multiple jQuery versions by
+// specifying define.amd.jQuery = true. Register as a named module,
+// since jQuery can be concatenated with other files that may use define,
+// but not use a proper concatenation script that understands anonymous
+// AMD modules. A named AMD is safest and most robust way to register.
+// Lowercase jquery is used because AMD module names are derived from
+// file names, and jQuery is normally delivered in a lowercase file name.
+// Do this after creating the global so that if an AMD module wants to call
+// noConflict to hide this version of jQuery, it will work.
+if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+    define( "jquery", [], function () { return jQuery; } );
+}
+
+})( window );
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/js/livesupport.js b/addons/im_livechat/static/ext/static/js/livesupport.js
new file mode 100644
index 00000000000..c45e9588c83
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/livesupport.js
@@ -0,0 +1,453 @@
+
+define(["nova", "underscore", "oeclient", "require", "jquery",
+        "jquery.achtung"], function(nova, _, oeclient, require, $) {
+    var livesupport = {};
+
+    var templateEngine = new nova.TemplateEngine();
+    templateEngine.extendEnvironment({"toUrl": _.bind(require.toUrl, require)});
+    var connection;
+
+    var defaultInputPlaceholder;
+    var userName;
+
+    livesupport.main = function(server_url, db, login, password, channel, options) {
+        var defs = [];
+        options = options || {};
+        _.defaults(options, {
+            buttonText: "Chat with one of our collaborators",
+            inputPlaceholder: "How may I help you?",
+            defaultMessage: null,
+            auto: false,
+            userName: "Anonymous",
+        });
+        defaultInputPlaceholder = options.inputPlaceholder;
+        userName = options.userName;
+        defs.push($.ajax({
+            url: require.toUrl("./livesupport_templates.js"),
+            jsonp: false,
+            jsonpCallback: "oe_livesupport_templates_callback",
+            dataType: "jsonp",
+            cache: true,
+        }).then(function(content) {
+            return templateEngine.loadFileContent(content);
+        }));
+        defs.push(add_css("../css/livesupport.css"));
+        defs.push(add_css("./jquery.achtung.css"));
+
+        $.when.apply($, defs).then(function() {
+            console.log("starting live support customer app");
+            connection = new oeclient.Connection(new oeclient.JsonpRPCConnector(server_url), db, login, password);
+            connection.connector.call("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
+                if (! activated & ! options.auto)
+                    return;
+                var button = new livesupport.ChatButton(null, channel, options);
+                button.appendTo($("body"));
+                if (options.auto)
+                    button.click();
+            });
+        });
+    };
+
+    var add_css = function(relative_file_name) {
+        var css_def = $.Deferred();
+        $('<link rel="stylesheet" href="' + require.toUrl(relative_file_name) + '"></link>')
+                .appendTo($("head")).ready(function() {
+            css_def.resolve();
+        });
+        return css_def.promise();
+    };
+
+    var notification = function(message) {
+        $.achtung({message: message, timeout: 0, showEffects: false, hideEffects: false});
+    };
+
+    var ERROR_DELAY = 5000;
+
+    livesupport.ChatButton = nova.Widget.$extend({
+        className: "openerp_style oe_chat_button",
+        events: {
+            "click": "click",
+        },
+        __init__: function(parent, channel, options) {
+            this.$super(parent);
+            this.channel = channel;
+            this.options = options;
+            this.text = options.buttonText;
+        },
+        render: function() {
+            this.$().append(templateEngine.chatButton({widget: this}));
+        },
+        click: function() {
+            if (! this.manager) {
+                this.manager = new livesupport.ConversationManager(null);
+                this.activated_def = this.manager.start_polling();
+            }
+            var def = $.Deferred();
+            $.when(this.activated_def).then(function() {
+                def.resolve();
+            }, function() {
+                def.reject();
+            });
+            setTimeout(function() {
+                def.reject();
+            }, 5000);
+            def.then(_.bind(this.chat, this), function() {
+                notification("It seems the connection to the server is encountering problems, please try again later.");
+            });
+        },
+        chat: function() {
+            var self = this;
+            if (this.manager.conversations.length > 0)
+                return;
+            connection.getModel("im_livechat.channel").call("get_available_user", [this.channel]).then(function(user_id) {
+                if (! user_id) {
+                    notification("None of our collaborators seems to be available, please try again later.");
+                    return;
+                }
+                self.manager.ensure_users([user_id]).then(function() {
+                    var conv = self.manager.activate_user(self.manager.get_user(user_id), true);
+                    if (self.options.defaultMessage) {
+                        conv.received_message({message: self.options.defaultMessage, 
+                            date: oeclient.datetime_to_str(new Date())});
+                    }
+                });
+            });
+        },
+    });
+
+    livesupport.ImUser = nova.Class.$extend({
+        __include__: [nova.DynamicProperties],
+        __init__: function(parent, user_rec) {
+            nova.DynamicProperties.__init__.call(this, parent);
+            user_rec.image_url = require.toUrl("../img/avatar/avatar.jpeg");
+            if (user_rec.image)
+                user_rec.image_url = "data:image/png;base64," + user_rec.image;
+            this.set(user_rec);
+            this.set("watcher_count", 0);
+            this.on("change:watcher_count", this, function() {
+                if (this.get("watcher_count") === 0)
+                    this.destroy();
+            });
+        },
+        destroy: function() {
+            this.trigger("destroyed");
+            nova.DynamicProperties.destroy.call(this);
+        },
+        add_watcher: function() {
+            this.set("watcher_count", this.get("watcher_count") + 1);
+        },
+        remove_watcher: function() {
+            this.set("watcher_count", this.get("watcher_count") - 1);
+        },
+    });
+
+    livesupport.ConversationManager = nova.Class.$extend({
+        __include__: [nova.DynamicProperties],
+        __init__: function(parent) {
+            nova.DynamicProperties.__init__.call(this, parent);
+            this.set("right_offset", 0);
+            this.conversations = [];
+            this.users = {};
+            this.on("change:right_offset", this, this.calc_positions);
+            this.set("window_focus", true);
+            this.set("waiting_messages", 0);
+            this.focus_hdl = _.bind(function() {
+                this.set("window_focus", true);
+            }, this);
+            $(window).bind("focus", this.focus_hdl);
+            this.blur_hdl = _.bind(function() {
+                this.set("window_focus", false);
+            }, this);
+            $(window).bind("blur", this.blur_hdl);
+            this.on("change:window_focus", this, this.window_focus_change);
+            this.window_focus_change();
+            this.on("change:waiting_messages", this, this.messages_change);
+            this.messages_change();
+            this.create_ting();
+            this.activated = false;
+            this.users_cache = {};
+            this.last = null;
+            this.unload_event_handler = _.bind(this.unload, this);
+        },
+        start_polling: function() {
+            var self = this;
+
+            var uuid = localStorage["oe_livesupport_uuid"];
+            var def = $.when(uuid);
+
+            if (! uuid) {
+                def = connection.connector.call("/longpolling/im/gen_uuid", {});
+            }
+            return def.then(function(uuid) {
+                localStorage["oe_livesupport_uuid"] = uuid;
+                return connection.getModel("im.user").call("get_by_user_id", [uuid]);
+            }).then(function(my_id) {
+                self.my_id = my_id["id"];
+                return connection.getModel("im.user").call("assign_name", [uuid, userName]);
+            }).then(function() {
+                return self.ensure_users([self.my_id])
+            }).then(function() {
+                var me = self.users_cache[self.my_id];
+                delete self.users_cache[self.my_id];
+                self.me = me;
+                me.set("name", "You");
+                return connection.connector.call("/longpolling/im/activated", {});
+            }).then(function(activated) {
+                if (activated) {
+                    self.activated = true;
+                    $(window).on("unload", self.unload_event_handler);
+                    self.poll();
+                } else {
+                    return $.Deferred().reject();
+                }
+            });
+        },
+        unload: function() {
+            connection.getModel("im.user").call("im_disconnect", [], {uuid: this.me.get("uuid"), context: {}});
+        },
+        ensure_users: function(user_ids) {
+            var no_cache = {};
+            _.each(user_ids, function(el) {
+                if (! this.users_cache[el])
+                    no_cache[el] = el;
+            }, this);
+            var self = this;
+            if (_.size(no_cache) === 0)
+                return $.when();
+            else
+                return connection.getModel("im.user").call("read", [_.values(no_cache), []]).then(function(users) {
+                    self.add_to_user_cache(users);
+                });
+        },
+        add_to_user_cache: function(user_recs) {
+            _.each(user_recs, function(user_rec) {
+                if (! this.users_cache[user_rec.id]) {
+                    var user = new livesupport.ImUser(this, user_rec);
+                    this.users_cache[user_rec.id] = user;
+                    user.on("destroyed", this, function() {
+                        delete this.users_cache[user_rec.id];
+                    });
+                }
+            }, this);
+        },
+        get_user: function(user_id) {
+            return this.users_cache[user_id];
+        },
+        poll: function() {
+            console.debug("live support beggin polling");
+            var self = this;
+            var user_ids = _.map(this.users_cache, function(el) {
+                return el.get("id");
+            });
+            connection.connector.call("/longpolling/im/poll", {
+                last: this.last,
+                users_watch: user_ids,
+                db: connection.database,
+                uid: connection.userId,
+                password: connection.password,
+                uuid: self.me.get("uuid"),
+            }).then(function(result) {
+                _.each(result.users_status, function(el) {
+                    if (self.get_user(el.id))
+                        self.get_user(el.id).set(el);
+                });
+                self.last = result.last;
+                var user_ids = _.pluck(_.pluck(result.res, "from_id"), 0);
+                self.ensure_users(user_ids).then(function() {
+                    _.each(result.res, function(mes) {
+                        var user = self.get_user(mes.from_id[0]);
+                        self.received_message(mes, user);
+                    });
+                    self.poll();
+                });
+            }, function() {
+                setTimeout(_.bind(self.poll, self), ERROR_DELAY);
+            });
+        },
+        get_activated: function() {
+            return this.activated;
+        },
+        create_ting: function() {
+            if (typeof(Audio) === "undefined") {
+                this.ting = {play: function() {}};
+                return;
+            }
+            this.ting = new Audio(new Audio().canPlayType("audio/ogg; codecs=vorbis") ?
+                require.toUrl("../audio/Ting.ogg") :
+                require.toUrl("../audio/Ting.mp3")
+            );
+        },
+        window_focus_change: function() {
+            if (this.get("window_focus")) {
+                this.set("waiting_messages", 0);
+            }
+        },
+        messages_change: function() {
+            /*if (! instance.webclient.set_title_part)
+                return;
+            instance.webclient.set_title_part("im_messages", this.get("waiting_messages") === 0 ? undefined :
+                _.str.sprintf(_t("%d Messages"), this.get("waiting_messages")));*/
+        },
+        activate_user: function(user, focus) {
+            var conv = this.users[user.get('id')];
+            if (! conv) {
+                conv = new livesupport.Conversation(this, user, this.me);
+                conv.appendTo($("body"));
+                conv.on("destroyed", this, function() {
+                    this.conversations = _.without(this.conversations, conv);
+                    delete this.users[conv.user.get('id')];
+                    this.calc_positions();
+                });
+                this.conversations.push(conv);
+                this.users[user.get('id')] = conv;
+                this.calc_positions();
+            }
+            if (focus)
+                conv.focus();
+            return conv;
+        },
+        received_message: function(message, user) {
+            if (! this.get("window_focus")) {
+                this.set("waiting_messages", this.get("waiting_messages") + 1);
+                this.ting.play();
+                this.create_ting();
+            }
+            var conv = this.activate_user(user);
+            conv.received_message(message);
+        },
+        calc_positions: function() {
+            var current = this.get("right_offset");
+            _.each(_.range(this.conversations.length), function(i) {
+                this.conversations[i].set("right_position", current);
+                current += this.conversations[i].$().outerWidth(true);
+            }, this);
+        },
+        destroy: function() {
+            $(window).off("unload", this.unload_event_handler);
+            $(window).unbind("blur", this.blur_hdl);
+            $(window).unbind("focus", this.focus_hdl);
+            nova.DynamicProperties.destroy.call(this);
+        },
+    });
+
+    livesupport.Conversation = nova.Widget.$extend({
+        className: "openerp_style oe_im_chatview",
+        events: {
+            "keydown input": "send_message",
+            "click .oe_im_chatview_close": "destroy",
+            "click .oe_im_chatview_header": "show_hide",
+        },
+        __init__: function(parent, user, me) {
+            this.$super(parent);
+            this.me = me;
+            this.user = user;
+            this.user.add_watcher();
+            this.set("right_position", 0);
+            this.shown = true;
+            this.set("pending", 0);
+            this.inputPlaceholder = defaultInputPlaceholder;
+        },
+        render: function() {
+            this.$().append(templateEngine.conversation({widget: this}));
+            var change_status = function() {
+                this.$().toggleClass("oe_im_chatview_disconnected_status", this.user.get("im_status") === false);
+                this.$(".oe_im_chatview_online").toggle(this.user.get("im_status") === true);
+                this._go_bottom();
+            };
+            this.user.on("change:im_status", this, change_status);
+            change_status.call(this);
+
+            this.on("change:right_position", this, this.calc_pos);
+            this.full_height = this.$().height();
+            this.calc_pos();
+            this.on("change:pending", this, _.bind(function() {
+                if (this.get("pending") === 0) {
+                    this.$(".oe_im_chatview_nbr_messages").text("");
+                } else {
+                    this.$(".oe_im_chatview_nbr_messages").text("(" + this.get("pending") + ")");
+                }
+            }, this));
+        },
+        show_hide: function() {
+            if (this.shown) {
+                this.$().animate({
+                    height: this.$(".oe_im_chatview_header").outerHeight(),
+                });
+            } else {
+                this.$().animate({
+                    height: this.full_height,
+                });
+            }
+            this.shown = ! this.shown;
+            if (this.shown) {
+                this.set("pending", 0);
+            }
+        },
+        calc_pos: function() {
+            this.$().css("right", this.get("right_position"));
+        },
+        received_message: function(message) {
+            if (this.shown) {
+                this.set("pending", 0);
+            } else {
+                this.set("pending", this.get("pending") + 1);
+            }
+            this._add_bubble(this.user, message.message, oeclient.str_to_datetime(message.date));
+        },
+        send_message: function(e) {
+            if(e && e.which !== 13) {
+                return;
+            }
+            var mes = this.$("input").val();
+            if (! mes.trim()) {
+                return;
+            }
+            this.$("input").val("");
+            var send_it = _.bind(function() {
+                var model = connection.getModel("im.message");
+                return model.call("post", [mes, this.user.get('id')], {uuid: this.me.get("uuid"), context: {}});
+            }, this);
+            var tries = 0;
+            send_it().then(_.bind(function() {
+                this._add_bubble(this.me, mes, new Date());
+            }, this), function(error, e) {
+                tries += 1;
+                if (tries < 3)
+                    return send_it();
+            });
+        },
+        _add_bubble: function(user, item, date) {
+            var items = [item];
+            if (user === this.last_user) {
+                this.last_bubble.remove();
+                items = this.last_items.concat(items);
+            }
+            this.last_user = user;
+            this.last_items = items;
+            var zpad = function(str, size) {
+                str = "" + str;
+                return new Array(size - str.length + 1).join('0') + str;
+            };
+            date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2);
+            
+            this.last_bubble = $(templateEngine.conversation_bubble({"items": items, "user": user, "time": date}));
+            $(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble);
+            this._go_bottom();
+        },
+        _go_bottom: function() {
+            this.$(".oe_im_chatview_content").scrollTop($(this.$(".oe_im_chatview_content").children()[0]).height());
+        },
+        focus: function() {
+            this.$(".oe_im_chatview_input").focus();
+        },
+        destroy: function() {
+            this.user.remove_watcher();
+            this.trigger("destroyed");
+            return this.$super();
+        },
+    });
+
+
+
+    return livesupport;
+});
diff --git a/addons/im_livechat/static/ext/static/js/livesupport_templates.html b/addons/im_livechat/static/ext/static/js/livesupport_templates.html
new file mode 100644
index 00000000000..54cdf450dc1
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/livesupport_templates.html
@@ -0,0 +1,36 @@
+
+<%def name="conversation">
+    <div class="oe_im_chatview_header">
+        <img src="${toUrl('../img/green.png')}" class="oe_im_chatview_online"/>
+        ${widget.user.get('name') || 'You'}
+        <button class="oe_im_chatview_close">×</button>
+    </div>
+    <div class="oe_im_chatview_disconnected">
+        ${widget.user.get("name") + " is offline. He/She will receive your messages on his/her next connection."}
+    </div>
+    <div class="oe_im_chatview_content">
+        <div></div>
+    </div>
+    <div class="oe_im_chatview_footer">
+        <input class="oe_im_chatview_input" placeholder="${widget.inputPlaceholder}" />
+    </div>
+</%def>
+
+<%def name="conversation_bubble">
+    <div class="oe_im_chatview_bubble">
+        <div class="oe_im_chatview_clip">
+            <img class="oe_im_chatview_avatar" src="${user.get('image_url')}"/>
+        </div>
+        <div class="oe_im_chatview_from">${user.get('name') || 'You'}</div>
+        <div class="oe_im_chatview_bubble_list">
+            % _.each(items, function(item) {
+                <div class="oe_im_chatview_bubble_item">${item}</div>
+            % });
+        </div>
+        <div class="oe_im_chatview_time">${time}</div>
+    </div>
+</%def>
+
+<%def name="chatButton">
+    ${widget.text}
+</%def>
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/js/livesupport_templates.js b/addons/im_livechat/static/ext/static/js/livesupport_templates.js
new file mode 100644
index 00000000000..aaabfd38caf
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/livesupport_templates.js
@@ -0,0 +1 @@
+window.oe_livesupport_templates_callback("\n<%def name=\"conversation\">\n    <div class=\"oe_im_chatview_header\">\n        <img src=\"${toUrl('../img/green.png')}\" class=\"oe_im_chatview_online\"/>\n        ${widget.user.get('name') || 'You'}\n        <button class=\"oe_im_chatview_close\">\u00d7</button>\n    </div>\n    <div class=\"oe_im_chatview_disconnected\">\n        ${widget.user.get(\"name\") + \" is offline. He/She will receive your messages on his/her next connection.\"}\n    </div>\n    <div class=\"oe_im_chatview_content\">\n        <div></div>\n    </div>\n    <div class=\"oe_im_chatview_footer\">\n        <input class=\"oe_im_chatview_input\" placeholder=\"${widget.inputPlaceholder}\" />\n    </div>\n</%def>\n\n<%def name=\"conversation_bubble\">\n    <div class=\"oe_im_chatview_bubble\">\n        <div class=\"oe_im_chatview_clip\">\n            <img class=\"oe_im_chatview_avatar\" src=\"${user.get('image_url')}\"/>\n        </div>\n        <div class=\"oe_im_chatview_from\">${user.get('name') || 'You'}</div>\n        <div class=\"oe_im_chatview_bubble_list\">\n            % _.each(items, function(item) {\n                <div class=\"oe_im_chatview_bubble_item\">${item}</div>\n            % });\n        </div>\n        <div class=\"oe_im_chatview_time\">${time}</div>\n    </div>\n</%def>\n\n<%def name=\"chatButton\">\n    ${widget.text}\n</%def>");
diff --git a/addons/im_livechat/static/ext/static/js/nova.js b/addons/im_livechat/static/ext/static/js/nova.js
new file mode 100644
index 00000000000..eee00741fb6
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/nova.js
@@ -0,0 +1,988 @@
+/*
+Copyright (c) 2012, Nicolas Vanhoren
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met: 
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+(function() {
+
+if (typeof(define) !== "undefined") { // requirejs
+    define(["jquery", "underscore"], nova_declare);
+} else if (typeof(exports) !== "undefined") { // node
+    var _ = require("underscore")
+    _.extend(exports, nova_declare(null, _));
+} else { // define global variable 'nova'
+    nova = nova_declare($, _);
+}
+
+function nova_declare($, _) {
+    var nova = {};
+    nova.internal = {};
+
+    /*
+     * Modified Armin Ronacher's Classy library.
+     *
+     * Defines The Class object. That object can be used to define and inherit classes using
+     * the $extend() method.
+     *
+     * Example:
+     *
+     * var Person = nova.Class.$extend({
+     *  __init__: function(isDancing){
+     *     this.dancing = isDancing;
+     *   },
+     *   dance: function(){
+     *     return this.dancing;
+     *   }
+     * });
+     *
+     * The __init__() method act as a constructor. This class can be instancied this way:
+     *
+     * var person = new Person(true);
+     * person.dance();
+     *
+     * The Person class can also be extended again:
+     *
+     * var Ninja = Person.$extend({
+     *   __init__: function(){
+     *     this.$super( false );
+     *   },
+     *   dance: function(){
+     *     // Call the inherited version of dance()
+     *     return this.$super();
+     *   },
+     *   swingSword: function(){
+     *     return true;
+     *   }
+     * });
+     *
+     * When extending a class, each re-defined method can use this.$super() to call the previous
+     * implementation of that method.
+     */
+    /**
+    * Classy - classy classes for JavaScript
+    *
+    * :copyright: (c) 2011 by Armin Ronacher. 
+    * :license: BSD.
+    */
+    (function(){
+        var
+            context = this,
+            disable_constructor = false;
+
+        /* we check if $super is in use by a class if we can.  But first we have to
+         check if the JavaScript interpreter supports that.  This also matches
+         to false positives later, but that does not do any harm besides slightly
+         slowing calls down. */
+        var probe_super = (function(){this.$super();}).toString().indexOf('$super') > 0;
+        function usesSuper(obj) {
+            return !probe_super || /\B\$super\b/.test(obj.toString());
+        }
+
+        /* helper function to set the attribute of something to a value or
+         removes it if the value is undefined. */
+        function setOrUnset(obj, key, value) {
+            if (value === undefined)
+                delete obj[key];
+            else
+                obj[key] = value;
+        }
+
+        /* gets the own property of an object */
+        function getOwnProperty(obj, name) {
+            return Object.prototype.hasOwnProperty.call(obj, name)
+                ? obj[name] : undefined;
+        }
+
+        /* instanciate a class without calling the constructor */
+        function cheapNew(cls) {
+            disable_constructor = true;
+            var rv = new cls;
+            disable_constructor = false;
+            return rv;
+        }
+
+        /* the base class we export */
+        var Class = function() {};
+
+        /* extend functionality */
+        Class.$extend = function(properties) {
+            var super_prototype = this.prototype;
+
+            /* disable constructors and instanciate prototype.  Because the
+               prototype can't raise an exception when created, we are safe
+               without a try/finally here. */
+            var prototype = cheapNew(this);
+
+            /* copy all properties of the includes over if there are any */
+            prototype.__mixin_ids = _.clone(prototype.__mixin_ids || {});
+            if (properties.__include__)
+                for (var i = 0, n = properties.__include__.length; i != n; ++i) {
+                    var mixin = properties.__include__[i];
+                    if (mixin instanceof nova.Mixin) {
+                        _.extend(prototype.__mixin_ids, mixin.__mixin_ids);
+                        mixin = mixin.__mixin_properties;
+                    }
+                    for (var name in mixin) {
+                        var value = getOwnProperty(mixin, name);
+                        if (value !== undefined)
+                            prototype[name] = mixin[name];
+                    }
+                }
+
+            /* copy class vars from the superclass */
+            properties.__classvars__ = properties.__classvars__ || {};
+            if (prototype.__classvars__)
+                for (var key in prototype.__classvars__)
+                    if (!properties.__classvars__[key]) {
+                        var value = getOwnProperty(prototype.__classvars__, key);
+                        properties.__classvars__[key] = value;
+                    }
+
+            /* copy all properties over to the new prototype */
+            for (var name in properties) {
+                var value = getOwnProperty(properties, name);
+                if (name === '__include__' ||
+                    value === undefined)
+                    continue;
+
+                prototype[name] = typeof value === 'function' && usesSuper(value) ?
+                    (function(meth, name) {
+                        return function() {
+                            var old_super = getOwnProperty(this, '$super');
+                            this.$super = super_prototype[name];
+                            try {
+                                return meth.apply(this, arguments);
+                            }
+                            finally {
+                                setOrUnset(this, '$super', old_super);
+                            }
+                        };
+                    })(value, name) : value
+            }
+
+            var class_init = this.__class_init__ || function() {};
+            var p_class_init = prototype.__class_init__ || function() {};
+            delete prototype.__class_init__;
+            var n_class_init = function() {
+                class_init.apply(null, arguments);
+                p_class_init.apply(null, arguments);
+            }
+            n_class_init(prototype);
+
+            /* dummy constructor */
+            var instance = function() {
+                if (disable_constructor)
+                    return;
+                var proper_this = context === this ? cheapNew(arguments.callee) : this;
+                if (proper_this.__init__)
+                    proper_this.__init__.apply(proper_this, arguments);
+                proper_this.$class = instance;
+                return proper_this;
+            }
+
+            /* copy all class vars over of any */
+            for (var key in properties.__classvars__) {
+                var value = getOwnProperty(properties.__classvars__, key);
+                if (value !== undefined)
+                    instance[key] = value;
+            }
+
+            /* copy prototype and constructor over, reattach $extend and
+               return the class */
+            instance.prototype = prototype;
+            instance.constructor = instance;
+            instance.$extend = this.$extend;
+            instance.$withData = this.$withData;
+            instance.__class_init__ = n_class_init;
+            return instance;
+        };
+
+        /* instanciate with data functionality */
+        Class.$withData = function(data) {
+            var rv = cheapNew(this);
+            for (var key in data) {
+                var value = getOwnProperty(data, key);
+                if (value !== undefined)
+                    rv[key] = value;
+            }
+            return rv;
+        };
+
+        /* export the class */
+        this.Class = Class;
+    }).call(nova);
+    // end of Armin Ronacher's code
+
+    var mixinId = 1;
+    nova.Mixin = nova.Class.$extend({
+        __init__: function() {
+            this.__mixin_properties = {};
+            this.__mixin_id = mixinId;
+            mixinId++;
+            this.__mixin_ids = {};
+            this.__mixin_ids[this.__mixin_id] = true;
+            _.each(_.toArray(arguments), function(el) {
+                if (el instanceof nova.Mixin) {
+                    _.extend(this.__mixin_properties, el.__mixin_properties);
+                    _.extend(this.__mixin_ids, el.__mixin_ids);
+                } else { // object
+                    _.extend(this.__mixin_properties, el)
+                }
+            }, this);
+            _.extend(this, this.__mixin_properties);
+        }
+    });
+
+    nova.Interface = nova.Mixin.$extend({
+        __init__: function() {
+            var lst = [];
+            _.each(_.toArray(arguments), function(el) {
+                if (el instanceof nova.Interface) {
+                    lst.push(el);
+                } else if (el instanceof nova.Mixin) {
+                    var tmp = new nova.Interface(el.__mixin_properties);
+                    tmp.__mixin_ids = el.__mixin_ids;
+                    lst.push(tmp);
+                } else { // object
+                    var nprops = {};
+                    _.each(el, function(v, k) {
+                        nprops[k] = function() {
+                            throw new nova.NotImplementedError();
+                        };
+                    });
+                    lst.push(nprops);
+                }
+            });
+            this.$super.apply(this, lst);
+        }
+    });
+
+    nova.hasMixin = function(object, mixin) {
+        if (! object)
+            return false;
+        return (object.__mixin_ids || {})[mixin.__mixin_id] === true;
+    };
+
+    var ErrorBase = function() {
+    };
+    ErrorBase.prototype = new Error();
+    ErrorBase.$extend = nova.Class.$extend;
+    ErrorBase.$withData = nova.Class.$withData;
+
+    nova.Error = ErrorBase.$extend({
+        name: "nova.Error",
+        defaultMessage: "",
+        __init__: function(message) {
+            this.message = message || this.defaultMessage;
+        }
+    });
+
+    nova.NotImplementedError = nova.Error.$extend({
+        name: "nova.NotImplementedError",
+        defaultMessage: "This method is not implemented"
+    });
+
+    nova.InvalidArgumentError = nova.Error.$extend({
+        name: "nova.InvalidArgumentError"
+    });
+
+    /**
+     * Mixin to express the concept of destroying an object.
+     * When an object is destroyed, it should release any resource
+     * it could have reserved before.
+     */
+    nova.Destroyable = new nova.Mixin({
+        __init__: function() {
+            this.__destroyableDestroyed = false;
+        },
+        /**
+         * Returns true if destroy() was called on the current object.
+         */
+        isDestroyed : function() {
+            return this.__destroyableDestroyed;
+        },
+        /**
+         * Inform the object it should destroy itself, releasing any
+         * resource it could have reserved.
+         */
+        destroy : function() {
+            this.__destroyableDestroyed = true;
+        }
+    });
+
+    /**
+     * Mixin to structure objects' life-cycles folowing a parent-children
+     * relationship. Each object can a have a parent and multiple children.
+     * When an object is destroyed, all its children are destroyed too.
+     */
+    nova.Parented = new nova.Mixin(nova.Destroyable, {
+        __parentedMixin : true,
+        __init__: function() {
+            nova.Destroyable.__init__.apply(this);
+            this.__parentedChildren = [];
+            this.__parentedParent = null;
+        },
+        /**
+         * Set the parent of the current object. When calling this method, the
+         * parent will also be informed and will return the current object
+         * when its getChildren() method is called. If the current object did
+         * already have a parent, it is unregistered before, which means the
+         * previous parent will not return the current object anymore when its
+         * getChildren() method is called.
+         */
+        setParent : function(parent) {
+            if (this.getParent()) {
+                if (this.getParent().__parentedMixin) {
+                    this.getParent().__parentedChildren = _.without(this
+                            .getParent().getChildren(), this);
+                }
+            }
+            this.__parentedParent = parent;
+            if (parent && parent.__parentedMixin) {
+                parent.__parentedChildren.push(this);
+            }
+        },
+        /**
+         * Return the current parent of the object (or null).
+         */
+        getParent : function() {
+            return this.__parentedParent;
+        },
+        /**
+         * Return a list of the children of the current object.
+         */
+        getChildren : function() {
+            return _.clone(this.__parentedChildren);
+        },
+        destroy : function() {
+            _.each(this.getChildren(), function(el) {
+                el.destroy();
+            });
+            this.setParent(undefined);
+            nova.Destroyable.destroy.apply(this);
+        }
+    });
+
+    /*
+     * Yes, we steal Backbone's events :)
+     * 
+     * This class just handle the dispatching of events, it is not meant to be extended,
+     * nor used directly. All integration with parenting and automatic unregistration of
+     * events is done in the mixin EventDispatcher.
+     */
+    // (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
+    // Backbone may be freely distributed under the MIT license.
+    // For all details and documentation:
+    // http://backbonejs.org
+    nova.internal.Events = nova.Class.$extend({
+        on : function(events, callback, context) {
+            var ev;
+            events = events.split(/\s+/);
+            var calls = this._callbacks || (this._callbacks = {});
+            while (ev = events.shift()) {
+                var list = calls[ev] || (calls[ev] = {});
+                var tail = list.tail || (list.tail = list.next = {});
+                tail.callback = callback;
+                tail.context = context;
+                list.tail = tail.next = {};
+            }
+            return this;
+        },
+        off : function(events, callback, context) {
+            var ev, calls, node;
+            if (!events) {
+                delete this._callbacks;
+            } else if (calls = this._callbacks) {
+                events = events.split(/\s+/);
+                while (ev = events.shift()) {
+                    node = calls[ev];
+                    delete calls[ev];
+                    if (!callback || !node)
+                        continue;
+                    while ((node = node.next) && node.next) {
+                        if (node.callback === callback
+                                && (!context || node.context === context))
+                            continue;
+                        this.on(ev, node.callback, node.context);
+                    }
+                }
+            }
+            return this;
+        },
+        callbackList: function() {
+            var lst = [];
+            _.each(this._callbacks || {}, function(el, eventName) {
+                var node = el;
+                while ((node = node.next) && node.next) {
+                    lst.push([eventName, node.callback, node.context]);
+                }
+            });
+            return lst;
+        },
+        trigger : function(events) {
+            var event, node, calls, tail, args, all, rest;
+            if (!(calls = this._callbacks))
+                return this;
+            all = calls['all'];
+            (events = events.split(/\s+/)).push(null);
+            // Save references to the current heads & tails.
+            while (event = events.shift()) {
+                if (all)
+                    events.push({
+                        next : all.next,
+                        tail : all.tail,
+                        event : event
+                    });
+                if (!(node = calls[event]))
+                    continue;
+                events.push({
+                    next : node.next,
+                    tail : node.tail
+                });
+            }
+            rest = Array.prototype.slice.call(arguments, 1);
+            while (node = events.pop()) {
+                tail = node.tail;
+                args = node.event ? [ node.event ].concat(rest) : rest;
+                while ((node = node.next) !== tail) {
+                    node.callback.apply(node.context || this, args);
+                }
+            }
+            return this;
+        }
+    });
+    // end of Backbone's events class
+    
+    nova.EventDispatcher = new nova.Mixin(nova.Parented, {
+        __eventDispatcherMixin: true,
+        __init__: function() {
+            nova.Parented.__init__.apply(this);
+            this.__edispatcherEvents = new nova.internal.Events();
+            this.__edispatcherRegisteredEvents = [];
+        },
+        on: function(events, dest, func) {
+            var self = this;
+            events = events.split(/\s+/);
+            _.each(events, function(eventName) {
+                self.__edispatcherEvents.on(eventName, func, dest);
+                if (dest && dest.__eventDispatcherMixin) {
+                    dest.__edispatcherRegisteredEvents.push({name: eventName, func: func, source: self});
+                }
+            });
+            return this;
+        },
+        off: function(events, dest, func) {
+            var self = this;
+            events = events.split(/\s+/);
+            _.each(events, function(eventName) {
+                self.__edispatcherEvents.off(eventName, func, dest);
+                if (dest && dest.__eventDispatcherMixin) {
+                    dest.__edispatcherRegisteredEvents = _.filter(dest.__edispatcherRegisteredEvents, function(el) {
+                        return !(el.name === eventName && el.func === func && el.source === self);
+                    });
+                }
+            });
+            return this;
+        },
+        trigger: function(events) {
+            this.__edispatcherEvents.trigger.apply(this.__edispatcherEvents, arguments);
+            return this;
+        },
+        destroy: function() {
+            var self = this;
+            _.each(this.__edispatcherRegisteredEvents, function(event) {
+                event.source.__edispatcherEvents.off(event.name, event.func, self);
+            });
+            this.__edispatcherRegisteredEvents = [];
+            _.each(this.__edispatcherEvents.callbackList(), function(cal) {
+                this.off(cal[0], cal[2], cal[1]);
+            }, this);
+            this.__edispatcherEvents.off();
+            nova.Parented.destroy.apply(this);
+        }
+    });
+    
+    nova.Properties = new nova.Mixin(nova.EventDispatcher, {
+        __class_init__: function(proto) {
+            var props = {};
+            _.each(proto.__properties || {}, function(v, k) {
+                props[k] = _.clone(v);
+            });
+            _.each(proto, function(v, k) {
+                if (typeof v === "function") {
+                    var res = /^((?:get)|(?:set))([A-Z]\w*)$/.exec(k);
+                    if (! res)
+                        return;
+                    var name = res[2][0].toLowerCase() + res[2].slice(1);
+                    var prop = props[name] || (props[name] = {});
+                    prop[res[1]] = v;
+                }
+            });
+            proto.__properties = props;
+        },
+        __init__: function() {
+            nova.EventDispatcher.__init__.apply(this);
+            this.__dynamicProperties = {};
+        },
+        set: function(arg1, arg2) {
+            var self = this;
+            var map;
+            if (typeof arg1 === "string") {
+                map = {};
+                map[arg1] = arg2;
+            } else {
+                map = arg1;
+            }
+            var tmp_set = this.__props_setting;
+            this.__props_setting = false;
+            _.each(map, function(val, key) {
+                var prop = self.__properties[key];
+                if (prop) {
+                    if (! prop.set)
+                        throw new nova.InvalidArgumentError("Property " + key + " does not have a setter method.");
+                    prop.set.call(self, val);
+                } else {
+                    self.fallbackSet(key, val);
+                }
+            });
+            this.__props_setting = tmp_set;
+            if (! this.__props_setting && this.__props_setted) {
+                this.__props_setted = false;
+                self.trigger("change", self);
+            }
+        },
+        get: function(key) {
+            var prop = this.__properties[key];
+            if (prop) {
+                if (! prop.get)
+                    throw new nova.InvalidArgumentError("Property " + key + " does not have a getter method.");
+                return prop.get.call(this);
+            } else {
+                return this.fallbackGet(key);
+            }
+        },
+        fallbackSet: function(key, val) {
+            throw new nova.InvalidArgumentError("Property " + key + " is not defined.");
+        },
+        fallbackGet: function(key) {
+            throw new nova.InvalidArgumentError("Property " + key + " is not defined.");
+        },
+        trigger: function(name) {
+            nova.EventDispatcher.trigger.apply(this, arguments);
+            if (/(\s|^)change\:.*/.exec(name)) {
+                if (! this.__props_setting)
+                    this.trigger("change");
+                else
+                    this.__props_setted = true;
+            }
+        }
+    });
+
+    nova.DynamicProperties = new nova.Mixin(nova.Properties, {
+        __init__: function() {
+            nova.Properties.__init__.apply(this);
+            this.__dynamicProperties = {};
+        },
+        fallbackSet: function(key, val) {
+            var tmp = this.__dynamicProperties[key];
+            if (tmp === val)
+                return;
+            this.__dynamicProperties[key] = val;
+            this.trigger("change:" + key, this, {
+                oldValue: tmp,
+                newValue: val
+            });
+        },
+        fallbackGet: function(key) {
+            return this.__dynamicProperties[key];
+        }
+    });
+    
+    nova.Widget = nova.Class.$extend({
+        __include__ : [nova.DynamicProperties],
+        tagName: 'div',
+        className: '',
+        attributes: {},
+        events: {},
+        __init__: function(parent) {
+            nova.Properties.__init__.apply(this);
+            this.__widget_element = $(document.createElement(this.tagName));
+            this.$().addClass(this.className);
+            _.each(this.attributes, function(val, key) {
+                this.$().attr(key, val);
+            }, this);
+            _.each(this.events, function(val, key) {
+                key = key.split(" ");
+                val = _.bind(typeof val === "string" ? this[val] : val, this);
+                if (key.length > 1) {
+                    this.$().on(key[0], key[1], val);
+                } else {
+                    this.$().on(key[0], val);
+                }
+            }, this);
+    
+            this.setParent(parent);
+        },
+        $: function(attr) {
+            if (attr)
+                return this.__widget_element.find.apply(this.__widget_element, arguments);
+            else
+                return this.__widget_element;
+        },
+        /**
+         * Destroys the current widget, also destroys all its children before destroying itself.
+         */
+        destroy: function() {
+            _.each(this.getChildren(), function(el) {
+                el.destroy();
+            });
+            this.$().remove();
+            nova.Properties.destroy.apply(this);
+        },
+        /**
+         * Renders the current widget and appends it to the given jQuery object or Widget.
+         *
+         * @param target A jQuery object or a Widget instance.
+         */
+        appendTo: function(target) {
+            this.$().appendTo(target);
+            return this.render();
+        },
+        /**
+         * Renders the current widget and prepends it to the given jQuery object or Widget.
+         *
+         * @param target A jQuery object or a Widget instance.
+         */
+        prependTo: function(target) {
+            this.$().prependTo(target);
+            return this.render();
+        },
+        /**
+         * Renders the current widget and inserts it after to the given jQuery object or Widget.
+         *
+         * @param target A jQuery object or a Widget instance.
+         */
+        insertAfter: function(target) {
+            this.$().insertAfter(target);
+            return this.render();
+        },
+        /**
+         * Renders the current widget and inserts it before to the given jQuery object or Widget.
+         *
+         * @param target A jQuery object or a Widget instance.
+         */
+        insertBefore: function(target) {
+            this.$().insertBefore(target);
+            return this.render();
+        },
+        /**
+         * Renders the current widget and replaces the given jQuery object.
+         *
+         * @param target A jQuery object or a Widget instance.
+         */
+        replace: function(target) {
+            this.$().replace(target);
+            return this.render();
+        },
+        /**
+         * This is the method to implement to render the Widget.
+         */
+        render: function() {}
+    });
+
+    /*
+        Nova Template Engine
+    */
+    var escape_ = function(text) {
+        return JSON.stringify(text);
+    }
+    var indent_ = function(txt) {
+        var tmp = _.map(txt.split("\n"), function(x) { return "    " + x; });
+        tmp.pop();
+        tmp.push("");
+        return tmp.join("\n");
+    };
+    var tparams = {
+        def_begin: /<%\s*def\s+(?:name=(?:(?:"(.+?)")|(?:'(.+?)')))\s*>/g,
+        def_end: /<\/%\s*def\s*>/g,
+        comment_multi_begin: /<%\s*doc\s*>/g,
+        comment_multi_end: /<\/%\s*doc\s*>/g,
+        eval_long_begin: /<%/g,
+        eval_long_end: /%>/g,
+        eval_short_begin: /(?:^|\n)[[ \t]*%(?!{)/g,
+        eval_short_end: /\n|$/g,
+        escape_begin: /\${/g,
+        interpolate_begin: /%{/g,
+        comment_begin: /##/g,
+        comment_end: /\n|$/g
+    };
+    // /<%\s*def\s+(?:name=(?:"(.+?)"))\s*%>([\s\S]*?)<%\s*def\s*%>/g
+    var allbegin = new RegExp(
+        "((?:\\\\)*)(" +
+        "(" + tparams.def_begin.source + ")|" +
+        "(" + tparams.def_end.source + ")|" +
+        "(" + tparams.comment_multi_begin.source + ")|" +
+        "(" + tparams.eval_long_begin.source + ")|" +
+        "(" + tparams.interpolate_begin.source + ")|" +
+        "(" + tparams.eval_short_begin.source + ")|" +
+        "(" + tparams.escape_begin.source + ")|" +
+        "(" + tparams.comment_begin.source + ")" +
+        ")"
+    , "g");
+    allbegin.global = true;
+    var regexes = {
+        slashes: 1,
+        match: 2,
+        def_begin: 3,
+        def_name1: 4,
+        def_name2: 5,
+        def_end: 6,
+        comment_multi_begin: 7,
+        eval_long: 8,
+        interpolate: 9,
+        eval_short: 10,
+        escape: 11,
+        comment: 12
+    };
+    var regex_count = 4;
+
+    var compileTemplate = function(text, options) {
+        options = _.extend({start: 0, indent: true}, options);
+        start = options.start;
+        var source = "";
+        var current = start;
+        allbegin.lastIndex = current;
+        var text_end = text.length;
+        var restart = end;
+        var found;
+        var functions = [];
+        var indent = options.indent ? indent_ : function (txt) { return txt; };
+        var rmWhite = options.removeWhitespaces ? function(txt) {
+            if (! txt)
+                return txt;
+            txt = _.map(txt.split("\n"), function(x) { return x.trim() });
+            var last = txt.pop();
+            txt = _.reject(txt, function(x) { return !x });
+            txt.push(last);
+            return txt.join("\n") || "\n";
+        } : function(x) { return x };
+        while (found = allbegin.exec(text)) {
+            var to_add = rmWhite(text.slice(current, found.index));
+            source += to_add ? "__p+=" + escape_(to_add) + ";\n" : '';
+            current = found.index;
+
+            // slash escaping handling
+            var slashes = found[regexes.slashes] || "";
+            var nbr = slashes.length;
+            var nslash = slashes.slice(0, Math.floor(nbr / 2));
+            source += nbr !== 0 ? "__p+=" + escape_(nslash) + ";\n" : "";
+            if (nbr % 2 !== 0) {
+                source += "__p+=" + escape_(found[regexes.match]) + ";\n";
+                current = found.index + found[0].length;
+                allbegin.lastIndex = current;
+                continue;
+            }
+
+            if (found[regexes.def_begin]) {
+                var sub_compile = compileTemplate(text, _.extend({}, options, {start: found.index + found[0].length}));
+                var name = (found[regexes.def_name1] || found[regexes.def_name2]);
+                source += "var " + name  + " = function(context) {\n" + indent(sub_compile.header + sub_compile.source
+                    + sub_compile.footer) + "}\n";
+                functions.push(name);
+                current = sub_compile.end;
+            } else if (found[regexes.def_end]) {
+                text_end = found.index;
+                restart = found.index + found[0].length;
+                break;
+            } else if (found[regexes.comment_multi_begin]) {
+                tparams.comment_multi_end.lastIndex = found.index + found[0].length;
+                var end = tparams.comment_multi_end.exec(text);
+                if (!end)
+                    throw new Error("<%doc> without corresponding </%doc>");
+                current = end.index + end[0].length;
+            } else if (found[regexes.eval_long]) {
+                tparams.eval_long_end.lastIndex = found.index + found[0].length;
+                var end = tparams.eval_long_end.exec(text);
+                if (!end)
+                    throw new Error("<% without matching %>");
+                var code = text.slice(found.index + found[0].length, end.index);
+                code = _(code.split("\n")).chain().map(function(x) { return x.trim() })
+                    .reject(function(x) { return !x }).value().join("\n");
+                source += code + "\n";
+                current = end.index + end[0].length;
+            } else if (found[regexes.interpolate]) {
+                var braces = /{|}/g;
+                braces.lastIndex = found.index + found[0].length;
+                var b_count = 1;
+                var brace;
+                while (brace = braces.exec(text)) {
+                    if (brace[0] === "{")
+                        b_count++;
+                    else {
+                        b_count--;
+                    }
+                    if (b_count === 0)
+                        break;
+                }
+                if (b_count !== 0)
+                    throw new Error("%{ without a matching }");
+                source += "__p+=" + text.slice(found.index + found[0].length, brace.index) + ";\n"
+                current = brace.index + brace[0].length;
+            } else if (found[regexes.eval_short]) {
+                tparams.eval_short_end.lastIndex = found.index + found[0].length;
+                var end = tparams.eval_short_end.exec(text);
+                if (!end)
+                    throw new Error("impossible state!!");
+                source += text.slice(found.index + found[0].length, end.index).trim() + "\n";
+                current = end.index;
+            } else if (found[regexes.escape]) {
+                var braces = /{|}/g;
+                braces.lastIndex = found.index + found[0].length;
+                var b_count = 1;
+                var brace;
+                while (brace = braces.exec(text)) {
+                    if (brace[0] === "{")
+                        b_count++;
+                    else {
+                        b_count--;
+                    }
+                    if (b_count === 0)
+                        break;
+                }
+                if (b_count !== 0)
+                    throw new Error("${ without a matching }");
+                source += "__p+=_.escape(" + text.slice(found.index + found[0].length, brace.index) + ");\n"
+                current = brace.index + brace[0].length;
+            } else { // comment 
+                tparams.comment_end.lastIndex = found.index + found[0].length;
+                var end = tparams.comment_end.exec(text);
+                if (!end)
+                    throw new Error("impossible state!!");
+                current = end.index + end[0].length;
+            }
+            allbegin.lastIndex = current;
+        }
+        var to_add = rmWhite(text.slice(current, text_end));
+        source += to_add ? "__p+=" + escape_(to_add) + ";\n" : "";
+
+        var header = "var __p = ''; var print = function() { __p+=Array.prototype.join.call(arguments, '') };\n" +
+          "with (context || {}) {\n";
+        var footer = "}\nreturn __p;\n";
+        source = indent(source);
+
+        return {
+            header: header,
+            source: source,
+            footer: footer,
+            end: restart,
+            functions: functions,
+        };
+    };
+
+    nova.TemplateEngine = nova.Class.$extend({
+        __init__: function() {
+            this.resetEnvironment();
+            this.options = {
+                includeInDom: $ ? true : false,
+                indent: true,
+                removeWhitespaces: true,
+            };
+        },
+        loadFile: function(filename) {
+            var self = this;
+            return $.get(filename).pipe(function(content) {
+                return self.loadFileContent(content);
+            });
+        },
+        loadFileContent: function(file_content) {
+            var code = this.compileFile(file_content);
+
+            if (this.options.includeInDom) {
+                var varname = _.uniqueId("novajstemplate");
+                var previous = window[varname];
+                code = "window." + varname + " = " + code + ";";
+                var def = $.Deferred();
+                var script   = document.createElement("script");
+                script.type  = "text/javascript";
+                script.text  = code;
+                $("head")[0].appendChild(script);
+                $(script).ready(function() {
+                    def.resolve();
+                });
+                def.then(_.bind(function() {
+                    var tmp = window[varname];
+                    window[varname] = previous;
+                    this.includeTemplates(tmp);
+                }, this));
+                return def;
+            } else {
+                console.log("return (" + code + ")(context);");
+                return this.includeTemplates(new Function('context', "return (" + code + ")(context);"));
+            }
+        },
+        compileFile: function(file_content) {
+            var result = compileTemplate(file_content, _.extend({}, this.options));
+            var to_append = "";
+            _.each(result.functions, function(name) {
+                to_append += name + ": " + name + ",\n";
+            }, this);
+            to_append = this.options.indent ? indent_(to_append) : to_append;
+            to_append = "return {\n" + to_append + "};\n";
+            to_append = this.options.indent ? indent_(to_append) : to_append;
+            var code = "function(context) {\n" + result.header +
+                result.source + to_append + result.footer + "}\n";
+            return code;
+        },
+        includeTemplates: function(fct) {
+            var add = _.extend({engine: this}, this._env);
+            var functions = fct(add);
+            _.each(functions, function(func, name) {
+                if (this[name])
+                    throw new Error("The template '" + name + "' is already defined");
+                this[name] = func;
+            }, this);
+        },
+        buildTemplate: function(text) {
+            var comp = compileTemplate(text, _.extend({}, this.options));
+            var result = comp.header + comp.source + comp.footer;
+            var add = _.extend({engine: this}, this._env);
+            var func = new Function('context', result);
+            return function(data) {
+                return func.call(this, _.extend(add, data));
+            };
+        },
+        eval: function(text, context) {
+            return this.buildTemplate(text)(context);
+        },
+        resetEnvironment: function(nenv) {
+            this._env = {_: _};
+            this.extendEnvironment(nenv);
+        },
+        extendEnvironment: function(env) {
+            _.extend(this._env, env || {});
+        },
+    });
+
+    return nova;
+};
+})();
diff --git a/addons/im_livechat/static/ext/static/js/oeclient.js b/addons/im_livechat/static/ext/static/js/oeclient.js
new file mode 100644
index 00000000000..b3192b786e2
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/oeclient.js
@@ -0,0 +1,362 @@
+/*
+Copyright (c) 2013, OpenERP
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met: 
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+define(["underscore", "jquery", "nova"], function(_, $, nova) {
+
+    var oeclient = {};
+
+    var genericJsonRPC = function(fct_name, params, fct) {
+        var data = {
+            jsonrpc: "2.0",
+            method: fct_name,
+            params: params,
+            id: Math.floor(Math.random()* (1000*1000*1000)),
+        };
+        return fct(data).pipe(function(result) {
+            if (result.error !== undefined) {
+                console.error("Server application error", result.error);
+                return $.Deferred().reject("server", result.error);
+            } else {
+                return result.result;
+            }
+        }, function() {
+            console.error("JsonRPC communication error", _.toArray(arguments));
+            var def = $.Deferred();
+            return def.reject.apply(def, ["communication"].concat(_.toArray(arguments)));
+        });
+    };
+
+    oeclient.jsonRpc = function(url, fct_name, params, settings) {
+        return genericJsonRPC(fct_name, params, function(data) {
+            return $.ajax(url, _.extend({}, settings, {
+                url: url,
+                dataType: 'json',
+                type: 'POST',
+                data: JSON.stringify(data),
+                contentType: 'application/json',
+            }));
+        });
+    };
+
+    oeclient.jsonpRpc = function(url, fct_name, params, settings) {
+        return genericJsonRPC(fct_name, params, function(data) {
+            return $.ajax(url, _.extend({}, settings, {
+                url: url,
+                dataType: 'jsonp',
+                jsonp: 'jsonp',
+                type: 'GET',
+                cache: false,
+                data: {r: JSON.stringify(data)},
+            }));
+        });
+    };
+
+    oeclient.Connector = nova.Class.$extend({
+        getService: function(serviceName) {
+            return new oeclient.Service(this, serviceName);
+        },
+    });
+
+    oeclient.JsonRPCConnector = oeclient.Connector.$extend({
+        __init__: function(url) {
+            this.url = url;
+        },
+        call: function(sub_url, content) {
+            return oeclient.jsonRpc(this.url + sub_url, "call", content);
+        },
+        send: function(serviceName, method, args) {
+            return this.call("/jsonrpc", {"service": serviceName, "method": method, "args": args});
+        },
+    });
+
+    oeclient.JsonpRPCConnector = oeclient.JsonRPCConnector.$extend({
+        call: function(sub_url, content) {
+            return oeclient.jsonpRpc(this.url + sub_url, "call", content);
+        },
+    });
+
+    oeclient.Service = nova.Class.$extend({
+        __init__: function(connector, serviceName) {
+            this.connector = connector;
+            this.serviceName = serviceName;
+        },
+        call: function(method, args) {
+            return this.connector.send(this.serviceName, method, args);
+        },
+    });
+
+    oeclient.AuthenticationError = nova.Error.$extend({
+        name: "oeclient.AuthenticationError",
+        defaultMessage: "An error occured during authentication."
+    });
+
+    oeclient.Connection = nova.Class.$extend({
+        __init__: function(connector, database, login, password, userId) {
+            this.connector = connector;
+            this.setLoginInfo(database, login, password, userId);
+            this.userContext = null;
+        },
+        setLoginInfo: function(database, login, password, userId) {
+            this.database = database;
+            this.login = login;
+            this.password = password;
+            this.userId = userId;
+        },
+        checkLogin: function(force) {
+            force = force === undefined ? true: force;
+            if (this.userId && ! force)
+                return $.when();
+
+            if (! this.database || ! this.login || ! this.password)
+                throw new oeclient.AuthenticationError();
+
+            return this.getService("common").call("login", [this.database, this.login, this.password])
+                    .then(_.bind(function(result) {
+                this.userId = result;
+                if (! this.userId) {
+                    console.error("Authentication failure");
+                    return $.Deferred().reject({message:"Authentication failure"});
+                }
+            }, this));
+        },
+        getUserContext: function() {
+            if (! this.userContext) {
+                return this.getModel("res.users").call("context_get").then(_.bind(function(result) {
+                    this.userContext = result;
+                    return this.userContext;
+                }, this));
+            }
+            return $.when(this.userContext);
+        },
+        getModel: function(modelName) {
+            return new oeclient.Model(this, modelName);
+        },
+        getService: function(serviceName) {
+            return this.connector.getService(serviceName);
+        },
+    });
+
+    oeclient.Model = nova.Class.$extend({
+        __init__: function(connection, modelName) {
+            this.connection = connection;
+            this.modelName = modelName;
+        },
+        call: function(method, args, kw) {
+            return this.connection.checkLogin().then(_.bind(function() {
+                return this.connection.getService("object").call("execute_kw", [
+                    this.connection.database,
+                    this.connection.userId,
+                    this.connection.password,
+                    this.modelName,
+                    method,
+                    args || [],
+                    kw || {},
+                ]);
+            }, this));
+        },
+        search_read: function(domain, fields, offset, limit, order, context) {
+            return this.call("search", [domain || [], offset || 0, limit || false, order || false, context || {}]).then(_.bind(function(record_ids) {
+                if (! record_ids) {
+                    return [];
+                }
+                return this.call("read", [record_ids, fields || [], context || {}]).then(function(records) {
+                    var index = {};
+                    _.each(records, function(r) {
+                        index[r.id] = r;
+                    });
+                    var res = [];
+                    _.each(record_ids, function(id) {
+                        if (index[id])
+                            res.push(index[id]);
+                    });
+                    return res;
+                });
+            }, this));
+        },
+    });
+
+    /**
+     * Converts a string to a Date javascript object using OpenERP's
+     * datetime string format (exemple: '2011-12-01 15:12:35').
+     * 
+     * The time zone is assumed to be UTC (standard for OpenERP 6.1)
+     * and will be converted to the browser's time zone.
+     * 
+     * @param {String} str A string representing a datetime.
+     * @returns {Date}
+     */
+    oeclient.str_to_datetime = function(str) {
+        if(!str) {
+            return str;
+        }
+        var regex = /^(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d(?:\.\d+)?)$/;
+        var res = regex.exec(str);
+        if ( !res ) {
+            throw new Error("'" + str + "' is not a valid datetime");
+        }
+        var tmp = new Date();
+        tmp.setUTCFullYear(parseFloat(res[1]));
+        tmp.setUTCMonth(parseFloat(res[2]) - 1);
+        tmp.setUTCDate(parseFloat(res[3]));
+        tmp.setUTCHours(parseFloat(res[4]));
+        tmp.setUTCMinutes(parseFloat(res[5]));
+        tmp.setUTCSeconds(parseFloat(res[6]));
+        return tmp;
+    };
+
+    /**
+     * Converts a string to a Date javascript object using OpenERP's
+     * date string format (exemple: '2011-12-01').
+     * 
+     * As a date is not subject to time zones, we assume it should be
+     * represented as a Date javascript object at 00:00:00 in the
+     * time zone of the browser.
+     * 
+     * @param {String} str A string representing a date.
+     * @returns {Date}
+     */
+    oeclient.str_to_date = function(str) {
+        if(!str) {
+            return str;
+        }
+        var regex = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
+        var res = regex.exec(str);
+        if ( !res ) {
+            throw new Error("'" + str + "' is not a valid date");
+        }
+        var tmp = new Date();
+        tmp.setFullYear(parseFloat(res[1]));
+        tmp.setMonth(parseFloat(res[2]) - 1);
+        tmp.setDate(parseFloat(res[3]));
+        tmp.setHours(0);
+        tmp.setMinutes(0);
+        tmp.setSeconds(0);
+        return tmp;
+    };
+
+    /**
+     * Converts a string to a Date javascript object using OpenERP's
+     * time string format (exemple: '15:12:35').
+     * 
+     * The OpenERP times are supposed to always be naive times. We assume it is
+     * represented using a javascript Date with a date 1 of January 1970 and a
+     * time corresponding to the meant time in the browser's time zone.
+     * 
+     * @param {String} str A string representing a time.
+     * @returns {Date}
+     */
+    oeclient.str_to_time = function(str) {
+        if(!str) {
+            return str;
+        }
+        var regex = /^(\d\d):(\d\d):(\d\d(?:\.\d+)?)$/;
+        var res = regex.exec(str);
+        if ( !res ) {
+            throw new Error("'" + str + "' is not a valid time");
+        }
+        debugger;
+        var tmp = new Date();
+        tmp.setFullYear(1970);
+        tmp.setMonth(0);
+        tmp.setDate(1);
+        tmp.setHours(parseFloat(res[1]));
+        tmp.setMinutes(parseFloat(res[2]));
+        tmp.setSeconds(parseFloat(res[3]));
+        return tmp;
+    };
+
+    /*
+     * Left-pad provided arg 1 with zeroes until reaching size provided by second
+     * argument.
+     *
+     * @param {Number|String} str value to pad
+     * @param {Number} size size to reach on the final padded value
+     * @returns {String} padded string
+     */
+    var zpad = function(str, size) {
+        str = "" + str;
+        return new Array(size - str.length + 1).join('0') + str;
+    };
+
+    /**
+     * Converts a Date javascript object to a string using OpenERP's
+     * datetime string format (exemple: '2011-12-01 15:12:35').
+     * 
+     * The time zone of the Date object is assumed to be the one of the
+     * browser and it will be converted to UTC (standard for OpenERP 6.1).
+     * 
+     * @param {Date} obj
+     * @returns {String} A string representing a datetime.
+     */
+    oeclient.datetime_to_str = function(obj) {
+        if (!obj) {
+            return false;
+        }
+        return zpad(obj.getUTCFullYear(),4) + "-" + zpad(obj.getUTCMonth() + 1,2) + "-"
+             + zpad(obj.getUTCDate(),2) + " " + zpad(obj.getUTCHours(),2) + ":"
+             + zpad(obj.getUTCMinutes(),2) + ":" + zpad(obj.getUTCSeconds(),2);
+    };
+
+    /**
+     * Converts a Date javascript object to a string using OpenERP's
+     * date string format (exemple: '2011-12-01').
+     * 
+     * As a date is not subject to time zones, we assume it should be
+     * represented as a Date javascript object at 00:00:00 in the
+     * time zone of the browser.
+     * 
+     * @param {Date} obj
+     * @returns {String} A string representing a date.
+     */
+    oeclient.date_to_str = function(obj) {
+        if (!obj) {
+            return false;
+        }
+        return zpad(obj.getFullYear(),4) + "-" + zpad(obj.getMonth() + 1,2) + "-"
+             + zpad(obj.getDate(),2);
+    };
+
+    /**
+     * Converts a Date javascript object to a string using OpenERP's
+     * time string format (exemple: '15:12:35').
+     * 
+     * The OpenERP times are supposed to always be naive times. We assume it is
+     * represented using a javascript Date with a date 1 of January 1970 and a
+     * time corresponding to the meant time in the browser's time zone.
+     * 
+     * @param {Date} obj
+     * @returns {String} A string representing a time.
+     */
+    oeclient.time_to_str = function(obj) {
+        if (!obj) {
+            return false;
+        }
+        return zpad(obj.getHours(),2) + ":" + zpad(obj.getMinutes(),2) + ":"
+             + zpad(obj.getSeconds(),2);
+    };
+
+    return oeclient;
+
+});
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/js/require.js b/addons/im_livechat/static/ext/static/js/require.js
new file mode 100644
index 00000000000..f46a9245d97
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/require.js
@@ -0,0 +1,1993 @@
+/** vim: et:ts=4:sw=4:sts=4
+ * @license RequireJS 2.1.2 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/requirejs for details
+ */
+//Not using strict: uneven strict support in browsers, #392, and causes
+//problems with requirejs.exec()/transpiler plugins that may not be strict.
+/*jslint regexp: true, nomen: true, sloppy: true */
+/*global window, navigator, document, importScripts, jQuery, setTimeout, opera */
+
+var requirejs, require, define;
+(function (global) {
+    var req, s, head, baseElement, dataMain, src,
+        interactiveScript, currentlyAddingScript, mainScript, subPath,
+        version = '2.1.2',
+        commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
+        cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
+        jsSuffixRegExp = /\.js$/,
+        currDirRegExp = /^\.\//,
+        op = Object.prototype,
+        ostring = op.toString,
+        hasOwn = op.hasOwnProperty,
+        ap = Array.prototype,
+        aps = ap.slice,
+        apsp = ap.splice,
+        isBrowser = !!(typeof window !== 'undefined' && navigator && document),
+        isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
+        //PS3 indicates loaded and complete, but need to wait for complete
+        //specifically. Sequence is 'loading', 'loaded', execution,
+        // then 'complete'. The UA check is unfortunate, but not sure how
+        //to feature test w/o causing perf issues.
+        readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ?
+                      /^complete$/ : /^(complete|loaded)$/,
+        defContextName = '_',
+        //Oh the tragedy, detecting opera. See the usage of isOpera for reason.
+        isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]',
+        contexts = {},
+        cfg = {},
+        globalDefQueue = [],
+        useInteractive = false;
+
+    function isFunction(it) {
+        return ostring.call(it) === '[object Function]';
+    }
+
+    function isArray(it) {
+        return ostring.call(it) === '[object Array]';
+    }
+
+    /**
+     * Helper function for iterating over an array. If the func returns
+     * a true value, it will break out of the loop.
+     */
+    function each(ary, func) {
+        if (ary) {
+            var i;
+            for (i = 0; i < ary.length; i += 1) {
+                if (ary[i] && func(ary[i], i, ary)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Helper function for iterating over an array backwards. If the func
+     * returns a true value, it will break out of the loop.
+     */
+    function eachReverse(ary, func) {
+        if (ary) {
+            var i;
+            for (i = ary.length - 1; i > -1; i -= 1) {
+                if (ary[i] && func(ary[i], i, ary)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    function hasProp(obj, prop) {
+        return hasOwn.call(obj, prop);
+    }
+
+    function getOwn(obj, prop) {
+        return hasProp(obj, prop) && obj[prop];
+    }
+
+    /**
+     * Cycles over properties in an object and calls a function for each
+     * property value. If the function returns a truthy value, then the
+     * iteration is stopped.
+     */
+    function eachProp(obj, func) {
+        var prop;
+        for (prop in obj) {
+            if (hasProp(obj, prop)) {
+                if (func(obj[prop], prop)) {
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Simple function to mix in properties from source into target,
+     * but only if target does not already have a property of the same name.
+     */
+    function mixin(target, source, force, deepStringMixin) {
+        if (source) {
+            eachProp(source, function (value, prop) {
+                if (force || !hasProp(target, prop)) {
+                    if (deepStringMixin && typeof value !== 'string') {
+                        if (!target[prop]) {
+                            target[prop] = {};
+                        }
+                        mixin(target[prop], value, force, deepStringMixin);
+                    } else {
+                        target[prop] = value;
+                    }
+                }
+            });
+        }
+        return target;
+    }
+
+    //Similar to Function.prototype.bind, but the 'this' object is specified
+    //first, since it is easier to read/figure out what 'this' will be.
+    function bind(obj, fn) {
+        return function () {
+            return fn.apply(obj, arguments);
+        };
+    }
+
+    function scripts() {
+        return document.getElementsByTagName('script');
+    }
+
+    //Allow getting a global that expressed in
+    //dot notation, like 'a.b.c'.
+    function getGlobal(value) {
+        if (!value) {
+            return value;
+        }
+        var g = global;
+        each(value.split('.'), function (part) {
+            g = g[part];
+        });
+        return g;
+    }
+
+    /**
+     * Constructs an error with a pointer to an URL with more information.
+     * @param {String} id the error ID that maps to an ID on a web page.
+     * @param {String} message human readable error.
+     * @param {Error} [err] the original error, if there is one.
+     *
+     * @returns {Error}
+     */
+    function makeError(id, msg, err, requireModules) {
+        var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id);
+        e.requireType = id;
+        e.requireModules = requireModules;
+        if (err) {
+            e.originalError = err;
+        }
+        return e;
+    }
+
+    if (typeof define !== 'undefined') {
+        //If a define is already in play via another AMD loader,
+        //do not overwrite.
+        return;
+    }
+
+    if (typeof requirejs !== 'undefined') {
+        if (isFunction(requirejs)) {
+            //Do not overwrite and existing requirejs instance.
+            return;
+        }
+        cfg = requirejs;
+        requirejs = undefined;
+    }
+
+    //Allow for a require config object
+    if (typeof require !== 'undefined' && !isFunction(require)) {
+        //assume it is a config object.
+        cfg = require;
+        require = undefined;
+    }
+
+    function newContext(contextName) {
+        var inCheckLoaded, Module, context, handlers,
+            checkLoadedTimeoutId,
+            config = {
+                waitSeconds: 7,
+                baseUrl: './',
+                paths: {},
+                pkgs: {},
+                shim: {},
+                map: {},
+                config: {}
+            },
+            registry = {},
+            undefEvents = {},
+            defQueue = [],
+            defined = {},
+            urlFetched = {},
+            requireCounter = 1,
+            unnormalizedCounter = 1;
+
+        /**
+         * Trims the . and .. from an array of path segments.
+         * It will keep a leading path segment if a .. will become
+         * the first path segment, to help with module name lookups,
+         * which act like paths, but can be remapped. But the end result,
+         * all paths that use this function should look normalized.
+         * NOTE: this method MODIFIES the input array.
+         * @param {Array} ary the array of path segments.
+         */
+        function trimDots(ary) {
+            var i, part;
+            for (i = 0; ary[i]; i += 1) {
+                part = ary[i];
+                if (part === '.') {
+                    ary.splice(i, 1);
+                    i -= 1;
+                } else if (part === '..') {
+                    if (i === 1 && (ary[2] === '..' || ary[0] === '..')) {
+                        //End of the line. Keep at least one non-dot
+                        //path segment at the front so it can be mapped
+                        //correctly to disk. Otherwise, there is likely
+                        //no path mapping for a path starting with '..'.
+                        //This can still fail, but catches the most reasonable
+                        //uses of ..
+                        break;
+                    } else if (i > 0) {
+                        ary.splice(i - 1, 2);
+                        i -= 2;
+                    }
+                }
+            }
+        }
+
+        /**
+         * Given a relative module name, like ./something, normalize it to
+         * a real name that can be mapped to a path.
+         * @param {String} name the relative name
+         * @param {String} baseName a real name that the name arg is relative
+         * to.
+         * @param {Boolean} applyMap apply the map config to the value. Should
+         * only be done if this normalization is for a dependency ID.
+         * @returns {String} normalized name
+         */
+        function normalize(name, baseName, applyMap) {
+            var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
+                foundMap, foundI, foundStarMap, starI,
+                baseParts = baseName && baseName.split('/'),
+                normalizedBaseParts = baseParts,
+                map = config.map,
+                starMap = map && map['*'];
+
+            //Adjust any relative paths.
+            if (name && name.charAt(0) === '.') {
+                //If have a base name, try to normalize against it,
+                //otherwise, assume it is a top-level require that will
+                //be relative to baseUrl in the end.
+                if (baseName) {
+                    if (getOwn(config.pkgs, baseName)) {
+                        //If the baseName is a package name, then just treat it as one
+                        //name to concat the name with.
+                        normalizedBaseParts = baseParts = [baseName];
+                    } else {
+                        //Convert baseName to array, and lop off the last part,
+                        //so that . matches that 'directory' and not name of the baseName's
+                        //module. For instance, baseName of 'one/two/three', maps to
+                        //'one/two/three.js', but we want the directory, 'one/two' for
+                        //this normalization.
+                        normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
+                    }
+
+                    name = normalizedBaseParts.concat(name.split('/'));
+                    trimDots(name);
+
+                    //Some use of packages may use a . path to reference the
+                    //'main' module name, so normalize for that.
+                    pkgConfig = getOwn(config.pkgs, (pkgName = name[0]));
+                    name = name.join('/');
+                    if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
+                        name = pkgName;
+                    }
+                } else if (name.indexOf('./') === 0) {
+                    // No baseName, so this is ID is resolved relative
+                    // to baseUrl, pull off the leading dot.
+                    name = name.substring(2);
+                }
+            }
+
+            //Apply map config if available.
+            if (applyMap && (baseParts || starMap) && map) {
+                nameParts = name.split('/');
+
+                for (i = nameParts.length; i > 0; i -= 1) {
+                    nameSegment = nameParts.slice(0, i).join('/');
+
+                    if (baseParts) {
+                        //Find the longest baseName segment match in the config.
+                        //So, do joins on the biggest to smallest lengths of baseParts.
+                        for (j = baseParts.length; j > 0; j -= 1) {
+                            mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
+
+                            //baseName segment has config, find if it has one for
+                            //this name.
+                            if (mapValue) {
+                                mapValue = getOwn(mapValue, nameSegment);
+                                if (mapValue) {
+                                    //Match, update name to the new value.
+                                    foundMap = mapValue;
+                                    foundI = i;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    if (foundMap) {
+                        break;
+                    }
+
+                    //Check for a star map match, but just hold on to it,
+                    //if there is a shorter segment match later in a matching
+                    //config, then favor over this star map.
+                    if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
+                        foundStarMap = getOwn(starMap, nameSegment);
+                        starI = i;
+                    }
+                }
+
+                if (!foundMap && foundStarMap) {
+                    foundMap = foundStarMap;
+                    foundI = starI;
+                }
+
+                if (foundMap) {
+                    nameParts.splice(0, foundI, foundMap);
+                    name = nameParts.join('/');
+                }
+            }
+
+            return name;
+        }
+
+        function removeScript(name) {
+            if (isBrowser) {
+                each(scripts(), function (scriptNode) {
+                    if (scriptNode.getAttribute('data-requiremodule') === name &&
+                            scriptNode.getAttribute('data-requirecontext') === context.contextName) {
+                        scriptNode.parentNode.removeChild(scriptNode);
+                        return true;
+                    }
+                });
+            }
+        }
+
+        function hasPathFallback(id) {
+            var pathConfig = getOwn(config.paths, id);
+            if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
+                removeScript(id);
+                //Pop off the first array value, since it failed, and
+                //retry
+                pathConfig.shift();
+                context.require.undef(id);
+                context.require([id]);
+                return true;
+            }
+        }
+
+        //Turns a plugin!resource to [plugin, resource]
+        //with the plugin being undefined if the name
+        //did not have a plugin prefix.
+        function splitPrefix(name) {
+            var prefix,
+                index = name ? name.indexOf('!') : -1;
+            if (index > -1) {
+                prefix = name.substring(0, index);
+                name = name.substring(index + 1, name.length);
+            }
+            return [prefix, name];
+        }
+
+        /**
+         * Creates a module mapping that includes plugin prefix, module
+         * name, and path. If parentModuleMap is provided it will
+         * also normalize the name via require.normalize()
+         *
+         * @param {String} name the module name
+         * @param {String} [parentModuleMap] parent module map
+         * for the module name, used to resolve relative names.
+         * @param {Boolean} isNormalized: is the ID already normalized.
+         * This is true if this call is done for a define() module ID.
+         * @param {Boolean} applyMap: apply the map config to the ID.
+         * Should only be true if this map is for a dependency.
+         *
+         * @returns {Object}
+         */
+        function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
+            var url, pluginModule, suffix, nameParts,
+                prefix = null,
+                parentName = parentModuleMap ? parentModuleMap.name : null,
+                originalName = name,
+                isDefine = true,
+                normalizedName = '';
+
+            //If no name, then it means it is a require call, generate an
+            //internal name.
+            if (!name) {
+                isDefine = false;
+                name = '_@r' + (requireCounter += 1);
+            }
+
+            nameParts = splitPrefix(name);
+            prefix = nameParts[0];
+            name = nameParts[1];
+
+            if (prefix) {
+                prefix = normalize(prefix, parentName, applyMap);
+                pluginModule = getOwn(defined, prefix);
+            }
+
+            //Account for relative paths if there is a base name.
+            if (name) {
+                if (prefix) {
+                    if (pluginModule && pluginModule.normalize) {
+                        //Plugin is loaded, use its normalize method.
+                        normalizedName = pluginModule.normalize(name, function (name) {
+                            return normalize(name, parentName, applyMap);
+                        });
+                    } else {
+                        normalizedName = normalize(name, parentName, applyMap);
+                    }
+                } else {
+                    //A regular module.
+                    normalizedName = normalize(name, parentName, applyMap);
+
+                    //Normalized name may be a plugin ID due to map config
+                    //application in normalize. The map config values must
+                    //already be normalized, so do not need to redo that part.
+                    nameParts = splitPrefix(normalizedName);
+                    prefix = nameParts[0];
+                    normalizedName = nameParts[1];
+                    isNormalized = true;
+
+                    url = context.nameToUrl(normalizedName);
+                }
+            }
+
+            //If the id is a plugin id that cannot be determined if it needs
+            //normalization, stamp it with a unique ID so two matching relative
+            //ids that may conflict can be separate.
+            suffix = prefix && !pluginModule && !isNormalized ?
+                     '_unnormalized' + (unnormalizedCounter += 1) :
+                     '';
+
+            return {
+                prefix: prefix,
+                name: normalizedName,
+                parentMap: parentModuleMap,
+                unnormalized: !!suffix,
+                url: url,
+                originalName: originalName,
+                isDefine: isDefine,
+                id: (prefix ?
+                        prefix + '!' + normalizedName :
+                        normalizedName) + suffix
+            };
+        }
+
+        function getModule(depMap) {
+            var id = depMap.id,
+                mod = getOwn(registry, id);
+
+            if (!mod) {
+                mod = registry[id] = new context.Module(depMap);
+            }
+
+            return mod;
+        }
+
+        function on(depMap, name, fn) {
+            var id = depMap.id,
+                mod = getOwn(registry, id);
+
+            if (hasProp(defined, id) &&
+                    (!mod || mod.defineEmitComplete)) {
+                if (name === 'defined') {
+                    fn(defined[id]);
+                }
+            } else {
+                getModule(depMap).on(name, fn);
+            }
+        }
+
+        function onError(err, errback) {
+            var ids = err.requireModules,
+                notified = false;
+
+            if (errback) {
+                errback(err);
+            } else {
+                each(ids, function (id) {
+                    var mod = getOwn(registry, id);
+                    if (mod) {
+                        //Set error on module, so it skips timeout checks.
+                        mod.error = err;
+                        if (mod.events.error) {
+                            notified = true;
+                            mod.emit('error', err);
+                        }
+                    }
+                });
+
+                if (!notified) {
+                    req.onError(err);
+                }
+            }
+        }
+
+        /**
+         * Internal method to transfer globalQueue items to this context's
+         * defQueue.
+         */
+        function takeGlobalQueue() {
+            //Push all the globalDefQueue items into the context's defQueue
+            if (globalDefQueue.length) {
+                //Array splice in the values since the context code has a
+                //local var ref to defQueue, so cannot just reassign the one
+                //on context.
+                apsp.apply(defQueue,
+                           [defQueue.length - 1, 0].concat(globalDefQueue));
+                globalDefQueue = [];
+            }
+        }
+
+        handlers = {
+            'require': function (mod) {
+                if (mod.require) {
+                    return mod.require;
+                } else {
+                    return (mod.require = context.makeRequire(mod.map));
+                }
+            },
+            'exports': function (mod) {
+                mod.usingExports = true;
+                if (mod.map.isDefine) {
+                    if (mod.exports) {
+                        return mod.exports;
+                    } else {
+                        return (mod.exports = defined[mod.map.id] = {});
+                    }
+                }
+            },
+            'module': function (mod) {
+                if (mod.module) {
+                    return mod.module;
+                } else {
+                    return (mod.module = {
+                        id: mod.map.id,
+                        uri: mod.map.url,
+                        config: function () {
+                            return (config.config && getOwn(config.config, mod.map.id)) || {};
+                        },
+                        exports: defined[mod.map.id]
+                    });
+                }
+            }
+        };
+
+        function cleanRegistry(id) {
+            //Clean up machinery used for waiting modules.
+            delete registry[id];
+        }
+
+        function breakCycle(mod, traced, processed) {
+            var id = mod.map.id;
+
+            if (mod.error) {
+                mod.emit('error', mod.error);
+            } else {
+                traced[id] = true;
+                each(mod.depMaps, function (depMap, i) {
+                    var depId = depMap.id,
+                        dep = getOwn(registry, depId);
+
+                    //Only force things that have not completed
+                    //being defined, so still in the registry,
+                    //and only if it has not been matched up
+                    //in the module already.
+                    if (dep && !mod.depMatched[i] && !processed[depId]) {
+                        if (getOwn(traced, depId)) {
+                            mod.defineDep(i, defined[depId]);
+                            mod.check(); //pass false?
+                        } else {
+                            breakCycle(dep, traced, processed);
+                        }
+                    }
+                });
+                processed[id] = true;
+            }
+        }
+
+        function checkLoaded() {
+            var map, modId, err, usingPathFallback,
+                waitInterval = config.waitSeconds * 1000,
+                //It is possible to disable the wait interval by using waitSeconds of 0.
+                expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
+                noLoads = [],
+                reqCalls = [],
+                stillLoading = false,
+                needCycleCheck = true;
+
+            //Do not bother if this call was a result of a cycle break.
+            if (inCheckLoaded) {
+                return;
+            }
+
+            inCheckLoaded = true;
+
+            //Figure out the state of all the modules.
+            eachProp(registry, function (mod) {
+                map = mod.map;
+                modId = map.id;
+
+                //Skip things that are not enabled or in error state.
+                if (!mod.enabled) {
+                    return;
+                }
+
+                if (!map.isDefine) {
+                    reqCalls.push(mod);
+                }
+
+                if (!mod.error) {
+                    //If the module should be executed, and it has not
+                    //been inited and time is up, remember it.
+                    if (!mod.inited && expired) {
+                        if (hasPathFallback(modId)) {
+                            usingPathFallback = true;
+                            stillLoading = true;
+                        } else {
+                            noLoads.push(modId);
+                            removeScript(modId);
+                        }
+                    } else if (!mod.inited && mod.fetched && map.isDefine) {
+                        stillLoading = true;
+                        if (!map.prefix) {
+                            //No reason to keep looking for unfinished
+                            //loading. If the only stillLoading is a
+                            //plugin resource though, keep going,
+                            //because it may be that a plugin resource
+                            //is waiting on a non-plugin cycle.
+                            return (needCycleCheck = false);
+                        }
+                    }
+                }
+            });
+
+            if (expired && noLoads.length) {
+                //If wait time expired, throw error of unloaded modules.
+                err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads);
+                err.contextName = context.contextName;
+                return onError(err);
+            }
+
+            //Not expired, check for a cycle.
+            if (needCycleCheck) {
+                each(reqCalls, function (mod) {
+                    breakCycle(mod, {}, {});
+                });
+            }
+
+            //If still waiting on loads, and the waiting load is something
+            //other than a plugin resource, or there are still outstanding
+            //scripts, then just try back later.
+            if ((!expired || usingPathFallback) && stillLoading) {
+                //Something is still waiting to load. Wait for it, but only
+                //if a timeout is not already in effect.
+                if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) {
+                    checkLoadedTimeoutId = setTimeout(function () {
+                        checkLoadedTimeoutId = 0;
+                        checkLoaded();
+                    }, 50);
+                }
+            }
+
+            inCheckLoaded = false;
+        }
+
+        Module = function (map) {
+            this.events = getOwn(undefEvents, map.id) || {};
+            this.map = map;
+            this.shim = getOwn(config.shim, map.id);
+            this.depExports = [];
+            this.depMaps = [];
+            this.depMatched = [];
+            this.pluginMaps = {};
+            this.depCount = 0;
+
+            /* this.exports this.factory
+               this.depMaps = [],
+               this.enabled, this.fetched
+            */
+        };
+
+        Module.prototype = {
+            init: function (depMaps, factory, errback, options) {
+                options = options || {};
+
+                //Do not do more inits if already done. Can happen if there
+                //are multiple define calls for the same module. That is not
+                //a normal, common case, but it is also not unexpected.
+                if (this.inited) {
+                    return;
+                }
+
+                this.factory = factory;
+
+                if (errback) {
+                    //Register for errors on this module.
+                    this.on('error', errback);
+                } else if (this.events.error) {
+                    //If no errback already, but there are error listeners
+                    //on this module, set up an errback to pass to the deps.
+                    errback = bind(this, function (err) {
+                        this.emit('error', err);
+                    });
+                }
+
+                //Do a copy of the dependency array, so that
+                //source inputs are not modified. For example
+                //"shim" deps are passed in here directly, and
+                //doing a direct modification of the depMaps array
+                //would affect that config.
+                this.depMaps = depMaps && depMaps.slice(0);
+
+                this.errback = errback;
+
+                //Indicate this module has be initialized
+                this.inited = true;
+
+                this.ignore = options.ignore;
+
+                //Could have option to init this module in enabled mode,
+                //or could have been previously marked as enabled. However,
+                //the dependencies are not known until init is called. So
+                //if enabled previously, now trigger dependencies as enabled.
+                if (options.enabled || this.enabled) {
+                    //Enable this module and dependencies.
+                    //Will call this.check()
+                    this.enable();
+                } else {
+                    this.check();
+                }
+            },
+
+            defineDep: function (i, depExports) {
+                //Because of cycles, defined callback for a given
+                //export can be called more than once.
+                if (!this.depMatched[i]) {
+                    this.depMatched[i] = true;
+                    this.depCount -= 1;
+                    this.depExports[i] = depExports;
+                }
+            },
+
+            fetch: function () {
+                if (this.fetched) {
+                    return;
+                }
+                this.fetched = true;
+
+                context.startTime = (new Date()).getTime();
+
+                var map = this.map;
+
+                //If the manager is for a plugin managed resource,
+                //ask the plugin to load it now.
+                if (this.shim) {
+                    context.makeRequire(this.map, {
+                        enableBuildCallback: true
+                    })(this.shim.deps || [], bind(this, function () {
+                        return map.prefix ? this.callPlugin() : this.load();
+                    }));
+                } else {
+                    //Regular dependency.
+                    return map.prefix ? this.callPlugin() : this.load();
+                }
+            },
+
+            load: function () {
+                var url = this.map.url;
+
+                //Regular dependency.
+                if (!urlFetched[url]) {
+                    urlFetched[url] = true;
+                    context.load(this.map.id, url);
+                }
+            },
+
+            /**
+             * Checks is the module is ready to define itself, and if so,
+             * define it.
+             */
+            check: function () {
+                if (!this.enabled || this.enabling) {
+                    return;
+                }
+
+                var err, cjsModule,
+                    id = this.map.id,
+                    depExports = this.depExports,
+                    exports = this.exports,
+                    factory = this.factory;
+
+                if (!this.inited) {
+                    this.fetch();
+                } else if (this.error) {
+                    this.emit('error', this.error);
+                } else if (!this.defining) {
+                    //The factory could trigger another require call
+                    //that would result in checking this module to
+                    //define itself again. If already in the process
+                    //of doing that, skip this work.
+                    this.defining = true;
+
+                    if (this.depCount < 1 && !this.defined) {
+                        if (isFunction(factory)) {
+                            //If there is an error listener, favor passing
+                            //to that instead of throwing an error.
+                            if (this.events.error) {
+                                try {
+                                    exports = context.execCb(id, factory, depExports, exports);
+                                } catch (e) {
+                                    err = e;
+                                }
+                            } else {
+                                exports = context.execCb(id, factory, depExports, exports);
+                            }
+
+                            if (this.map.isDefine) {
+                                //If setting exports via 'module' is in play,
+                                //favor that over return value and exports. After that,
+                                //favor a non-undefined return value over exports use.
+                                cjsModule = this.module;
+                                if (cjsModule &&
+                                        cjsModule.exports !== undefined &&
+                                        //Make sure it is not already the exports value
+                                        cjsModule.exports !== this.exports) {
+                                    exports = cjsModule.exports;
+                                } else if (exports === undefined && this.usingExports) {
+                                    //exports already set the defined value.
+                                    exports = this.exports;
+                                }
+                            }
+
+                            if (err) {
+                                err.requireMap = this.map;
+                                err.requireModules = [this.map.id];
+                                err.requireType = 'define';
+                                return onError((this.error = err));
+                            }
+
+                        } else {
+                            //Just a literal value
+                            exports = factory;
+                        }
+
+                        this.exports = exports;
+
+                        if (this.map.isDefine && !this.ignore) {
+                            defined[id] = exports;
+
+                            if (req.onResourceLoad) {
+                                req.onResourceLoad(context, this.map, this.depMaps);
+                            }
+                        }
+
+                        //Clean up
+                        delete registry[id];
+
+                        this.defined = true;
+                    }
+
+                    //Finished the define stage. Allow calling check again
+                    //to allow define notifications below in the case of a
+                    //cycle.
+                    this.defining = false;
+
+                    if (this.defined && !this.defineEmitted) {
+                        this.defineEmitted = true;
+                        this.emit('defined', this.exports);
+                        this.defineEmitComplete = true;
+                    }
+
+                }
+            },
+
+            callPlugin: function () {
+                var map = this.map,
+                    id = map.id,
+                    //Map already normalized the prefix.
+                    pluginMap = makeModuleMap(map.prefix);
+
+                //Mark this as a dependency for this plugin, so it
+                //can be traced for cycles.
+                this.depMaps.push(pluginMap);
+
+                on(pluginMap, 'defined', bind(this, function (plugin) {
+                    var load, normalizedMap, normalizedMod,
+                        name = this.map.name,
+                        parentName = this.map.parentMap ? this.map.parentMap.name : null,
+                        localRequire = context.makeRequire(map.parentMap, {
+                            enableBuildCallback: true,
+                            skipMap: true
+                        });
+
+                    //If current map is not normalized, wait for that
+                    //normalized name to load instead of continuing.
+                    if (this.map.unnormalized) {
+                        //Normalize the ID if the plugin allows it.
+                        if (plugin.normalize) {
+                            name = plugin.normalize(name, function (name) {
+                                return normalize(name, parentName, true);
+                            }) || '';
+                        }
+
+                        //prefix and name should already be normalized, no need
+                        //for applying map config again either.
+                        normalizedMap = makeModuleMap(map.prefix + '!' + name,
+                                                      this.map.parentMap);
+                        on(normalizedMap,
+                            'defined', bind(this, function (value) {
+                                this.init([], function () { return value; }, null, {
+                                    enabled: true,
+                                    ignore: true
+                                });
+                            }));
+
+                        normalizedMod = getOwn(registry, normalizedMap.id);
+                        if (normalizedMod) {
+                            //Mark this as a dependency for this plugin, so it
+                            //can be traced for cycles.
+                            this.depMaps.push(normalizedMap);
+
+                            if (this.events.error) {
+                                normalizedMod.on('error', bind(this, function (err) {
+                                    this.emit('error', err);
+                                }));
+                            }
+                            normalizedMod.enable();
+                        }
+
+                        return;
+                    }
+
+                    load = bind(this, function (value) {
+                        this.init([], function () { return value; }, null, {
+                            enabled: true
+                        });
+                    });
+
+                    load.error = bind(this, function (err) {
+                        this.inited = true;
+                        this.error = err;
+                        err.requireModules = [id];
+
+                        //Remove temp unnormalized modules for this module,
+                        //since they will never be resolved otherwise now.
+                        eachProp(registry, function (mod) {
+                            if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
+                                cleanRegistry(mod.map.id);
+                            }
+                        });
+
+                        onError(err);
+                    });
+
+                    //Allow plugins to load other code without having to know the
+                    //context or how to 'complete' the load.
+                    load.fromText = bind(this, function (text, textAlt) {
+                        /*jslint evil: true */
+                        var moduleName = map.name,
+                            moduleMap = makeModuleMap(moduleName),
+                            hasInteractive = useInteractive;
+
+                        //As of 2.1.0, support just passing the text, to reinforce
+                        //fromText only being called once per resource. Still
+                        //support old style of passing moduleName but discard
+                        //that moduleName in favor of the internal ref.
+                        if (textAlt) {
+                            text = textAlt;
+                        }
+
+                        //Turn off interactive script matching for IE for any define
+                        //calls in the text, then turn it back on at the end.
+                        if (hasInteractive) {
+                            useInteractive = false;
+                        }
+
+                        //Prime the system by creating a module instance for
+                        //it.
+                        getModule(moduleMap);
+
+                        //Transfer any config to this other module.
+                        if (hasProp(config.config, id)) {
+                            config.config[moduleName] = config.config[id];
+                        }
+
+                        try {
+                            req.exec(text);
+                        } catch (e) {
+                            throw new Error('fromText eval for ' + moduleName +
+                                            ' failed: ' + e);
+                        }
+
+                        if (hasInteractive) {
+                            useInteractive = true;
+                        }
+
+                        //Mark this as a dependency for the plugin
+                        //resource
+                        this.depMaps.push(moduleMap);
+
+                        //Support anonymous modules.
+                        context.completeLoad(moduleName);
+
+                        //Bind the value of that module to the value for this
+                        //resource ID.
+                        localRequire([moduleName], load);
+                    });
+
+                    //Use parentName here since the plugin's name is not reliable,
+                    //could be some weird string with no path that actually wants to
+                    //reference the parentName's path.
+                    plugin.load(map.name, localRequire, load, config);
+                }));
+
+                context.enable(pluginMap, this);
+                this.pluginMaps[pluginMap.id] = pluginMap;
+            },
+
+            enable: function () {
+                this.enabled = true;
+
+                //Set flag mentioning that the module is enabling,
+                //so that immediate calls to the defined callbacks
+                //for dependencies do not trigger inadvertent load
+                //with the depCount still being zero.
+                this.enabling = true;
+
+                //Enable each dependency
+                each(this.depMaps, bind(this, function (depMap, i) {
+                    var id, mod, handler;
+
+                    if (typeof depMap === 'string') {
+                        //Dependency needs to be converted to a depMap
+                        //and wired up to this module.
+                        depMap = makeModuleMap(depMap,
+                                               (this.map.isDefine ? this.map : this.map.parentMap),
+                                               false,
+                                               !this.skipMap);
+                        this.depMaps[i] = depMap;
+
+                        handler = getOwn(handlers, depMap.id);
+
+                        if (handler) {
+                            this.depExports[i] = handler(this);
+                            return;
+                        }
+
+                        this.depCount += 1;
+
+                        on(depMap, 'defined', bind(this, function (depExports) {
+                            this.defineDep(i, depExports);
+                            this.check();
+                        }));
+
+                        if (this.errback) {
+                            on(depMap, 'error', this.errback);
+                        }
+                    }
+
+                    id = depMap.id;
+                    mod = registry[id];
+
+                    //Skip special modules like 'require', 'exports', 'module'
+                    //Also, don't call enable if it is already enabled,
+                    //important in circular dependency cases.
+                    if (!hasProp(handlers, id) && mod && !mod.enabled) {
+                        context.enable(depMap, this);
+                    }
+                }));
+
+                //Enable each plugin that is used in
+                //a dependency
+                eachProp(this.pluginMaps, bind(this, function (pluginMap) {
+                    var mod = getOwn(registry, pluginMap.id);
+                    if (mod && !mod.enabled) {
+                        context.enable(pluginMap, this);
+                    }
+                }));
+
+                this.enabling = false;
+
+                this.check();
+            },
+
+            on: function (name, cb) {
+                var cbs = this.events[name];
+                if (!cbs) {
+                    cbs = this.events[name] = [];
+                }
+                cbs.push(cb);
+            },
+
+            emit: function (name, evt) {
+                each(this.events[name], function (cb) {
+                    cb(evt);
+                });
+                if (name === 'error') {
+                    //Now that the error handler was triggered, remove
+                    //the listeners, since this broken Module instance
+                    //can stay around for a while in the registry.
+                    delete this.events[name];
+                }
+            }
+        };
+
+        function callGetModule(args) {
+            //Skip modules already defined.
+            if (!hasProp(defined, args[0])) {
+                getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
+            }
+        }
+
+        function removeListener(node, func, name, ieName) {
+            //Favor detachEvent because of IE9
+            //issue, see attachEvent/addEventListener comment elsewhere
+            //in this file.
+            if (node.detachEvent && !isOpera) {
+                //Probably IE. If not it will throw an error, which will be
+                //useful to know.
+                if (ieName) {
+                    node.detachEvent(ieName, func);
+                }
+            } else {
+                node.removeEventListener(name, func, false);
+            }
+        }
+
+        /**
+         * Given an event from a script node, get the requirejs info from it,
+         * and then removes the event listeners on the node.
+         * @param {Event} evt
+         * @returns {Object}
+         */
+        function getScriptData(evt) {
+            //Using currentTarget instead of target for Firefox 2.0's sake. Not
+            //all old browsers will be supported, but this one was easy enough
+            //to support and still makes sense.
+            var node = evt.currentTarget || evt.srcElement;
+
+            //Remove the listeners once here.
+            removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange');
+            removeListener(node, context.onScriptError, 'error');
+
+            return {
+                node: node,
+                id: node && node.getAttribute('data-requiremodule')
+            };
+        }
+
+        function intakeDefines() {
+            var args;
+
+            //Any defined modules in the global queue, intake them now.
+            takeGlobalQueue();
+
+            //Make sure any remaining defQueue items get properly processed.
+            while (defQueue.length) {
+                args = defQueue.shift();
+                if (args[0] === null) {
+                    return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+                } else {
+                    //args are id, deps, factory. Should be normalized by the
+                    //define() function.
+                    callGetModule(args);
+                }
+            }
+        }
+
+        context = {
+            config: config,
+            contextName: contextName,
+            registry: registry,
+            defined: defined,
+            urlFetched: urlFetched,
+            defQueue: defQueue,
+            Module: Module,
+            makeModuleMap: makeModuleMap,
+            nextTick: req.nextTick,
+
+            /**
+             * Set a configuration for the context.
+             * @param {Object} cfg config object to integrate.
+             */
+            configure: function (cfg) {
+                //Make sure the baseUrl ends in a slash.
+                if (cfg.baseUrl) {
+                    if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') {
+                        cfg.baseUrl += '/';
+                    }
+                }
+
+                //Save off the paths and packages since they require special processing,
+                //they are additive.
+                var pkgs = config.pkgs,
+                    shim = config.shim,
+                    objs = {
+                        paths: true,
+                        config: true,
+                        map: true
+                    };
+
+                eachProp(cfg, function (value, prop) {
+                    if (objs[prop]) {
+                        if (prop === 'map') {
+                            mixin(config[prop], value, true, true);
+                        } else {
+                            mixin(config[prop], value, true);
+                        }
+                    } else {
+                        config[prop] = value;
+                    }
+                });
+
+                //Merge shim
+                if (cfg.shim) {
+                    eachProp(cfg.shim, function (value, id) {
+                        //Normalize the structure
+                        if (isArray(value)) {
+                            value = {
+                                deps: value
+                            };
+                        }
+                        if ((value.exports || value.init) && !value.exportsFn) {
+                            value.exportsFn = context.makeShimExports(value);
+                        }
+                        shim[id] = value;
+                    });
+                    config.shim = shim;
+                }
+
+                //Adjust packages if necessary.
+                if (cfg.packages) {
+                    each(cfg.packages, function (pkgObj) {
+                        var location;
+
+                        pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
+                        location = pkgObj.location;
+
+                        //Create a brand new object on pkgs, since currentPackages can
+                        //be passed in again, and config.pkgs is the internal transformed
+                        //state for all package configs.
+                        pkgs[pkgObj.name] = {
+                            name: pkgObj.name,
+                            location: location || pkgObj.name,
+                            //Remove leading dot in main, so main paths are normalized,
+                            //and remove any trailing .js, since different package
+                            //envs have different conventions: some use a module name,
+                            //some use a file name.
+                            main: (pkgObj.main || 'main')
+                                  .replace(currDirRegExp, '')
+                                  .replace(jsSuffixRegExp, '')
+                        };
+                    });
+
+                    //Done with modifications, assing packages back to context config
+                    config.pkgs = pkgs;
+                }
+
+                //If there are any "waiting to execute" modules in the registry,
+                //update the maps for them, since their info, like URLs to load,
+                //may have changed.
+                eachProp(registry, function (mod, id) {
+                    //If module already has init called, since it is too
+                    //late to modify them, and ignore unnormalized ones
+                    //since they are transient.
+                    if (!mod.inited && !mod.map.unnormalized) {
+                        mod.map = makeModuleMap(id);
+                    }
+                });
+
+                //If a deps array or a config callback is specified, then call
+                //require with those args. This is useful when require is defined as a
+                //config object before require.js is loaded.
+                if (cfg.deps || cfg.callback) {
+                    context.require(cfg.deps || [], cfg.callback);
+                }
+            },
+
+            makeShimExports: function (value) {
+                function fn() {
+                    var ret;
+                    if (value.init) {
+                        ret = value.init.apply(global, arguments);
+                    }
+                    return ret || (value.exports && getGlobal(value.exports));
+                }
+                return fn;
+            },
+
+            makeRequire: function (relMap, options) {
+                options = options || {};
+
+                function localRequire(deps, callback, errback) {
+                    var id, map, requireMod;
+
+                    if (options.enableBuildCallback && callback && isFunction(callback)) {
+                        callback.__requireJsBuild = true;
+                    }
+
+                    if (typeof deps === 'string') {
+                        if (isFunction(callback)) {
+                            //Invalid call
+                            return onError(makeError('requireargs', 'Invalid require call'), errback);
+                        }
+
+                        //If require|exports|module are requested, get the
+                        //value for them from the special handlers. Caveat:
+                        //this only works while module is being defined.
+                        if (relMap && hasProp(handlers, deps)) {
+                            return handlers[deps](registry[relMap.id]);
+                        }
+
+                        //Synchronous access to one module. If require.get is
+                        //available (as in the Node adapter), prefer that.
+                        if (req.get) {
+                            return req.get(context, deps, relMap);
+                        }
+
+                        //Normalize module name, if it contains . or ..
+                        map = makeModuleMap(deps, relMap, false, true);
+                        id = map.id;
+
+                        if (!hasProp(defined, id)) {
+                            return onError(makeError('notloaded', 'Module name "' +
+                                        id +
+                                        '" has not been loaded yet for context: ' +
+                                        contextName +
+                                        (relMap ? '' : '. Use require([])')));
+                        }
+                        return defined[id];
+                    }
+
+                    //Grab defines waiting in the global queue.
+                    intakeDefines();
+
+                    //Mark all the dependencies as needing to be loaded.
+                    context.nextTick(function () {
+                        //Some defines could have been added since the
+                        //require call, collect them.
+                        intakeDefines();
+
+                        requireMod = getModule(makeModuleMap(null, relMap));
+
+                        //Store if map config should be applied to this require
+                        //call for dependencies.
+                        requireMod.skipMap = options.skipMap;
+
+                        requireMod.init(deps, callback, errback, {
+                            enabled: true
+                        });
+
+                        checkLoaded();
+                    });
+
+                    return localRequire;
+                }
+
+                mixin(localRequire, {
+                    isBrowser: isBrowser,
+
+                    /**
+                     * Converts a module name + .extension into an URL path.
+                     * *Requires* the use of a module name. It does not support using
+                     * plain URLs like nameToUrl.
+                     */
+                    toUrl: function (moduleNamePlusExt) {
+                        var index = moduleNamePlusExt.lastIndexOf('.'),
+                            ext = null;
+
+                        if (index !== -1) {
+                            ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
+                            moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
+                        }
+
+                        return context.nameToUrl(normalize(moduleNamePlusExt,
+                                                relMap && relMap.id, true), ext);
+                    },
+
+                    defined: function (id) {
+                        return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
+                    },
+
+                    specified: function (id) {
+                        id = makeModuleMap(id, relMap, false, true).id;
+                        return hasProp(defined, id) || hasProp(registry, id);
+                    }
+                });
+
+                //Only allow undef on top level require calls
+                if (!relMap) {
+                    localRequire.undef = function (id) {
+                        //Bind any waiting define() calls to this context,
+                        //fix for #408
+                        takeGlobalQueue();
+
+                        var map = makeModuleMap(id, relMap, true),
+                            mod = getOwn(registry, id);
+
+                        delete defined[id];
+                        delete urlFetched[map.url];
+                        delete undefEvents[id];
+
+                        if (mod) {
+                            //Hold on to listeners in case the
+                            //module will be attempted to be reloaded
+                            //using a different config.
+                            if (mod.events.defined) {
+                                undefEvents[id] = mod.events;
+                            }
+
+                            cleanRegistry(id);
+                        }
+                    };
+                }
+
+                return localRequire;
+            },
+
+            /**
+             * Called to enable a module if it is still in the registry
+             * awaiting enablement. parent module is passed in for context,
+             * used by the optimizer.
+             */
+            enable: function (depMap, parent) {
+                var mod = getOwn(registry, depMap.id);
+                if (mod) {
+                    getModule(depMap).enable();
+                }
+            },
+
+            /**
+             * Internal method used by environment adapters to complete a load event.
+             * A load event could be a script load or just a load pass from a synchronous
+             * load call.
+             * @param {String} moduleName the name of the module to potentially complete.
+             */
+            completeLoad: function (moduleName) {
+                var found, args, mod,
+                    shim = getOwn(config.shim, moduleName) || {},
+                    shExports = shim.exports;
+
+                takeGlobalQueue();
+
+                while (defQueue.length) {
+                    args = defQueue.shift();
+                    if (args[0] === null) {
+                        args[0] = moduleName;
+                        //If already found an anonymous module and bound it
+                        //to this name, then this is some other anon module
+                        //waiting for its completeLoad to fire.
+                        if (found) {
+                            break;
+                        }
+                        found = true;
+                    } else if (args[0] === moduleName) {
+                        //Found matching define call for this script!
+                        found = true;
+                    }
+
+                    callGetModule(args);
+                }
+
+                //Do this after the cycle of callGetModule in case the result
+                //of those calls/init calls changes the registry.
+                mod = getOwn(registry, moduleName);
+
+                if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
+                    if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
+                        if (hasPathFallback(moduleName)) {
+                            return;
+                        } else {
+                            return onError(makeError('nodefine',
+                                             'No define call for ' + moduleName,
+                                             null,
+                                             [moduleName]));
+                        }
+                    } else {
+                        //A script that does not call define(), so just simulate
+                        //the call for it.
+                        callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
+                    }
+                }
+
+                checkLoaded();
+            },
+
+            /**
+             * Converts a module name to a file path. Supports cases where
+             * moduleName may actually be just an URL.
+             * Note that it **does not** call normalize on the moduleName,
+             * it is assumed to have already been normalized. This is an
+             * internal API, not a public one. Use toUrl for the public API.
+             */
+            nameToUrl: function (moduleName, ext) {
+                var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
+                    parentPath;
+
+                //If a colon is in the URL, it indicates a protocol is used and it is just
+                //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
+                //or ends with .js, then assume the user meant to use an url and not a module id.
+                //The slash is important for protocol-less URLs as well as full paths.
+                if (req.jsExtRegExp.test(moduleName)) {
+                    //Just a plain path, not module name lookup, so just return it.
+                    //Add extension if it is included. This is a bit wonky, only non-.js things pass
+                    //an extension, this method probably needs to be reworked.
+                    url = moduleName + (ext || '');
+                } else {
+                    //A module that needs to be converted to a path.
+                    paths = config.paths;
+                    pkgs = config.pkgs;
+
+                    syms = moduleName.split('/');
+                    //For each module name segment, see if there is a path
+                    //registered for it. Start with most specific name
+                    //and work up from it.
+                    for (i = syms.length; i > 0; i -= 1) {
+                        parentModule = syms.slice(0, i).join('/');
+                        pkg = getOwn(pkgs, parentModule);
+                        parentPath = getOwn(paths, parentModule);
+                        if (parentPath) {
+                            //If an array, it means there are a few choices,
+                            //Choose the one that is desired
+                            if (isArray(parentPath)) {
+                                parentPath = parentPath[0];
+                            }
+                            syms.splice(0, i, parentPath);
+                            break;
+                        } else if (pkg) {
+                            //If module name is just the package name, then looking
+                            //for the main module.
+                            if (moduleName === pkg.name) {
+                                pkgPath = pkg.location + '/' + pkg.main;
+                            } else {
+                                pkgPath = pkg.location;
+                            }
+                            syms.splice(0, i, pkgPath);
+                            break;
+                        }
+                    }
+
+                    //Join the path parts together, then figure out if baseUrl is needed.
+                    url = syms.join('/');
+                    url += (ext || (/\?/.test(url) ? '' : '.js'));
+                    url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
+                }
+
+                return config.urlArgs ? url +
+                                        ((url.indexOf('?') === -1 ? '?' : '&') +
+                                         config.urlArgs) : url;
+            },
+
+            //Delegates to req.load. Broken out as a separate function to
+            //allow overriding in the optimizer.
+            load: function (id, url) {
+                req.load(context, id, url);
+            },
+
+            /**
+             * Executes a module callack function. Broken out as a separate function
+             * solely to allow the build system to sequence the files in the built
+             * layer in the right sequence.
+             *
+             * @private
+             */
+            execCb: function (name, callback, args, exports) {
+                return callback.apply(exports, args);
+            },
+
+            /**
+             * callback for script loads, used to check status of loading.
+             *
+             * @param {Event} evt the event from the browser for the script
+             * that was loaded.
+             */
+            onScriptLoad: function (evt) {
+                //Using currentTarget instead of target for Firefox 2.0's sake. Not
+                //all old browsers will be supported, but this one was easy enough
+                //to support and still makes sense.
+                if (evt.type === 'load' ||
+                        (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
+                    //Reset interactive script so a script node is not held onto for
+                    //to long.
+                    interactiveScript = null;
+
+                    //Pull out the name of the module and the context.
+                    var data = getScriptData(evt);
+                    context.completeLoad(data.id);
+                }
+            },
+
+            /**
+             * Callback for script errors.
+             */
+            onScriptError: function (evt) {
+                var data = getScriptData(evt);
+                if (!hasPathFallback(data.id)) {
+                    return onError(makeError('scripterror', 'Script error', evt, [data.id]));
+                }
+            }
+        };
+
+        context.require = context.makeRequire();
+        return context;
+    }
+
+    /**
+     * Main entry point.
+     *
+     * If the only argument to require is a string, then the module that
+     * is represented by that string is fetched for the appropriate context.
+     *
+     * If the first argument is an array, then it will be treated as an array
+     * of dependency string names to fetch. An optional function callback can
+     * be specified to execute when all of those dependencies are available.
+     *
+     * Make a local req variable to help Caja compliance (it assumes things
+     * on a require that are not standardized), and to give a short
+     * name for minification/local scope use.
+     */
+    req = requirejs = function (deps, callback, errback, optional) {
+
+        //Find the right context, use default
+        var context, config,
+            contextName = defContextName;
+
+        // Determine if have config object in the call.
+        if (!isArray(deps) && typeof deps !== 'string') {
+            // deps is a config object
+            config = deps;
+            if (isArray(callback)) {
+                // Adjust args if there are dependencies
+                deps = callback;
+                callback = errback;
+                errback = optional;
+            } else {
+                deps = [];
+            }
+        }
+
+        if (config && config.context) {
+            contextName = config.context;
+        }
+
+        context = getOwn(contexts, contextName);
+        if (!context) {
+            context = contexts[contextName] = req.s.newContext(contextName);
+        }
+
+        if (config) {
+            context.configure(config);
+        }
+
+        return context.require(deps, callback, errback);
+    };
+
+    /**
+     * Support require.config() to make it easier to cooperate with other
+     * AMD loaders on globally agreed names.
+     */
+    req.config = function (config) {
+        return req(config);
+    };
+
+    /**
+     * Execute something after the current tick
+     * of the event loop. Override for other envs
+     * that have a better solution than setTimeout.
+     * @param  {Function} fn function to execute later.
+     */
+    req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
+        setTimeout(fn, 4);
+    } : function (fn) { fn(); };
+
+    /**
+     * Export require as a global, but only if it does not already exist.
+     */
+    if (!require) {
+        require = req;
+    }
+
+    req.version = version;
+
+    //Used to filter out dependencies that are already paths.
+    req.jsExtRegExp = /^\/|:|\?|\.js$/;
+    req.isBrowser = isBrowser;
+    s = req.s = {
+        contexts: contexts,
+        newContext: newContext
+    };
+
+    //Create default context.
+    req({});
+
+    //Exports some context-sensitive methods on global require.
+    each([
+        'toUrl',
+        'undef',
+        'defined',
+        'specified'
+    ], function (prop) {
+        //Reference from contexts instead of early binding to default context,
+        //so that during builds, the latest instance of the default context
+        //with its config gets used.
+        req[prop] = function () {
+            var ctx = contexts[defContextName];
+            return ctx.require[prop].apply(ctx, arguments);
+        };
+    });
+
+    if (isBrowser) {
+        head = s.head = document.getElementsByTagName('head')[0];
+        //If BASE tag is in play, using appendChild is a problem for IE6.
+        //When that browser dies, this can be removed. Details in this jQuery bug:
+        //http://dev.jquery.com/ticket/2709
+        baseElement = document.getElementsByTagName('base')[0];
+        if (baseElement) {
+            head = s.head = baseElement.parentNode;
+        }
+    }
+
+    /**
+     * Any errors that require explicitly generates will be passed to this
+     * function. Intercept/override it if you want custom error handling.
+     * @param {Error} err the error object.
+     */
+    req.onError = function (err) {
+        throw err;
+    };
+
+    /**
+     * Does the request to load a module for the browser case.
+     * Make this a separate function to allow other environments
+     * to override it.
+     *
+     * @param {Object} context the require context to find state.
+     * @param {String} moduleName the name of the module.
+     * @param {Object} url the URL to the module.
+     */
+    req.load = function (context, moduleName, url) {
+        var config = (context && context.config) || {},
+            node;
+        if (isBrowser) {
+            //In the browser so use a script tag
+            node = config.xhtml ?
+                    document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+                    document.createElement('script');
+            node.type = config.scriptType || 'text/javascript';
+            node.charset = 'utf-8';
+            node.async = true;
+
+            node.setAttribute('data-requirecontext', context.contextName);
+            node.setAttribute('data-requiremodule', moduleName);
+
+            //Set up load listener. Test attachEvent first because IE9 has
+            //a subtle issue in its addEventListener and script onload firings
+            //that do not match the behavior of all other browsers with
+            //addEventListener support, which fire the onload event for a
+            //script right after the script execution. See:
+            //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution
+            //UNFORTUNATELY Opera implements attachEvent but does not follow the script
+            //script execution mode.
+            if (node.attachEvent &&
+                    //Check if node.attachEvent is artificially added by custom script or
+                    //natively supported by browser
+                    //read https://github.com/jrburke/requirejs/issues/187
+                    //if we can NOT find [native code] then it must NOT natively supported.
+                    //in IE8, node.attachEvent does not have toString()
+                    //Note the test for "[native code" with no closing brace, see:
+                    //https://github.com/jrburke/requirejs/issues/273
+                    !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
+                    !isOpera) {
+                //Probably IE. IE (at least 6-8) do not fire
+                //script onload right after executing the script, so
+                //we cannot tie the anonymous define call to a name.
+                //However, IE reports the script as being in 'interactive'
+                //readyState at the time of the define call.
+                useInteractive = true;
+
+                node.attachEvent('onreadystatechange', context.onScriptLoad);
+                //It would be great to add an error handler here to catch
+                //404s in IE9+. However, onreadystatechange will fire before
+                //the error handler, so that does not help. If addEvenListener
+                //is used, then IE will fire error before load, but we cannot
+                //use that pathway given the connect.microsoft.com issue
+                //mentioned above about not doing the 'script execute,
+                //then fire the script load event listener before execute
+                //next script' that other browsers do.
+                //Best hope: IE10 fixes the issues,
+                //and then destroys all installs of IE 6-9.
+                //node.attachEvent('onerror', context.onScriptError);
+            } else {
+                node.addEventListener('load', context.onScriptLoad, false);
+                node.addEventListener('error', context.onScriptError, false);
+            }
+            node.src = url;
+
+            //For some cache cases in IE 6-8, the script executes before the end
+            //of the appendChild execution, so to tie an anonymous define
+            //call to the module name (which is stored on the node), hold on
+            //to a reference to this node, but clear after the DOM insertion.
+            currentlyAddingScript = node;
+            if (baseElement) {
+                head.insertBefore(node, baseElement);
+            } else {
+                head.appendChild(node);
+            }
+            currentlyAddingScript = null;
+
+            return node;
+        } else if (isWebWorker) {
+            //In a web worker, use importScripts. This is not a very
+            //efficient use of importScripts, importScripts will block until
+            //its script is downloaded and evaluated. However, if web workers
+            //are in play, the expectation that a build has been done so that
+            //only one script needs to be loaded anyway. This may need to be
+            //reevaluated if other use cases become common.
+            importScripts(url);
+
+            //Account for anonymous modules
+            context.completeLoad(moduleName);
+        }
+    };
+
+    function getInteractiveScript() {
+        if (interactiveScript && interactiveScript.readyState === 'interactive') {
+            return interactiveScript;
+        }
+
+        eachReverse(scripts(), function (script) {
+            if (script.readyState === 'interactive') {
+                return (interactiveScript = script);
+            }
+        });
+        return interactiveScript;
+    }
+
+    //Look for a data-main script attribute, which could also adjust the baseUrl.
+    if (isBrowser) {
+        //Figure out baseUrl. Get it from the script tag with require.js in it.
+        eachReverse(scripts(), function (script) {
+            //Set the 'head' where we can append children by
+            //using the script's parent.
+            if (!head) {
+                head = script.parentNode;
+            }
+
+            //Look for a data-main attribute to set main script for the page
+            //to load. If it is there, the path to data main becomes the
+            //baseUrl, if it is not already set.
+            dataMain = script.getAttribute('data-main');
+            if (dataMain) {
+                //Set final baseUrl if there is not already an explicit one.
+                if (!cfg.baseUrl) {
+                    //Pull off the directory of data-main for use as the
+                    //baseUrl.
+                    src = dataMain.split('/');
+                    mainScript = src.pop();
+                    subPath = src.length ? src.join('/')  + '/' : './';
+
+                    cfg.baseUrl = subPath;
+                    dataMain = mainScript;
+                }
+
+                //Strip off any trailing .js since dataMain is now
+                //like a module name.
+                dataMain = dataMain.replace(jsSuffixRegExp, '');
+
+                //Put the data-main script in the files to load.
+                cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain];
+
+                return true;
+            }
+        });
+    }
+
+    /**
+     * The function that handles definitions of modules. Differs from
+     * require() in that a string for the module should be the first argument,
+     * and the function to execute after dependencies are loaded should
+     * return a value to define the module corresponding to the first argument's
+     * name.
+     */
+    define = function (name, deps, callback) {
+        var node, context;
+
+        //Allow for anonymous modules
+        if (typeof name !== 'string') {
+            //Adjust args appropriately
+            callback = deps;
+            deps = name;
+            name = null;
+        }
+
+        //This module may not have dependencies
+        if (!isArray(deps)) {
+            callback = deps;
+            deps = [];
+        }
+
+        //If no name, and callback is a function, then figure out if it a
+        //CommonJS thing with dependencies.
+        if (!deps.length && isFunction(callback)) {
+            //Remove comments from the callback string,
+            //look for require calls, and pull them into the dependencies,
+            //but only if there are function args.
+            if (callback.length) {
+                callback
+                    .toString()
+                    .replace(commentRegExp, '')
+                    .replace(cjsRequireRegExp, function (match, dep) {
+                        deps.push(dep);
+                    });
+
+                //May be a CommonJS thing even without require calls, but still
+                //could use exports, and module. Avoid doing exports and module
+                //work though if it just needs require.
+                //REQUIRES the function to expect the CommonJS variables in the
+                //order listed below.
+                deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps);
+            }
+        }
+
+        //If in IE 6-8 and hit an anonymous define() call, do the interactive
+        //work.
+        if (useInteractive) {
+            node = currentlyAddingScript || getInteractiveScript();
+            if (node) {
+                if (!name) {
+                    name = node.getAttribute('data-requiremodule');
+                }
+                context = contexts[node.getAttribute('data-requirecontext')];
+            }
+        }
+
+        //Always save off evaluating the def call until the script onload handler.
+        //This allows multiple modules to be in a file without prematurely
+        //tracing dependencies, and allows for anonymous module support,
+        //where the module name is not known until the script onload event
+        //occurs. If no context, use the global queue, and get it processed
+        //in the onscript load callback.
+        (context ? context.defQueue : globalDefQueue).push([name, deps, callback]);
+    };
+
+    define.amd = {
+        jQuery: true
+    };
+
+
+    /**
+     * Executes the text. Normally just uses eval, but can be modified
+     * to use a better, environment-specific call. Only used for transpiling
+     * loader plugins, not for plain JS modules.
+     * @param {String} text the text to execute/evaluate.
+     */
+    req.exec = function (text) {
+        /*jslint evil: true */
+        return eval(text);
+    };
+
+    //Set up with config info.
+    req(cfg);
+}(this));
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/js/to_jsonp.py b/addons/im_livechat/static/ext/static/js/to_jsonp.py
new file mode 100644
index 00000000000..61f1a885768
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/to_jsonp.py
@@ -0,0 +1,12 @@
+
+import sys
+import json
+
+file_name = sys.argv[1]
+function_name = sys.argv[2]
+
+with open(file_name) as file_:
+    content = file_.read()
+
+print "window.%s(%s);" % (function_name, json.dumps(content))
+
diff --git a/addons/im_livechat/static/ext/static/js/underscore.js b/addons/im_livechat/static/ext/static/js/underscore.js
new file mode 100644
index 00000000000..c2517054bfb
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/underscore.js
@@ -0,0 +1,1221 @@
+//     Underscore.js 1.4.3
+//     http://underscorejs.org
+//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+//     Underscore may be freely distributed under the MIT license.
+
+(function() {
+
+  // Baseline setup
+  // --------------
+
+  // Establish the root object, `window` in the browser, or `global` on the server.
+  var root = this;
+
+  // Save the previous value of the `_` variable.
+  var previousUnderscore = root._;
+
+  // Establish the object that gets returned to break out of a loop iteration.
+  var breaker = {};
+
+  // Save bytes in the minified (but not gzipped) version:
+  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
+
+  // Create quick reference variables for speed access to core prototypes.
+  var push             = ArrayProto.push,
+      slice            = ArrayProto.slice,
+      concat           = ArrayProto.concat,
+      toString         = ObjProto.toString,
+      hasOwnProperty   = ObjProto.hasOwnProperty;
+
+  // All **ECMAScript 5** native function implementations that we hope to use
+  // are declared here.
+  var
+    nativeForEach      = ArrayProto.forEach,
+    nativeMap          = ArrayProto.map,
+    nativeReduce       = ArrayProto.reduce,
+    nativeReduceRight  = ArrayProto.reduceRight,
+    nativeFilter       = ArrayProto.filter,
+    nativeEvery        = ArrayProto.every,
+    nativeSome         = ArrayProto.some,
+    nativeIndexOf      = ArrayProto.indexOf,
+    nativeLastIndexOf  = ArrayProto.lastIndexOf,
+    nativeIsArray      = Array.isArray,
+    nativeKeys         = Object.keys,
+    nativeBind         = FuncProto.bind;
+
+  // Create a safe reference to the Underscore object for use below.
+  var _ = function(obj) {
+    if (obj instanceof _) return obj;
+    if (!(this instanceof _)) return new _(obj);
+    this._wrapped = obj;
+  };
+
+  // Export the Underscore object for **Node.js**, with
+  // backwards-compatibility for the old `require()` API. If we're in
+  // the browser, add `_` as a global object via a string identifier,
+  // for Closure Compiler "advanced" mode.
+  if (typeof exports !== 'undefined') {
+    if (typeof module !== 'undefined' && module.exports) {
+      exports = module.exports = _;
+    }
+    exports._ = _;
+  } else {
+    root._ = _;
+  }
+
+  // Current version.
+  _.VERSION = '1.4.3';
+
+  // Collection Functions
+  // --------------------
+
+  // The cornerstone, an `each` implementation, aka `forEach`.
+  // Handles objects with the built-in `forEach`, arrays, and raw objects.
+  // Delegates to **ECMAScript 5**'s native `forEach` if available.
+  var each = _.each = _.forEach = function(obj, iterator, context) {
+    if (obj == null) return;
+    if (nativeForEach && obj.forEach === nativeForEach) {
+      obj.forEach(iterator, context);
+    } else if (obj.length === +obj.length) {
+      for (var i = 0, l = obj.length; i < l; i++) {
+        if (iterator.call(context, obj[i], i, obj) === breaker) return;
+      }
+    } else {
+      for (var key in obj) {
+        if (_.has(obj, key)) {
+          if (iterator.call(context, obj[key], key, obj) === breaker) return;
+        }
+      }
+    }
+  };
+
+  // Return the results of applying the iterator to each element.
+  // Delegates to **ECMAScript 5**'s native `map` if available.
+  _.map = _.collect = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
+    each(obj, function(value, index, list) {
+      results[results.length] = iterator.call(context, value, index, list);
+    });
+    return results;
+  };
+
+  var reduceError = 'Reduce of empty array with no initial value';
+
+  // **Reduce** builds up a single result from a list of values, aka `inject`,
+  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
+  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduce && obj.reduce === nativeReduce) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
+    }
+    each(obj, function(value, index, list) {
+      if (!initial) {
+        memo = value;
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, value, index, list);
+      }
+    });
+    if (!initial) throw new TypeError(reduceError);
+    return memo;
+  };
+
+  // The right-associative version of reduce, also known as `foldr`.
+  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
+  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
+    var initial = arguments.length > 2;
+    if (obj == null) obj = [];
+    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
+      if (context) iterator = _.bind(iterator, context);
+      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+    }
+    var length = obj.length;
+    if (length !== +length) {
+      var keys = _.keys(obj);
+      length = keys.length;
+    }
+    each(obj, function(value, index, list) {
+      index = keys ? keys[--length] : --length;
+      if (!initial) {
+        memo = obj[index];
+        initial = true;
+      } else {
+        memo = iterator.call(context, memo, obj[index], index, list);
+      }
+    });
+    if (!initial) throw new TypeError(reduceError);
+    return memo;
+  };
+
+  // Return the first value which passes a truth test. Aliased as `detect`.
+  _.find = _.detect = function(obj, iterator, context) {
+    var result;
+    any(obj, function(value, index, list) {
+      if (iterator.call(context, value, index, list)) {
+        result = value;
+        return true;
+      }
+    });
+    return result;
+  };
+
+  // Return all the elements that pass a truth test.
+  // Delegates to **ECMAScript 5**'s native `filter` if available.
+  // Aliased as `select`.
+  _.filter = _.select = function(obj, iterator, context) {
+    var results = [];
+    if (obj == null) return results;
+    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
+    each(obj, function(value, index, list) {
+      if (iterator.call(context, value, index, list)) results[results.length] = value;
+    });
+    return results;
+  };
+
+  // Return all the elements for which a truth test fails.
+  _.reject = function(obj, iterator, context) {
+    return _.filter(obj, function(value, index, list) {
+      return !iterator.call(context, value, index, list);
+    }, context);
+  };
+
+  // Determine whether all of the elements match a truth test.
+  // Delegates to **ECMAScript 5**'s native `every` if available.
+  // Aliased as `all`.
+  _.every = _.all = function(obj, iterator, context) {
+    iterator || (iterator = _.identity);
+    var result = true;
+    if (obj == null) return result;
+    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
+    each(obj, function(value, index, list) {
+      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if at least one element in the object matches a truth test.
+  // Delegates to **ECMAScript 5**'s native `some` if available.
+  // Aliased as `any`.
+  var any = _.some = _.any = function(obj, iterator, context) {
+    iterator || (iterator = _.identity);
+    var result = false;
+    if (obj == null) return result;
+    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
+    each(obj, function(value, index, list) {
+      if (result || (result = iterator.call(context, value, index, list))) return breaker;
+    });
+    return !!result;
+  };
+
+  // Determine if the array or object contains a given value (using `===`).
+  // Aliased as `include`.
+  _.contains = _.include = function(obj, target) {
+    if (obj == null) return false;
+    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
+    return any(obj, function(value) {
+      return value === target;
+    });
+  };
+
+  // Invoke a method (with arguments) on every item in a collection.
+  _.invoke = function(obj, method) {
+    var args = slice.call(arguments, 2);
+    return _.map(obj, function(value) {
+      return (_.isFunction(method) ? method : value[method]).apply(value, args);
+    });
+  };
+
+  // Convenience version of a common use case of `map`: fetching a property.
+  _.pluck = function(obj, key) {
+    return _.map(obj, function(value){ return value[key]; });
+  };
+
+  // Convenience version of a common use case of `filter`: selecting only objects
+  // with specific `key:value` pairs.
+  _.where = function(obj, attrs) {
+    if (_.isEmpty(attrs)) return [];
+    return _.filter(obj, function(value) {
+      for (var key in attrs) {
+        if (attrs[key] !== value[key]) return false;
+      }
+      return true;
+    });
+  };
+
+  // Return the maximum element or (element-based computation).
+  // Can't optimize arrays of integers longer than 65,535 elements.
+  // See: https://bugs.webkit.org/show_bug.cgi?id=80797
+  _.max = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
+      return Math.max.apply(Math, obj);
+    }
+    if (!iterator && _.isEmpty(obj)) return -Infinity;
+    var result = {computed : -Infinity, value: -Infinity};
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      computed >= result.computed && (result = {value : value, computed : computed});
+    });
+    return result.value;
+  };
+
+  // Return the minimum element (or element-based computation).
+  _.min = function(obj, iterator, context) {
+    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
+      return Math.min.apply(Math, obj);
+    }
+    if (!iterator && _.isEmpty(obj)) return Infinity;
+    var result = {computed : Infinity, value: Infinity};
+    each(obj, function(value, index, list) {
+      var computed = iterator ? iterator.call(context, value, index, list) : value;
+      computed < result.computed && (result = {value : value, computed : computed});
+    });
+    return result.value;
+  };
+
+  // Shuffle an array.
+  _.shuffle = function(obj) {
+    var rand;
+    var index = 0;
+    var shuffled = [];
+    each(obj, function(value) {
+      rand = _.random(index++);
+      shuffled[index - 1] = shuffled[rand];
+      shuffled[rand] = value;
+    });
+    return shuffled;
+  };
+
+  // An internal function to generate lookup iterators.
+  var lookupIterator = function(value) {
+    return _.isFunction(value) ? value : function(obj){ return obj[value]; };
+  };
+
+  // Sort the object's values by a criterion produced by an iterator.
+  _.sortBy = function(obj, value, context) {
+    var iterator = lookupIterator(value);
+    return _.pluck(_.map(obj, function(value, index, list) {
+      return {
+        value : value,
+        index : index,
+        criteria : iterator.call(context, value, index, list)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria;
+      var b = right.criteria;
+      if (a !== b) {
+        if (a > b || a === void 0) return 1;
+        if (a < b || b === void 0) return -1;
+      }
+      return left.index < right.index ? -1 : 1;
+    }), 'value');
+  };
+
+  // An internal function used for aggregate "group by" operations.
+  var group = function(obj, value, context, behavior) {
+    var result = {};
+    var iterator = lookupIterator(value || _.identity);
+    each(obj, function(value, index) {
+      var key = iterator.call(context, value, index, obj);
+      behavior(result, key, value);
+    });
+    return result;
+  };
+
+  // Groups the object's values by a criterion. Pass either a string attribute
+  // to group by, or a function that returns the criterion.
+  _.groupBy = function(obj, value, context) {
+    return group(obj, value, context, function(result, key, value) {
+      (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
+    });
+  };
+
+  // Counts instances of an object that group by a certain criterion. Pass
+  // either a string attribute to count by, or a function that returns the
+  // criterion.
+  _.countBy = function(obj, value, context) {
+    return group(obj, value, context, function(result, key) {
+      if (!_.has(result, key)) result[key] = 0;
+      result[key]++;
+    });
+  };
+
+  // Use a comparator function to figure out the smallest index at which
+  // an object should be inserted so as to maintain order. Uses binary search.
+  _.sortedIndex = function(array, obj, iterator, context) {
+    iterator = iterator == null ? _.identity : lookupIterator(iterator);
+    var value = iterator.call(context, obj);
+    var low = 0, high = array.length;
+    while (low < high) {
+      var mid = (low + high) >>> 1;
+      iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid;
+    }
+    return low;
+  };
+
+  // Safely convert anything iterable into a real, live array.
+  _.toArray = function(obj) {
+    if (!obj) return [];
+    if (_.isArray(obj)) return slice.call(obj);
+    if (obj.length === +obj.length) return _.map(obj, _.identity);
+    return _.values(obj);
+  };
+
+  // Return the number of elements in an object.
+  _.size = function(obj) {
+    if (obj == null) return 0;
+    return (obj.length === +obj.length) ? obj.length : _.keys(obj).length;
+  };
+
+  // Array Functions
+  // ---------------
+
+  // Get the first element of an array. Passing **n** will return the first N
+  // values in the array. Aliased as `head` and `take`. The **guard** check
+  // allows it to work with `_.map`.
+  _.first = _.head = _.take = function(array, n, guard) {
+    if (array == null) return void 0;
+    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
+  };
+
+  // Returns everything but the last entry of the array. Especially useful on
+  // the arguments object. Passing **n** will return all the values in
+  // the array, excluding the last N. The **guard** check allows it to work with
+  // `_.map`.
+  _.initial = function(array, n, guard) {
+    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
+  };
+
+  // Get the last element of an array. Passing **n** will return the last N
+  // values in the array. The **guard** check allows it to work with `_.map`.
+  _.last = function(array, n, guard) {
+    if (array == null) return void 0;
+    if ((n != null) && !guard) {
+      return slice.call(array, Math.max(array.length - n, 0));
+    } else {
+      return array[array.length - 1];
+    }
+  };
+
+  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
+  // Especially useful on the arguments object. Passing an **n** will return
+  // the rest N values in the array. The **guard**
+  // check allows it to work with `_.map`.
+  _.rest = _.tail = _.drop = function(array, n, guard) {
+    return slice.call(array, (n == null) || guard ? 1 : n);
+  };
+
+  // Trim out all falsy values from an array.
+  _.compact = function(array) {
+    return _.filter(array, _.identity);
+  };
+
+  // Internal implementation of a recursive `flatten` function.
+  var flatten = function(input, shallow, output) {
+    each(input, function(value) {
+      if (_.isArray(value)) {
+        shallow ? push.apply(output, value) : flatten(value, shallow, output);
+      } else {
+        output.push(value);
+      }
+    });
+    return output;
+  };
+
+  // Return a completely flattened version of an array.
+  _.flatten = function(array, shallow) {
+    return flatten(array, shallow, []);
+  };
+
+  // Return a version of the array that does not contain the specified value(s).
+  _.without = function(array) {
+    return _.difference(array, slice.call(arguments, 1));
+  };
+
+  // Produce a duplicate-free version of the array. If the array has already
+  // been sorted, you have the option of using a faster algorithm.
+  // Aliased as `unique`.
+  _.uniq = _.unique = function(array, isSorted, iterator, context) {
+    if (_.isFunction(isSorted)) {
+      context = iterator;
+      iterator = isSorted;
+      isSorted = false;
+    }
+    var initial = iterator ? _.map(array, iterator, context) : array;
+    var results = [];
+    var seen = [];
+    each(initial, function(value, index) {
+      if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) {
+        seen.push(value);
+        results.push(array[index]);
+      }
+    });
+    return results;
+  };
+
+  // Produce an array that contains the union: each distinct element from all of
+  // the passed-in arrays.
+  _.union = function() {
+    return _.uniq(concat.apply(ArrayProto, arguments));
+  };
+
+  // Produce an array that contains every item shared between all the
+  // passed-in arrays.
+  _.intersection = function(array) {
+    var rest = slice.call(arguments, 1);
+    return _.filter(_.uniq(array), function(item) {
+      return _.every(rest, function(other) {
+        return _.indexOf(other, item) >= 0;
+      });
+    });
+  };
+
+  // Take the difference between one array and a number of other arrays.
+  // Only the elements present in just the first array will remain.
+  _.difference = function(array) {
+    var rest = concat.apply(ArrayProto, slice.call(arguments, 1));
+    return _.filter(array, function(value){ return !_.contains(rest, value); });
+  };
+
+  // Zip together multiple lists into a single array -- elements that share
+  // an index go together.
+  _.zip = function() {
+    var args = slice.call(arguments);
+    var length = _.max(_.pluck(args, 'length'));
+    var results = new Array(length);
+    for (var i = 0; i < length; i++) {
+      results[i] = _.pluck(args, "" + i);
+    }
+    return results;
+  };
+
+  // Converts lists into objects. Pass either a single array of `[key, value]`
+  // pairs, or two parallel arrays of the same length -- one of keys, and one of
+  // the corresponding values.
+  _.object = function(list, values) {
+    if (list == null) return {};
+    var result = {};
+    for (var i = 0, l = list.length; i < l; i++) {
+      if (values) {
+        result[list[i]] = values[i];
+      } else {
+        result[list[i][0]] = list[i][1];
+      }
+    }
+    return result;
+  };
+
+  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
+  // we need this function. Return the position of the first occurrence of an
+  // item in an array, or -1 if the item is not included in the array.
+  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
+  // If the array is large and already in sort order, pass `true`
+  // for **isSorted** to use binary search.
+  _.indexOf = function(array, item, isSorted) {
+    if (array == null) return -1;
+    var i = 0, l = array.length;
+    if (isSorted) {
+      if (typeof isSorted == 'number') {
+        i = (isSorted < 0 ? Math.max(0, l + isSorted) : isSorted);
+      } else {
+        i = _.sortedIndex(array, item);
+        return array[i] === item ? i : -1;
+      }
+    }
+    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
+    for (; i < l; i++) if (array[i] === item) return i;
+    return -1;
+  };
+
+  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
+  _.lastIndexOf = function(array, item, from) {
+    if (array == null) return -1;
+    var hasIndex = from != null;
+    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) {
+      return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item);
+    }
+    var i = (hasIndex ? from : array.length);
+    while (i--) if (array[i] === item) return i;
+    return -1;
+  };
+
+  // Generate an integer Array containing an arithmetic progression. A port of
+  // the native Python `range()` function. See
+  // [the Python documentation](http://docs.python.org/library/functions.html#range).
+  _.range = function(start, stop, step) {
+    if (arguments.length <= 1) {
+      stop = start || 0;
+      start = 0;
+    }
+    step = arguments[2] || 1;
+
+    var len = Math.max(Math.ceil((stop - start) / step), 0);
+    var idx = 0;
+    var range = new Array(len);
+
+    while(idx < len) {
+      range[idx++] = start;
+      start += step;
+    }
+
+    return range;
+  };
+
+  // Function (ahem) Functions
+  // ------------------
+
+  // Reusable constructor function for prototype setting.
+  var ctor = function(){};
+
+  // Create a function bound to a given object (assigning `this`, and arguments,
+  // optionally). Binding with arguments is also known as `curry`.
+  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
+  // We check for `func.bind` first, to fail fast when `func` is undefined.
+  _.bind = function(func, context) {
+    var args, bound;
+    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
+    if (!_.isFunction(func)) throw new TypeError;
+    args = slice.call(arguments, 2);
+    return bound = function() {
+      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
+      ctor.prototype = func.prototype;
+      var self = new ctor;
+      ctor.prototype = null;
+      var result = func.apply(self, args.concat(slice.call(arguments)));
+      if (Object(result) === result) return result;
+      return self;
+    };
+  };
+
+  // Bind all of an object's methods to that object. Useful for ensuring that
+  // all callbacks defined on an object belong to it.
+  _.bindAll = function(obj) {
+    var funcs = slice.call(arguments, 1);
+    if (funcs.length == 0) funcs = _.functions(obj);
+    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+    return obj;
+  };
+
+  // Memoize an expensive function by storing its results.
+  _.memoize = function(func, hasher) {
+    var memo = {};
+    hasher || (hasher = _.identity);
+    return function() {
+      var key = hasher.apply(this, arguments);
+      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
+    };
+  };
+
+  // Delays a function for the given number of milliseconds, and then calls
+  // it with the arguments supplied.
+  _.delay = function(func, wait) {
+    var args = slice.call(arguments, 2);
+    return setTimeout(function(){ return func.apply(null, args); }, wait);
+  };
+
+  // Defers a function, scheduling it to run after the current call stack has
+  // cleared.
+  _.defer = function(func) {
+    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
+  };
+
+  // Returns a function, that, when invoked, will only be triggered at most once
+  // during a given window of time.
+  _.throttle = function(func, wait) {
+    var context, args, timeout, result;
+    var previous = 0;
+    var later = function() {
+      previous = new Date;
+      timeout = null;
+      result = func.apply(context, args);
+    };
+    return function() {
+      var now = new Date;
+      var remaining = wait - (now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0) {
+        clearTimeout(timeout);
+        timeout = null;
+        previous = now;
+        result = func.apply(context, args);
+      } else if (!timeout) {
+        timeout = setTimeout(later, remaining);
+      }
+      return result;
+    };
+  };
+
+  // Returns a function, that, as long as it continues to be invoked, will not
+  // be triggered. The function will be called after it stops being called for
+  // N milliseconds. If `immediate` is passed, trigger the function on the
+  // leading edge, instead of the trailing.
+  _.debounce = function(func, wait, immediate) {
+    var timeout, result;
+    return function() {
+      var context = this, args = arguments;
+      var later = function() {
+        timeout = null;
+        if (!immediate) result = func.apply(context, args);
+      };
+      var callNow = immediate && !timeout;
+      clearTimeout(timeout);
+      timeout = setTimeout(later, wait);
+      if (callNow) result = func.apply(context, args);
+      return result;
+    };
+  };
+
+  // Returns a function that will be executed at most one time, no matter how
+  // often you call it. Useful for lazy initialization.
+  _.once = function(func) {
+    var ran = false, memo;
+    return function() {
+      if (ran) return memo;
+      ran = true;
+      memo = func.apply(this, arguments);
+      func = null;
+      return memo;
+    };
+  };
+
+  // Returns the first function passed as an argument to the second,
+  // allowing you to adjust arguments, run code before and after, and
+  // conditionally execute the original function.
+  _.wrap = function(func, wrapper) {
+    return function() {
+      var args = [func];
+      push.apply(args, arguments);
+      return wrapper.apply(this, args);
+    };
+  };
+
+  // Returns a function that is the composition of a list of functions, each
+  // consuming the return value of the function that follows.
+  _.compose = function() {
+    var funcs = arguments;
+    return function() {
+      var args = arguments;
+      for (var i = funcs.length - 1; i >= 0; i--) {
+        args = [funcs[i].apply(this, args)];
+      }
+      return args[0];
+    };
+  };
+
+  // Returns a function that will only be executed after being called N times.
+  _.after = function(times, func) {
+    if (times <= 0) return func();
+    return function() {
+      if (--times < 1) {
+        return func.apply(this, arguments);
+      }
+    };
+  };
+
+  // Object Functions
+  // ----------------
+
+  // Retrieve the names of an object's properties.
+  // Delegates to **ECMAScript 5**'s native `Object.keys`
+  _.keys = nativeKeys || function(obj) {
+    if (obj !== Object(obj)) throw new TypeError('Invalid object');
+    var keys = [];
+    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
+    return keys;
+  };
+
+  // Retrieve the values of an object's properties.
+  _.values = function(obj) {
+    var values = [];
+    for (var key in obj) if (_.has(obj, key)) values.push(obj[key]);
+    return values;
+  };
+
+  // Convert an object into a list of `[key, value]` pairs.
+  _.pairs = function(obj) {
+    var pairs = [];
+    for (var key in obj) if (_.has(obj, key)) pairs.push([key, obj[key]]);
+    return pairs;
+  };
+
+  // Invert the keys and values of an object. The values must be serializable.
+  _.invert = function(obj) {
+    var result = {};
+    for (var key in obj) if (_.has(obj, key)) result[obj[key]] = key;
+    return result;
+  };
+
+  // Return a sorted list of the function names available on the object.
+  // Aliased as `methods`
+  _.functions = _.methods = function(obj) {
+    var names = [];
+    for (var key in obj) {
+      if (_.isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
+  };
+
+  // Extend a given object with all the properties in passed-in object(s).
+  _.extend = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      if (source) {
+        for (var prop in source) {
+          obj[prop] = source[prop];
+        }
+      }
+    });
+    return obj;
+  };
+
+  // Return a copy of the object only containing the whitelisted properties.
+  _.pick = function(obj) {
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    each(keys, function(key) {
+      if (key in obj) copy[key] = obj[key];
+    });
+    return copy;
+  };
+
+   // Return a copy of the object without the blacklisted properties.
+  _.omit = function(obj) {
+    var copy = {};
+    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
+    for (var key in obj) {
+      if (!_.contains(keys, key)) copy[key] = obj[key];
+    }
+    return copy;
+  };
+
+  // Fill in a given object with default properties.
+  _.defaults = function(obj) {
+    each(slice.call(arguments, 1), function(source) {
+      if (source) {
+        for (var prop in source) {
+          if (obj[prop] == null) obj[prop] = source[prop];
+        }
+      }
+    });
+    return obj;
+  };
+
+  // Create a (shallow-cloned) duplicate of an object.
+  _.clone = function(obj) {
+    if (!_.isObject(obj)) return obj;
+    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
+  };
+
+  // Invokes interceptor with the obj, and then returns obj.
+  // The primary purpose of this method is to "tap into" a method chain, in
+  // order to perform operations on intermediate results within the chain.
+  _.tap = function(obj, interceptor) {
+    interceptor(obj);
+    return obj;
+  };
+
+  // Internal recursive comparison function for `isEqual`.
+  var eq = function(a, b, aStack, bStack) {
+    // Identical objects are equal. `0 === -0`, but they aren't identical.
+    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
+    if (a === b) return a !== 0 || 1 / a == 1 / b;
+    // A strict comparison is necessary because `null == undefined`.
+    if (a == null || b == null) return a === b;
+    // Unwrap any wrapped objects.
+    if (a instanceof _) a = a._wrapped;
+    if (b instanceof _) b = b._wrapped;
+    // Compare `[[Class]]` names.
+    var className = toString.call(a);
+    if (className != toString.call(b)) return false;
+    switch (className) {
+      // Strings, numbers, dates, and booleans are compared by value.
+      case '[object String]':
+        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
+        // equivalent to `new String("5")`.
+        return a == String(b);
+      case '[object Number]':
+        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
+        // other numeric values.
+        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
+      case '[object Date]':
+      case '[object Boolean]':
+        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
+        // millisecond representations. Note that invalid dates with millisecond representations
+        // of `NaN` are not equivalent.
+        return +a == +b;
+      // RegExps are compared by their source patterns and flags.
+      case '[object RegExp]':
+        return a.source == b.source &&
+               a.global == b.global &&
+               a.multiline == b.multiline &&
+               a.ignoreCase == b.ignoreCase;
+    }
+    if (typeof a != 'object' || typeof b != 'object') return false;
+    // Assume equality for cyclic structures. The algorithm for detecting cyclic
+    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
+    var length = aStack.length;
+    while (length--) {
+      // Linear search. Performance is inversely proportional to the number of
+      // unique nested structures.
+      if (aStack[length] == a) return bStack[length] == b;
+    }
+    // Add the first object to the stack of traversed objects.
+    aStack.push(a);
+    bStack.push(b);
+    var size = 0, result = true;
+    // Recursively compare objects and arrays.
+    if (className == '[object Array]') {
+      // Compare array lengths to determine if a deep comparison is necessary.
+      size = a.length;
+      result = size == b.length;
+      if (result) {
+        // Deep compare the contents, ignoring non-numeric properties.
+        while (size--) {
+          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
+        }
+      }
+    } else {
+      // Objects with different constructors are not equivalent, but `Object`s
+      // from different frames are.
+      var aCtor = a.constructor, bCtor = b.constructor;
+      if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
+                               _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
+        return false;
+      }
+      // Deep compare objects.
+      for (var key in a) {
+        if (_.has(a, key)) {
+          // Count the expected number of properties.
+          size++;
+          // Deep compare each member.
+          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
+        }
+      }
+      // Ensure that both objects contain the same number of properties.
+      if (result) {
+        for (key in b) {
+          if (_.has(b, key) && !(size--)) break;
+        }
+        result = !size;
+      }
+    }
+    // Remove the first object from the stack of traversed objects.
+    aStack.pop();
+    bStack.pop();
+    return result;
+  };
+
+  // Perform a deep comparison to check if two objects are equal.
+  _.isEqual = function(a, b) {
+    return eq(a, b, [], []);
+  };
+
+  // Is a given array, string, or object empty?
+  // An "empty" object has no enumerable own-properties.
+  _.isEmpty = function(obj) {
+    if (obj == null) return true;
+    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
+    for (var key in obj) if (_.has(obj, key)) return false;
+    return true;
+  };
+
+  // Is a given value a DOM element?
+  _.isElement = function(obj) {
+    return !!(obj && obj.nodeType === 1);
+  };
+
+  // Is a given value an array?
+  // Delegates to ECMA5's native Array.isArray
+  _.isArray = nativeIsArray || function(obj) {
+    return toString.call(obj) == '[object Array]';
+  };
+
+  // Is a given variable an object?
+  _.isObject = function(obj) {
+    return obj === Object(obj);
+  };
+
+  // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp.
+  each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
+    _['is' + name] = function(obj) {
+      return toString.call(obj) == '[object ' + name + ']';
+    };
+  });
+
+  // Define a fallback version of the method in browsers (ahem, IE), where
+  // there isn't any inspectable "Arguments" type.
+  if (!_.isArguments(arguments)) {
+    _.isArguments = function(obj) {
+      return !!(obj && _.has(obj, 'callee'));
+    };
+  }
+
+  // Optimize `isFunction` if appropriate.
+  if (typeof (/./) !== 'function') {
+    _.isFunction = function(obj) {
+      return typeof obj === 'function';
+    };
+  }
+
+  // Is a given object a finite number?
+  _.isFinite = function(obj) {
+    return isFinite(obj) && !isNaN(parseFloat(obj));
+  };
+
+  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+  _.isNaN = function(obj) {
+    return _.isNumber(obj) && obj != +obj;
+  };
+
+  // Is a given value a boolean?
+  _.isBoolean = function(obj) {
+    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
+  };
+
+  // Is a given value equal to null?
+  _.isNull = function(obj) {
+    return obj === null;
+  };
+
+  // Is a given variable undefined?
+  _.isUndefined = function(obj) {
+    return obj === void 0;
+  };
+
+  // Shortcut function for checking if an object has a given property directly
+  // on itself (in other words, not on a prototype).
+  _.has = function(obj, key) {
+    return hasOwnProperty.call(obj, key);
+  };
+
+  // Utility Functions
+  // -----------------
+
+  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
+  // previous owner. Returns a reference to the Underscore object.
+  _.noConflict = function() {
+    root._ = previousUnderscore;
+    return this;
+  };
+
+  // Keep the identity function around for default iterators.
+  _.identity = function(value) {
+    return value;
+  };
+
+  // Run a function **n** times.
+  _.times = function(n, iterator, context) {
+    var accum = Array(n);
+    for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i);
+    return accum;
+  };
+
+  // Return a random integer between min and max (inclusive).
+  _.random = function(min, max) {
+    if (max == null) {
+      max = min;
+      min = 0;
+    }
+    return min + (0 | Math.random() * (max - min + 1));
+  };
+
+  // List of HTML entities for escaping.
+  var entityMap = {
+    escape: {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#x27;',
+      '/': '&#x2F;'
+    }
+  };
+  entityMap.unescape = _.invert(entityMap.escape);
+
+  // Regexes containing the keys and values listed immediately above.
+  var entityRegexes = {
+    escape:   new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'),
+    unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g')
+  };
+
+  // Functions for escaping and unescaping strings to/from HTML interpolation.
+  _.each(['escape', 'unescape'], function(method) {
+    _[method] = function(string) {
+      if (string == null) return '';
+      return ('' + string).replace(entityRegexes[method], function(match) {
+        return entityMap[method][match];
+      });
+    };
+  });
+
+  // If the value of the named property is a function then invoke it;
+  // otherwise, return it.
+  _.result = function(object, property) {
+    if (object == null) return null;
+    var value = object[property];
+    return _.isFunction(value) ? value.call(object) : value;
+  };
+
+  // Add your own custom functions to the Underscore object.
+  _.mixin = function(obj) {
+    each(_.functions(obj), function(name){
+      var func = _[name] = obj[name];
+      _.prototype[name] = function() {
+        var args = [this._wrapped];
+        push.apply(args, arguments);
+        return result.call(this, func.apply(_, args));
+      };
+    });
+  };
+
+  // Generate a unique integer id (unique within the entire client session).
+  // Useful for temporary DOM ids.
+  var idCounter = 0;
+  _.uniqueId = function(prefix) {
+    var id = '' + ++idCounter;
+    return prefix ? prefix + id : id;
+  };
+
+  // By default, Underscore uses ERB-style template delimiters, change the
+  // following template settings to use alternative delimiters.
+  _.templateSettings = {
+    evaluate    : /<%([\s\S]+?)%>/g,
+    interpolate : /<%=([\s\S]+?)%>/g,
+    escape      : /<%-([\s\S]+?)%>/g
+  };
+
+  // When customizing `templateSettings`, if you don't want to define an
+  // interpolation, evaluation or escaping regex, we need one that is
+  // guaranteed not to match.
+  var noMatch = /(.)^/;
+
+  // Certain characters need to be escaped so that they can be put into a
+  // string literal.
+  var escapes = {
+    "'":      "'",
+    '\\':     '\\',
+    '\r':     'r',
+    '\n':     'n',
+    '\t':     't',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
+  };
+
+  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+
+  // JavaScript micro-templating, similar to John Resig's implementation.
+  // Underscore templating handles arbitrary delimiters, preserves whitespace,
+  // and correctly escapes quotes within interpolated code.
+  _.template = function(text, data, settings) {
+    settings = _.defaults({}, settings, _.templateSettings);
+
+    // Combine delimiters into one regular expression via alternation.
+    var matcher = new RegExp([
+      (settings.escape || noMatch).source,
+      (settings.interpolate || noMatch).source,
+      (settings.evaluate || noMatch).source
+    ].join('|') + '|$', 'g');
+
+    // Compile the template source, escaping string literals appropriately.
+    var index = 0;
+    var source = "__p+='";
+    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+      source += text.slice(index, offset)
+        .replace(escaper, function(match) { return '\\' + escapes[match]; });
+
+      if (escape) {
+        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+      }
+      if (interpolate) {
+        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+      }
+      if (evaluate) {
+        source += "';\n" + evaluate + "\n__p+='";
+      }
+      index = offset + match.length;
+      return match;
+    });
+    source += "';\n";
+
+    // If a variable is not specified, place data values in local scope.
+    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+    source = "var __t,__p='',__j=Array.prototype.join," +
+      "print=function(){__p+=__j.call(arguments,'');};\n" +
+      source + "return __p;\n";
+
+    try {
+      var render = new Function(settings.variable || 'obj', '_', source);
+    } catch (e) {
+      e.source = source;
+      throw e;
+    }
+
+    if (data) return render(data, _);
+    var template = function(data) {
+      return render.call(this, data, _);
+    };
+
+    // Provide the compiled function source as a convenience for precompilation.
+    template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
+
+    return template;
+  };
+
+  // Add a "chain" function, which will delegate to the wrapper.
+  _.chain = function(obj) {
+    return _(obj).chain();
+  };
+
+  // OOP
+  // ---------------
+  // If Underscore is called as a function, it returns a wrapped object that
+  // can be used OO-style. This wrapper holds altered versions of all the
+  // underscore functions. Wrapped objects may be chained.
+
+  // Helper function to continue chaining intermediate results.
+  var result = function(obj) {
+    return this._chain ? _(obj).chain() : obj;
+  };
+
+  // Add all of the Underscore functions to the wrapper object.
+  _.mixin(_);
+
+  // Add all mutator Array functions to the wrapper.
+  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      var obj = this._wrapped;
+      method.apply(obj, arguments);
+      if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0];
+      return result.call(this, obj);
+    };
+  });
+
+  // Add all accessor Array functions to the wrapper.
+  each(['concat', 'join', 'slice'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      return result.call(this, method.apply(this._wrapped, arguments));
+    };
+  });
+
+  _.extend(_.prototype, {
+
+    // Start chaining a wrapped Underscore object.
+    chain: function() {
+      this._chain = true;
+      return this;
+    },
+
+    // Extracts the result from a wrapped and chained object.
+    value: function() {
+      return this._wrapped;
+    }
+
+  });
+
+}).call(this);
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/test.html b/addons/im_livechat/static/ext/test.html
new file mode 100644
index 00000000000..c6047ded77d
--- /dev/null
+++ b/addons/im_livechat/static/ext/test.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script type="text/javascript" src="http://localhost/im_livechat/static/ext/static/js/require.js"></script>
+    <script type="text/javascript" src='http://localhost/im_livechat/loader?p={"db":"test","channel":1}'></script>
+</head>
+<body style="height:100%; margin:0; padding:0;">
+    <iframe src="http://openerp.com" height="100%" width=100%"></iframe>
+</body>
+</html>
\ No newline at end of file
diff --git a/addons/im_livechat/static/src/img/default.png b/addons/im_livechat/static/src/img/default.png
new file mode 100644
index 00000000000..07d2503ce4e
Binary files /dev/null and b/addons/im_livechat/static/src/img/default.png differ
diff --git a/addons/im_livechat/static/src/img/icon.png b/addons/im_livechat/static/src/img/icon.png
new file mode 100644
index 00000000000..07d2503ce4e
Binary files /dev/null and b/addons/im_livechat/static/src/img/icon.png differ
diff --git a/addons/im_livechat/web_page.html b/addons/im_livechat/web_page.html
new file mode 100644
index 00000000000..2e1ea609126
--- /dev/null
+++ b/addons/im_livechat/web_page.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script type="text/javascript">
+        window.oe_im_livechat_auto = true;
+    </script>
+    {{script}}
+    <style type="text/css">
+        body {
+            height: 100%;
+            font-size: 16px;
+            font-weight: 400;
+            font-family: "Lato", "Lucida Grande", "Helvetica neue", "Helvetica", "Verdana", "Arial", sans-serif;
+            overflow: hidden;
+            overflow-y: auto;
+            display: block;
+            margin: 0;
+            padding: 0;
+            border: none;
+            width: 100%;
+            height: 100%;
+            background: #C9C8E0;
+            background-image: -webkit-linear-gradient(top, #7c7bad, #ddddee);
+            background-image: -moz-linear-gradient(top, #7c7bad, #ddddee);
+            background-image: -ms-linear-gradient(top, #7c7bad, #ddddee);
+            background-image: -o-linear-gradient(top, #7c7bad, #ddddee);
+            background-image: linear-gradient(to bottom, #7c7bad, #ddddee);
+            filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7c7bad', endColorstr='#ddddee',GradientType=0 );
+            -webkit-background-size: cover;
+            -moz-background-size: cover;
+            -o-background-size: cover;
+            background-size: cover;
+            background-repeat: no-repeat;
+            background-attachment: fixed;
+        }
+        .main {
+            position: absolute;
+            opacity: 0;
+            top: 50%;
+            width: 100%;
+            margin-top: -150px;
+            color: white;
+            text-shadow: 0 1px 0 rgba(34, 52, 72, 0.2);
+            z-index: 10;
+            text-align: center;
+        }
+        .main h1 {
+            font-size: 54px;
+        }
+        .main div {
+            font-style: italic;
+        }
+    </style>
+</head>
+<body>
+    <div class="main" style="opacity: 1;">
+        <h1 class="channel_name">{{channelName | escape}}</h1>
+        <div>Live Chat Powered by <strong>OpenERP</strong>.</div>
+    </div>
+</body>
+</html>
diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_ar/__init__.py
+++ b/addons/l10n_ar/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_at/account_wizard.py b/addons/l10n_at/account_wizard.py
index 278837322ac..0aec5392a8a 100644
--- a/addons/l10n_at/account_wizard.py
+++ b/addons/l10n_at/account_wizard.py
@@ -30,7 +30,6 @@ class AccountWizard_cd(osv.osv_memory):
 		'code_digits' : 0,
 	}
 
-AccountWizard_cd()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/fiscal_templates.xml b/addons/l10n_be/fiscal_templates.xml
index 5e26a7e67c1..5cf5a21381b 100644
--- a/addons/l10n_be/fiscal_templates.xml
+++ b/addons/l10n_be/fiscal_templates.xml
@@ -22,12 +22,6 @@
 
     <!-- Fiscal Position Account Templates -->
     
-    <record id="fiscal_position_account_template_1" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_1"  />
-            <field name="account_src_id" ref="l10n_be.a7000" />
-            <field name="account_dest_id" ref="l10n_be.a_sale" />
-    </record>
-    
     <record id="fiscal_position_account_template_3" model="account.fiscal.position.account.template">
             <field name="position_id" ref="fiscal_position_template_3"  />
             <field name="account_src_id" ref="l10n_be.a7000" />
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index d89d427ef6b..0576e1d5f8f 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -84,7 +84,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
             obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         vat_no = obj_company.partner_id.vat
         if not vat_no:
-            raise osv.except_osv(_('insufficient data!'), _('No VAT number associated with your company.'))
+            raise osv.except_osv(_('Insufficient Data!'), _('No VAT number associated with your company.'))
         vat_no = vat_no.replace(' ','').upper()
         vat = vat_no[2:]
 
@@ -209,6 +209,5 @@ class l10n_be_vat_declaration(osv.osv_memory):
             'target': 'new',
         }
 
-l10n_be_vat_declaration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index 7aa612d95ff..0ffa0c16a24 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -39,7 +39,6 @@ class vat_listing_clients(osv.osv_memory):
         'vat_amount': fields.float('VAT Amount'),
     }
 
-vat_listing_clients()
 
 class partner_vat(osv.osv_memory):
     """ Vat Listing """
@@ -61,12 +60,12 @@ class partner_vat(osv.osv_memory):
             company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         period_ids = obj_period.search(cr, uid, [('date_start' ,'>=', date_start), ('date_stop','<=',date_stop), ('company_id','=',company_id)])
         if not period_ids:
-             raise osv.except_osv(_('insufficient data!'), _('No data for the selected year.'))
+             raise osv.except_osv(_('Insufficient Data!'), _('No data for the selected year.'))
 
         partners = []
         partner_ids = obj_partner.search(cr, uid, [('vat_subjected', '!=', False), ('vat','ilike','BE%')], context=context)
         if not partner_ids:
-             raise osv.except_osv(_('Error'),_('No belgian contact with a VAT number in your database.'))
+             raise osv.except_osv(_('Error'),_('No belgium contact with a VAT number in your database.'))
         cr.execute("""SELECT sub1.partner_id, sub1.name, sub1.vat, sub1.turnover, sub2.vat_amount
                 FROM (SELECT l.partner_id, p.name, p.vat, SUM(CASE WHEN c.code ='49' THEN -l.tax_amount ELSE l.tax_amount END) as turnover
                       FROM account_move_line l
@@ -91,7 +90,7 @@ class partner_vat(osv.osv_memory):
                 partners.append(id_client)
         
         if not partners:
-            raise osv.except_osv(_('insufficient data!'), _('No data found for the selected year.'))
+            raise osv.except_osv(_('Insufficient Data!'), _('No data found for the selected year.'))
         context.update({'partner_ids': partners, 'year': data['year'], 'limit_amount': data['limit_amount']})
         model_data_ids = obj_model_data.search(cr, uid, [('model','=','ir.ui.view'), ('name','=','view_vat_listing')])
         resource_id = obj_model_data.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
@@ -116,7 +115,6 @@ class partner_vat(osv.osv_memory):
         'limit_amount': 250,
     }
 
-partner_vat()
 
 class partner_vat_list(osv.osv_memory):
     """ Partner Vat Listing """
@@ -321,7 +319,6 @@ class partner_vat_list(osv.osv_memory):
             'datas': datas,
         }
 
-partner_vat_list()
 
 class partner_vat_listing_print(report_sxw.rml_parse):
 
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index ffd42290ed0..a572c3b83b4 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -108,7 +108,7 @@ class partner_vat_intra(osv.osv_memory):
         # Get Company vat
         company_vat = data_company.partner_id.vat
         if not company_vat:
-            raise osv.except_osv(_('insufficient data!'),_('No VAT number associated with your company.'))
+            raise osv.except_osv(_('Insufficient Data!'),_('No VAT number associated with your company.'))
         company_vat = company_vat.replace(' ','').upper()
         issued_by = company_vat[:2]
 
@@ -120,7 +120,7 @@ class partner_vat_intra(osv.osv_memory):
 
         p_id_list = obj_partner.search(cr, uid, [('vat','!=',False)], context=context)
         if not p_id_list:
-            raise osv.except_osv(_('Insufficient Data!'),_('No partner has a VAT number asociated with him.'))
+            raise osv.except_osv(_('Insufficient Data!'),_('No partner has a VAT number associated with him.'))
 
         seq_declarantnum = obj_sequence.get(cr, uid, 'declarantnum')
         dnum = company_vat[2:] + seq_declarantnum[-4:]
@@ -282,7 +282,6 @@ class partner_vat_intra(osv.osv_memory):
             'datas': datas,
         }
 
-partner_vat_intra()
 
 class vat_intra_print(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index 213040d6204..8aabe601bc8 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -128,6 +128,8 @@ class account_coda_import(osv.osv_memory):
                     raise osv.except_osv(_('Error') + ' R1004', _("No matching Bank Account (with Account Journal) found.\n\nPlease set-up a Bank Account with as Account Number '%s' and as Currency '%s' and an Account Journal.") % (statement['acc_number'], statement['currency']))
                 statement['description'] = rmspaces(line[90:125])
                 statement['balance_start'] = float(rmspaces(line[43:58])) / 1000
+                if line[42] == '1':    #1 = Debit, the starting balance is negative
+                    statement['balance_start'] = - statement['balance_start']
                 statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y'))
                 statement['accountHolder'] = rmspaces(line[64:90])
                 statement['paperSeqNumber'] = rmspaces(line[2:5])
@@ -389,7 +391,7 @@ class account_coda_import(osv.osv_memory):
             if statement['coda_note'] != '':
                 self.pool.get('account.bank.statement').write(cr, uid, [statement['id']], {'coda_note': statement['coda_note']}, context=context)
         model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_bank_statement_tree')
-        action = self.pool.get(model).browse(cr, uid, action_id, context=context)
+        action = self.pool[model].browse(cr, uid, action_id, context=context)
         return {
             'name': action.name,
             'view_type': action.view_type,
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
index 79909cf79af..e62ea076079 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
@@ -39,7 +39,6 @@ class hr_contract_be(osv.osv):
         'retained_net_amount': fields.float('Net retained ', digits_compute=dp.get_precision('Payroll')),
     }
 
-hr_contract_be()
 
 class hr_employee_be(osv.osv):
     _inherit = 'hr.employee'
@@ -52,6 +51,5 @@ class hr_employee_be(osv.osv):
         'disabled_children_number': fields.integer('Number of disabled children'),
     }
 
-hr_employee_be()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py
index 9e0eec10713..bf8d5d7a0c3 100644
--- a/addons/l10n_be_invoice_bba/partner.py
+++ b/addons/l10n_be_invoice_bba/partner.py
@@ -44,9 +44,13 @@ class res_partner(osv.osv):
             help='Select Algorithm to generate the Structured Communication on Outgoing Invoices.' ),
     }
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + \
+            ['out_inv_comm_type', 'out_inv_comm_algorithm']
+
+
     _default = {
         'out_inv_comm_type': 'none',
     }
-res_partner()    
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_bo/__init__.py b/addons/l10n_bo/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_bo/__init__.py
+++ b/addons/l10n_bo/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 05279b6ef8e..945327a06bc 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     'name': 'Canada - Accounting',
-    'version': '1.0',
+    'version': '1.1',
     'author': 'Savoir-faire Linux',
     'website': 'http://www.savoirfairelinux.com',
     'category': 'Localization/Account Charts',
@@ -49,7 +49,7 @@ Canadian accounting charts and localizations.
         'account_chart_template_fr.xml',
         'account_tax_fr.xml',
         'fiscal_templates_fr.xml',
-        'l10n_ca_wizard.xml',
+        'l10n_ca_wizard.xml'
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index 1ff884ac361..afe505f27f5 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -12,7 +12,6 @@
         <field name="description">GSTPST_MB_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -39,7 +38,7 @@
         <field name="name">PST for sales - 7%</field>
         <field name="description">PST</field>
         <field name="type_tax_use">sale</field>
-        <field name="amount">0.700000</field>
+        <field name="amount">0.070000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart2132_en"/>
@@ -106,7 +105,6 @@
         <field name="description">GSTTVQ_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -152,7 +150,6 @@
         <field name="description">GSTPST_SK_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -281,7 +278,6 @@
         <field name="description">GSTPST_MB_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -308,7 +304,7 @@
         <field name="name">PST for purchases - 7%</field>
         <field name="description">PST</field>
         <field name="type_tax_use">purchase</field>
-        <field name="amount">0.700000</field>
+        <field name="amount">0.070000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart1182_en"/>
@@ -375,7 +371,6 @@
         <field name="description">GSTTVQ_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -421,7 +416,6 @@
         <field name="description">GSTPST_SK_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index b344feeec83..c34f329be3a 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -12,7 +12,6 @@
         <field name="description">TPSTVP_MB_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -39,7 +38,7 @@
         <field name="name">TVP sur les ventes - 7%</field>
         <field name="description">TVP</field>
         <field name="type_tax_use">sale</field>
-        <field name="amount">0.700000</field>
+        <field name="amount">0.070000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart2132_fr"/>
@@ -106,7 +105,6 @@
         <field name="description">TPSTVQ_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -152,7 +150,6 @@
         <field name="description">TPSTVP_SK_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -281,7 +278,6 @@
         <field name="description">TPSTVP_MB_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -308,7 +304,7 @@
         <field name="name">TVP sur les achats - 7%</field>
         <field name="description">TVP</field>
         <field name="type_tax_use">purchase</field>
-        <field name="amount">0.700000</field>
+        <field name="amount">0.070000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart1182_fr"/>
@@ -375,7 +371,6 @@
         <field name="description">TPSTVQ_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
@@ -421,7 +416,6 @@
         <field name="description">TPSTVP_SK_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
-        <field name="child_depend">1</field>
         <field name="type">percent</field>
     </record>
 
diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml
index 68e881c3541..a3bab5b89dd 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -5,17 +5,17 @@
     <!-- Fiscal Position Templates -->
 
     <record id="fiscal_position_template_1_en" model="account.fiscal.position.template">
-        <field name="name">Provincial Regime</field>
+		<field name="name">Provincial Regime (PROV)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
     <record id="fiscal_position_template_21_en" model="account.fiscal.position.template">
-        <field name="name">Harmonized Provinces Regime (12%)</field>
+		<field name="name">Harmonized Provinces Regime (12%) (BC)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
     <record id="fiscal_position_template_22_en" model="account.fiscal.position.template">
-        <field name="name">Harmonized Provinces Regime (13%)</field>
+		<field name="name">Harmonized Provinces Regime (13%) (ON, NB, NL)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
@@ -25,17 +25,17 @@
     </record>
 
     <record id="fiscal_position_template_24_en" model="account.fiscal.position.template">
-        <field name="name">Harmonized Provinces Regime (15%)</field>
+		<field name="name">Harmonized Provinces Regime (15%) (NS)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
     <record id="fiscal_position_template_3_en" model="account.fiscal.position.template">
-        <field name="name">Non-Harmonized Provinces Regime</field>
+		<field name="name">Non-Harmonized Provinces Regime (AB, MB, SK, PE, NT, NU, YT)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
     <record id="fiscal_position_template_4_en" model="account.fiscal.position.template">
-        <field name="name">International Regime</field>
+		<field name="name">International Regime (INTL)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 3ba13d6642e..b01ab0985ea 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -5,7 +5,7 @@
     <!-- Fiscal Position Templates -->
 
     <record id="fiscal_position_template_1_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provincial</field>
+        <field name="name">Régime Provincial (PROV)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
@@ -30,12 +30,12 @@
     </record>
 
     <record id="fiscal_position_template_3_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provinces Non-Harmonisées</field>
+        <field name="name">Régime Provinces Non-Harmonisées (AB, MB, SK, PE, NT, NU, YT)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
     <record id="fiscal_position_template_4_fr" model="account.fiscal.position.template">
-        <field name="name">Régime International</field>
+        <field name="name">Régime International (INTL)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
diff --git a/addons/l10n_ch/__init__.py b/addons/l10n_ch/__init__.py
index f0b006c2b32..12d42707679 100644
--- a/addons/l10n_ch/__init__.py
+++ b/addons/l10n_ch/__init__.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index e068c7365a1..8960224891d 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa SA, Open Net SA and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -21,29 +24,29 @@
 
 {'name': 'Switzerland - Accounting',
  'description':  """
-Swiss localization :
-====================
-**Multilang swiss STERCHI account chart and taxes**
- **Author:** Camptocamp SA
+ Swiss localization :
+ ====================
+ **Multilang swiss STERCHI account chart and taxes**
+  **Author:** Camptocamp SA
 
- **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+  **Financial contributors:** Prisme Solutions Informatique SA, Quod SA
 
- **Translators:** brain-tec AG, Agile Business Group
+  **Translation contributors:** brain-tec AG, Agile Business Group
 
-**This release will introduce major changes to l10n_ch.**
+ **This release will introduce major changes to l10n_ch.**
 
-Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
+ Due to important refactoring needs and the Switzerland adoption of new international payment standard during 2013-2014. We have reorganised the swiss localization addons this way:
 
-- **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
-- **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
-- **l10n_ch_bank**: List of swiss banks
-- **l10n_ch_zip**: List of swiss postal zip
-- **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
-- **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
-- **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
+ - **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official addon)
+ - **l10n_ch_base_bank**: Technical module that introduces a new and simplified version of bank type management
+ - **l10n_ch_bank**: List of swiss banks
+ - **l10n_ch_zip**: List of swiss postal zip
+ - **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end 2014)
+ - **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and reconciliation. Report refactored with easy element positioning.
+ - **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support will be completed during 2013/2014
 
-The modules will be soon available on OpenERP swiss localization on launchpad:
-https://launchpad.net/openerp-swiss-localization
+ The modules will be soon available on OpenERP swiss localization on launchpad:
+ https://launchpad.net/openerp-swiss-localization
 """,
  'version': '7.0',
  'author': 'Camptocamp',
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index e0a9e84b90a..4b985c09b76 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -1,8 +1,11 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    Author: Nicolas Bessi. Copyright Camptocamp SA
-#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#    Financial contributors: Hasa SA, Open Net SA,
+#                            Prisme Solutions Informatique SA, Quod SA
+#
+#    Translation contributors: brain-tec AG, Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_cl/__init__.py
+++ b/addons/l10n_cl/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_cr/l10n_cr_base_data.xml b/addons/l10n_cr/l10n_cr_base_data.xml
index 2268ecb37ed..28674185a85 100644
--- a/addons/l10n_cr/l10n_cr_base_data.xml
+++ b/addons/l10n_cr/l10n_cr_base_data.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
@@ -8,38 +7,38 @@
         -->
         <record id="state_SJ" model="res.country.state">
             <field name="code">SJ</field>
-            <field name="name">San José</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="name">San Jos&#233;</field>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_A" model="res.country.state">
             <field name="code">A</field>
             <field name="name">Alajuela</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_H" model="res.country.state">
             <field name="code">H</field>
             <field name="name">Heredia</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_C" model="res.country.state">
             <field name="code">C</field>
             <field name="name">Cartago</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_P" model="res.country.state">
             <field name="code">P</field>
             <field name="name">Puntarenas</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_G" model="res.country.state">
             <field name="code">G</field>
             <field name="name">Guanacaste</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <record id="state_L" model="res.country.state">
             <field name="code">L</field>
-            <field name="name">Limón</field>
-            <field model="res.country" name="country_id" ref="base.cr"/>
+            <field name="name">Lim&#243;n</field>
+            <field name="country_id" ref="base.cr"/>
         </record>
         <!--
         Resource: res.partner.title
@@ -71,7 +70,7 @@
             <field name="domain">contact</field>
         </record>
         <record id="res_partner_title_sal" model="res.partner.title">
-            <field name="name">Sociedad Anónima Laboral</field>
+            <field name="name">Sociedad An&#243;nima Laboral</field>
             <field name="shortcut">S.A.L.</field>
             <field name="domain">partner</field>
         </record>
@@ -136,4 +135,4 @@
             <field name="domain">contact</field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index 2264988fd99..9dd201c20cc 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -4,57 +4,60 @@
 #    OpenERP, Open Source Management Solution
 #    Copyright (c) 2008-2010 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
 #                            Jordi Esteve <jesteve@zikzakmedia.com>
+#    Copyright (c) 2012-2013, Grupo OPENTIA (<http://opentia.com>) Registered EU Trademark.
+#                            Dpto. Consultoría <consultoria@opentia.es>
+#    Copyright (c) 2013 Serv. Tecnol. Avanzados (http://www.serviciosbaeza.com)
+#                       Pedro Manuel Baeza <pedro.baeza@serviciosbaeza.com>
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
+#    it under the terms of the GNU Affero General Public License as published by
 #    the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 {
-    'name': 'Spanish - Accounting (PGCE 2008)',
-    'version': '3.0',
-    'author': 'Spanish Localization Team',
-    'website': 'https://launchpad.net/openerp-spain',
-    'category': 'Localization/Account Charts',
-    'description': """
+    "name" : "Spanish Charts of Accounts (PGCE 2008)",
+    "version" : "3.0",
+    "author" : "Spanish Localization Team",
+    'website' : 'https://launchpad.net/openerp-spain',
+    "category" : "Localization/Account Charts",
+    "description": """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
 
     * Defines the following chart of account templates:
         * Spanish General Chart of Accounts 2008
         * Spanish General Chart of Accounts 2008 for small and medium companies
+        * Spanish General Chart of Accounts 2008 for associations
     * Defines templates for sale and purchase VAT
     * Defines tax code templates
-
-**Note:** You should install the l10n_ES_account_balance_report module for yearly
-      account reporting (balance, profit & losses).
 """,
-    'license': 'GPL-3',
-    'depends': ['account', 'base_vat', 'base_iban'],
-    'data': [
-        'account_chart.xml',
-        'taxes_data.xml',
-        'fiscal_templates.xml',
-        'account_chart_pymes.xml',
-        'taxes_data_pymes.xml',
-        'fiscal_templates_pymes.xml',
-        'l10n_es_wizard.xml'
+    "license" : "AGPL-3",
+    "depends" : ["account", "base_vat", "base_iban"],
+    "data" : [
+        "account_chart.xml",
+        "taxes_data.xml",
+        "fiscal_templates.xml",
+        "account_chart_pymes.xml",
+        "taxes_data_pymes.xml",
+        "fiscal_templates_pymes.xml",
+        "account_chart_assoc.xml",
+        "taxes_data_assoc.xml",
+        "fiscal_templates_assoc.xml",
+        "l10n_es_wizard.xml",
     ],
-    'demo': [],
+    "demo" : [],
     'auto_install': False,
-    'installable': True,
+    "installable": True,
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 8ffabd17fe7..1bc63f6419f 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
     <!-- Tipos de cuenta para PGCE y PGCE PYMES -->
 
@@ -2722,7 +2722,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_281"/>
             <field name="type">view</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_2815_child" model="account.account.template">
@@ -2730,7 +2730,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_2815"/>
             <field name="type">other</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_2816" model="account.account.template">
@@ -4743,7 +4743,7 @@
         </record>
         <record id="pgc_460_child" model="account.account.template">
             <field name="code">460</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
@@ -4759,7 +4759,7 @@
         </record>
         <record id="pgc_465_child" model="account.account.template">
             <field name="code">465</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
@@ -4775,7 +4775,7 @@
         </record>
         <record id="pgc_466_child" model="account.account.template">
             <field name="code">466</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <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>
@@ -4805,8 +4805,8 @@
             <field name="name">Hacienda Pública, deudora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4700_child" model="account.account.template">
-            <field name="code">4700</field>
+        <record id="pgc_470000" model="account.account.template">
+            <field name="code">470000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4700"/>
             <field name="type">receivable</field>
@@ -4869,6 +4869,14 @@
             <field name="name">Hacienda Pública, IVA soportado</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_473" model="account.account.template">
             <field name="code">473</field>
             <field name="reconcile" eval="False"/>
@@ -4877,6 +4885,14 @@
             <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_473000" model="account.account.template">
+            <field name="code">473000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_474" model="account.account.template">
             <field name="code">474</field>
             <field name="reconcile" eval="False"/>
@@ -4949,8 +4965,8 @@
             <field name="name">Hacienda Pública, acreedora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4750_child" model="account.account.template">
-            <field name="code">4750</field>
+        <record id="pgc_475000" model="account.account.template">
+            <field name="code">475000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4750"/>
             <field name="type">payable</field>
@@ -4965,8 +4981,8 @@
             <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_4751_child" model="account.account.template">
-            <field name="code">4751</field>
+        <record id="pgc_475100" model="account.account.template">
+            <field name="code">475100</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_4751"/>
             <field name="type">payable</field>
@@ -5029,6 +5045,14 @@
             <field name="name">Hacienda Pública, IVA repercutido</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_479" model="account.account.template">
             <field name="code">479</field>
             <field name="reconcile" eval="False"/>
@@ -8722,7 +8746,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_66"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="name">Intereses de deudas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6620" model="account.account.template">
@@ -8730,7 +8754,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6620_child" model="account.account.template">
@@ -8738,7 +8762,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6620"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6621" model="account.account.template">
@@ -8746,7 +8770,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6621_child" model="account.account.template">
@@ -8754,7 +8778,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6621"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6622" model="account.account.template">
@@ -8762,7 +8786,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6622_child" model="account.account.template">
@@ -8770,7 +8794,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6622"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6623" model="account.account.template">
@@ -8778,7 +8802,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6623_child" model="account.account.template">
@@ -8786,7 +8810,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6623"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6624" model="account.account.template">
@@ -8794,7 +8818,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_6624_child" model="account.account.template">
@@ -8802,7 +8826,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_6624"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_663" model="account.account.template">
diff --git a/addons/l10n_es/account_chart_assoc.xml b/addons/l10n_es/account_chart_assoc.xml
new file mode 100644
index 00000000000..670eed53c9b
--- /dev/null
+++ b/addons/l10n_es/account_chart_assoc.xml
@@ -0,0 +1,12426 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+      <!-- 
+      Plantilla del árbol de cuentas del Plan General Contable ASOCIACIONES 2008.
+
+      Basada en la plantilla del Plan General Contable 2008, Plan General Contable PYMES 2008
+      -->
+
+
+         <record id="pgc_assoc_0" model="account.account.template">
+            <field name="code">0</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref=""/>
+            <field name="type">view</field>
+            <field name="name">Plan General Contable ASOCIACIONES 2008</field>
+            <field name="user_type" ref="view"/>
+        </record>
+
+        <record id="pgc_assoc_1" model="account.account.template">
+            <field name="code">1</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Financiación Básica</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_10" model="account.account.template">
+            <field name="code">10</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+
+        <record id="pgc_assoc_100" model="account.account.template">
+            <field name="code">100</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Dotación fundacional</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_100_child" model="account.account.template">
+            <field name="code">100</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_100"/>
+            <field name="type">other</field>
+            <field name="name">Dotación fundacional</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_101" model="account.account.template">
+            <field name="code">101</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Fondo social</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_101_child" model="account.account.template">
+            <field name="code">101</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_101"/>
+            <field name="type">other</field>
+            <field name="name">Fondo social</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_102" model="account.account.template">
+            <field name="code">102</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_102_child" model="account.account.template">
+            <field name="code">102</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_102"/>
+            <field name="type">other</field>
+            <field name="name">Capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_103" model="account.account.template">
+            <field name="code">103</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores/asociados por desembolsos no exigidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1030" model="account.account.template">
+            <field name="code">1030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_103"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores, parte no desembolsada en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1030_child" model="account.account.template">
+            <field name="code">1030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1030"/>
+            <field name="type">other</field>
+            <field name="name"> Fundadores, parte no desembolsada en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1034" model="account.account.template">
+            <field name="code">1034</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_103"/>
+            <field name="type">view</field>
+            <field name="name">Asociados, parte no desembolsada en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1034_child" model="account.account.template">
+            <field name="code">1034</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1034"/>
+            <field name="type">other</field>
+            <field name="name">Asociados, parte no desembolsada en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_104" model="account.account.template">
+            <field name="code">104</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores/asociados por aportaciones no dinerarias pendientes</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1040" model="account.account.template">
+            <field name="code">1040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_104"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores, por aportaciones no dinerarias pendientes, en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1040_child" model="account.account.template">
+            <field name="code">1040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1040"/>
+            <field name="type">other</field>
+            <field name="name">Fundadores, por aportaciones no dinerarias pendientes, en fundaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1044" model="account.account.template">
+            <field name="code">1044</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_104"/>
+            <field name="type">view</field>
+            <field name="name">Asociados, por aportaciones no dinerarias pendientes, en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1044_child" model="account.account.template">
+            <field name="code">1044</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1044"/>
+            <field name="type">other</field>
+            <field name="name">Asociados, por aportaciones no dinerarias pendientes, en asociaciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_108" model="account.account.template">
+            <field name="code">108</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones propias en situaciones especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_108_child" model="account.account.template">
+            <field name="code">108</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_108"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones propias en situaciones especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_109" model="account.account.template">
+            <field name="code">109</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_10"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones propias para reducción de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_109_child" model="account.account.template">
+            <field name="code">109</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_109"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones propias para reducción de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_11" model="account.account.template">
+            <field name="code">11</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Reservas y otros instrumentos de patrimonio</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_110" model="account.account.template">
+            <field name="code">110</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Prima de Emisión o asunción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_110_child" model="account.account.template">
+            <field name="code">110</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_110"/>
+            <field name="type">other</field>
+            <field name="name">Prima de Emisión o asunción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_112" model="account.account.template">
+            <field name="code">112</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Reserva Legal</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_112_child" model="account.account.template">
+            <field name="code">112</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_112"/>
+            <field name="type">other</field>
+            <field name="name">Reserva Legal</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_113" model="account.account.template">
+            <field name="code">113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Reservas voluntarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_113_child" model="account.account.template">
+            <field name="code">113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_113"/>
+            <field name="type">other</field>
+            <field name="name">Reservas voluntarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_114" model="account.account.template">
+            <field name="code">114</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Reservas especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1140" model="account.account.template">
+            <field name="code">1140</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reservas para acciones o participaciones de la sociedad dominante</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1140_child" model="account.account.template">
+            <field name="code">1140</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1140"/>
+            <field name="type">other</field>
+            <field name="name">Reservas para acciones o participaciones de la sociedad dominante</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1141" model="account.account.template">
+            <field name="code">1141</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reservas estatutarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1141_child" model="account.account.template">
+            <field name="code">1141</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1141"/>
+            <field name="type">other</field>
+            <field name="name">Reservas estatutarias</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1142" model="account.account.template">
+            <field name="code">1142</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reserva por capital amortizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1142_child" model="account.account.template">
+            <field name="code">1142</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1142"/>
+            <field name="type">other</field>
+            <field name="name">Reserva por capital amortizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1144" model="account.account.template">
+            <field name="code">1144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_114"/>
+            <field name="type">view</field>
+            <field name="name">Reservas por acciones propias aceptadas en garantía</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1144_child" model="account.account.template">
+            <field name="code">1144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1144"/>
+            <field name="type">other</field>
+            <field name="name">Reservas por acciones propias aceptadas en garantía</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_118" model="account.account.template">
+            <field name="code">118</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones de socios o propietarios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_118_child" model="account.account.template">
+            <field name="code">118</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_118"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones de socios o propietarios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_119" model="account.account.template">
+            <field name="code">119</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_11"/>
+            <field name="type">view</field>
+            <field name="name">Diferencias por ajuste del capital a euros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_119_child" model="account.account.template">
+            <field name="code">119</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_119"/>
+            <field name="type">other</field>
+            <field name="name">Diferencias por ajuste del capital a euros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_12" model="account.account.template">
+            <field name="code">12</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Excedentes pendientes de aplicación</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_120" model="account.account.template">
+            <field name="code">120</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_12"/>
+            <field name="type">view</field>
+            <field name="name">Remanente</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_120_child" model="account.account.template">
+            <field name="code">120</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_120"/>
+            <field name="type">other</field>
+            <field name="name">Remanente</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_121" model="account.account.template">
+            <field name="code">121</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_12"/>
+            <field name="type">view</field>
+            <field name="name">Excedentes negativos de ejercicios anteriores</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_121_child" model="account.account.template">
+            <field name="code">121</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_121"/>
+            <field name="type">other</field>
+            <field name="name">Excedentes negativos de ejercicios anteriores</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_129" model="account.account.template">
+            <field name="code">129</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_12"/>
+            <field name="type">view</field>
+            <field name="name">Excedente del ejercicio</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_129_child" model="account.account.template">
+            <field name="code">129</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_129"/>
+            <field name="type">other</field>
+            <field name="name">Excedente del ejercicio</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_13" model="account.account.template">
+            <field name="code">13</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y ajustes por cambio de valor</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_130" model="account.account.template">
+            <field name="code">130</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones oficiales de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1300" model="account.account.template">
+            <field name="code">1300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_130"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones del Estado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1300_child" model="account.account.template">
+            <field name="code">1300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1300"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones del Estado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1301" model="account.account.template">
+            <field name="code">1301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_130"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones de otras Administraciones Públicas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1301_child" model="account.account.template">
+            <field name="code">1301</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_1301"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones de otras Administraciones Públicas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_131" model="account.account.template">
+            <field name="code">131</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Donaciones y legados de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_131_child" model="account.account.template">
+            <field name="code">131</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_131"/>
+            <field name="type">other</field>
+            <field name="name">Donaciones y legados de capital</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_132" model="account.account.template">
+            <field name="code">132</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Otras subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1320" model="account.account.template">
+            <field name="code">1320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_132"/>
+            <field name="type">view</field>
+            <field name="name">Otras subvenciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1320_child" model="account.account.template">
+            <field name="code">1320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1320"/>
+            <field name="type">other</field>
+            <field name="name">Otras subvenciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1321" model="account.account.template">
+            <field name="code">1321</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_132"/>
+            <field name="type">view</field>
+            <field name="name">Otras donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1321_child" model="account.account.template">
+            <field name="code">1321</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_1321"/>
+            <field name="type">other</field>
+            <field name="name">Otras donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+
+        <record id="pgc_assoc_137" model="account.account.template">
+            <field name="code">137</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_13"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos fiscales a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1370" model="account.account.template">
+            <field name="code">1370</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_137"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1370_child" model="account.account.template">
+            <field name="code">1370</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1370"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1371" model="account.account.template">
+            <field name="code">1371</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_137"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1371_child" model="account.account.template">
+            <field name="code">1371</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1371"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_14" model="account.account.template">
+            <field name="code">14</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Provisiones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_141" model="account.account.template">
+            <field name="code">141</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para impuestos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_141_child" model="account.account.template">
+            <field name="code">141</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_141"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para impuestos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_142" model="account.account.template">
+            <field name="code">142</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para otras responsabilidades</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_142_child" model="account.account.template">
+            <field name="code">142</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_142"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para otras responsabilidades</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_143" model="account.account.template">
+            <field name="code">143</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_143_child" model="account.account.template">
+            <field name="code">143</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_143"/>
+            <field name="type">other</field>
+            <field name="name">Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_145" model="account.account.template">
+            <field name="code">145</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_14"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_145_child" model="account.account.template">
+            <field name="code">145</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_145"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_15" model="account.account.template">
+            <field name="code">15</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con características especiales</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_150" model="account.account.template">
+            <field name="code">150</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_15"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_150_child" model="account.account.template">
+            <field name="code">150</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_150"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_153" model="account.account.template">
+            <field name="code">153</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_15"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos por acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1533" model="account.account.template">
+            <field name="code">1533</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1533_child" model="account.account.template">
+            <field name="code">1533</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1533"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos no exigidos, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1534" model="account.account.template">
+            <field name="code">1534</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1534_child" model="account.account.template">
+            <field name="code">1534</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1534"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos no exigidos, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1535" model="account.account.template">
+            <field name="code">1535</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos no exigidos, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1535_child" model="account.account.template">
+            <field name="code">1535</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1535"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos no exigidos, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1536" model="account.account.template">
+            <field name="code">1536</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_153"/>
+            <field name="type">view</field>
+            <field name="name">Otros desembolsos no exigidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1536_child" model="account.account.template">
+            <field name="code">1536</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1536"/>
+            <field name="type">other</field>
+            <field name="name">Otros desembolsos no exigidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_154" model="account.account.template">
+            <field name="code">154</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_15"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes por acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1543" model="account.account.template">
+            <field name="code">1543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1543_child" model="account.account.template">
+            <field name="code">1543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1543"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1544" model="account.account.template">
+            <field name="code">1544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1544_child" model="account.account.template">
+            <field name="code">1544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1544"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones no dinerarias pendientes, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1545" model="account.account.template">
+            <field name="code">1545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Aportaciones no dinerarias pendientes, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1545_child" model="account.account.template">
+            <field name="code">1545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1545"/>
+            <field name="type">other</field>
+            <field name="name">Aportaciones no dinerarias pendientes, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1546" model="account.account.template">
+            <field name="code">1546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_154"/>
+            <field name="type">view</field>
+            <field name="name">Otras aportaciones no dinerarias pendientes</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1546_child" model="account.account.template">
+            <field name="code">1546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1546"/>
+            <field name="type">other</field>
+            <field name="name">Otras aportaciones no dinerarias pendientes</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_16" model="account.account.template">
+            <field name="code">16</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_160" model="account.account.template">
+            <field name="code">160</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1603" model="account.account.template">
+            <field name="code">1603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_160"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1603_child" model="account.account.template">
+            <field name="code">1603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1603"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1604" model="account.account.template">
+            <field name="code">1604</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_160"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1604_child" model="account.account.template">
+            <field name="code">1604</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1604"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con entidades de crédito vinculadas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1605" model="account.account.template">
+            <field name="code">1605</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_160"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1605_child" model="account.account.template">
+            <field name="code">1605</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1605"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_161" model="account.account.template">
+            <field name="code">161</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1613" model="account.account.template">
+            <field name="code">1613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_161"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1613_child" model="account.account.template">
+            <field name="code">1613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1613"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1614" model="account.account.template">
+            <field name="code">1614</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_161"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1614_child" model="account.account.template">
+            <field name="code">1614</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1614"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1615" model="account.account.template">
+            <field name="code">1615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_161"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1615_child" model="account.account.template">
+            <field name="code">1615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1615"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_162" model="account.account.template">
+            <field name="code">162</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1623" model="account.account.template">
+            <field name="code">1623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_162"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas de grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1623_child" model="account.account.template">
+            <field name="code">1623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1623"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas de grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1624" model="account.account.template">
+            <field name="code">1624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_162"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1624_child" model="account.account.template">
+            <field name="code">1624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1624"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1625" model="account.account.template">
+            <field name="code">1625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_162"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1625_child" model="account.account.template">
+            <field name="code">1625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1625"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero, otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_163" model="account.account.template">
+            <field name="code">163</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_16"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas con partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1633" model="account.account.template">
+            <field name="code">1633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_163"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1633_child" model="account.account.template">
+            <field name="code">1633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1633"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas, empresas del grupo</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1634" model="account.account.template">
+            <field name="code">1634</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_163"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1634_child" model="account.account.template">
+            <field name="code">1634</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1634"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas, empresas asociadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1635" model="account.account.template">
+            <field name="code">1635</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_163"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas, con otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_1635_child" model="account.account.template">
+            <field name="code">1635</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1635"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas, con otras partes vinculadas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_17" model="account.account.template">
+            <field name="code">17</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Deudas por préstamos recibidos, empréstitos y otros conceptos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_170" model="account.account.template">
+            <field name="code">170</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas con entidades de crédito</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_170_child" model="account.account.template">
+            <field name="code">170</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_170"/>
+            <field name="type">other</field>
+            <field name="name">Deudas con entidades de crédito</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_171" model="account.account.template">
+            <field name="code">171</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_171_child" model="account.account.template">
+            <field name="code">171</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_171"/>
+            <field name="type">other</field>
+            <field name="name">Deudas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_172" model="account.account.template">
+            <field name="code">172</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_172_child" model="account.account.template">
+            <field name="code">172</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_172"/>
+            <field name="type">other</field>
+            <field name="name">Deudas transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_173" model="account.account.template">
+            <field name="code">173</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_173_child" model="account.account.template">
+            <field name="code">173</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_173"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_174" model="account.account.template">
+            <field name="code">174</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_174_child" model="account.account.template">
+            <field name="code">174</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_174"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_175" model="account.account.template">
+            <field name="code">175</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Efectos a pagar</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_175_child" model="account.account.template">
+            <field name="code">175</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_175"/>
+            <field name="type">other</field>
+            <field name="name">Efectos a pagar</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_176" model="account.account.template">
+            <field name="code">176</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por derivados financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_176_child" model="account.account.template">
+            <field name="code">176</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_176"/>
+            <field name="type">other</field>
+            <field name="name">Pasivos por derivados financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_177" model="account.account.template">
+            <field name="code">177</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Obligaciones y bonos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_177_child" model="account.account.template">
+            <field name="code">177</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_177"/>
+            <field name="type">other</field>
+            <field name="name">Obligaciones y bonos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_179" model="account.account.template">
+            <field name="code">179</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_17"/>
+            <field name="type">view</field>
+            <field name="name">Deudas representadas en otros valores negociables</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_179_child" model="account.account.template">
+            <field name="code">179</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_179"/>
+            <field name="type">other</field>
+            <field name="name">Deudas representadas en otros valores negociables</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_18" model="account.account.template">
+            <field name="code">18</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por fianzas, garantías y otros conceptos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_180" model="account.account.template">
+            <field name="code">180</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_18"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas recibidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_180_child" model="account.account.template">
+            <field name="code">180</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_180"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas recibidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_181" model="account.account.template">
+            <field name="code">181</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_18"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos recibidos por ventas o prestaciones de servicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_181_child" model="account.account.template">
+            <field name="code">181</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_181"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos recibidos por ventas o prestaciones de servicios</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_185" model="account.account.template">
+            <field name="code">185</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_18"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos recibidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_185_child" model="account.account.template">
+            <field name="code">185</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_185"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos recibidos</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_19" model="account.account.template">
+            <field name="code">19</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_1"/>
+            <field name="type">view</field>
+            <field name="name">Situaciones transitorias de financiación</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_190" model="account.account.template">
+            <field name="code">190</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones emitidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_190_child" model="account.account.template">
+            <field name="code">190</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_190"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones emitidas</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_192" model="account.account.template">
+            <field name="code">192</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Suscriptores de acciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_192_child" model="account.account.template">
+            <field name="code">192</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_192"/>
+            <field name="type">other</field>
+            <field name="name">Suscriptores de acciones</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_194" model="account.account.template">
+            <field name="code">194</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Capital emitido pendiente de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_194_child" model="account.account.template">
+            <field name="code">194</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_194"/>
+            <field name="type">other</field>
+            <field name="name">Capital emitido pendiente de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_195" model="account.account.template">
+            <field name="code">195</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_195_child" model="account.account.template">
+            <field name="code">195</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_195"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_197" model="account.account.template">
+            <field name="code">197</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Suscriptores de acciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_197_child" model="account.account.template">
+            <field name="code">197</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_197"/>
+            <field name="type">other</field>
+            <field name="name">Suscriptores de acciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_199" model="account.account.template">
+            <field name="code">199</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_19"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_199_child" model="account.account.template">
+            <field name="code">199</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_199"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción</field>
+            <field name="user_type" ref="capital"/>
+        </record>
+        <record id="pgc_assoc_2" model="account.account.template">
+            <field name="code">2</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Activo no corriente</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_20" model="account.account.template">
+            <field name="code">20</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inmovilizaciones intangibles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_200" model="account.account.template">
+            <field name="code">200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_200_child" model="account.account.template">
+            <field name="code">200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_200"/>
+            <field name="type">other</field>
+            <field name="name">Investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_201" model="account.account.template">
+            <field name="code">201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_201_child" model="account.account.template">
+            <field name="code">201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_201"/>
+            <field name="type">other</field>
+            <field name="name">Desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_202" model="account.account.template">
+            <field name="code">202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_202_child" model="account.account.template">
+            <field name="code">202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_202"/>
+            <field name="type">other</field>
+            <field name="name">Concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_203" model="account.account.template">
+            <field name="code">203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_203_child" model="account.account.template">
+            <field name="code">203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_203"/>
+            <field name="type">other</field>
+            <field name="name">Propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_205" model="account.account.template">
+            <field name="code">205</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_205_child" model="account.account.template">
+            <field name="code">205</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_205"/>
+            <field name="type">other</field>
+            <field name="name">Derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_206" model="account.account.template">
+            <field name="code">206</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_206_child" model="account.account.template">
+            <field name="code">206</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_206"/>
+            <field name="type">other</field>
+            <field name="name">Aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_207" model="account.account.template">
+            <field name="code">207</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_207_child" model="account.account.template">
+            <field name="code">207</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_207"/>
+            <field name="type">other</field>
+            <field name="name">Derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_209" model="account.account.template">
+            <field name="code">209</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_20"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos para inmovilizaciones intangibles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_209_child" model="account.account.template">
+            <field name="code">209</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_209"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos para inmovilizaciones intangibles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_21" model="account.account.template">
+            <field name="code">21</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inmovilizaciones materiales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_210" model="account.account.template">
+            <field name="code">210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_210_child" model="account.account.template">
+            <field name="code">210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_210"/>
+            <field name="type">other</field>
+            <field name="name">Terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_211" model="account.account.template">
+            <field name="code">211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_211_child" model="account.account.template">
+            <field name="code">211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_211"/>
+            <field name="type">other</field>
+            <field name="name">Construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_212" model="account.account.template">
+            <field name="code">212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_212_child" model="account.account.template">
+            <field name="code">212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_212"/>
+            <field name="type">other</field>
+            <field name="name">Instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_213" model="account.account.template">
+            <field name="code">213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_213_child" model="account.account.template">
+            <field name="code">213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_213"/>
+            <field name="type">other</field>
+            <field name="name">Maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_214" model="account.account.template">
+            <field name="code">214</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_214_child" model="account.account.template">
+            <field name="code">214</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_214"/>
+            <field name="type">other</field>
+            <field name="name">Utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_215" model="account.account.template">
+            <field name="code">215</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Otras instalaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_215_child" model="account.account.template">
+            <field name="code">215</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_215"/>
+            <field name="type">other</field>
+            <field name="name">Otras instalaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_216" model="account.account.template">
+            <field name="code">216</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_216_child" model="account.account.template">
+            <field name="code">216</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_216"/>
+            <field name="type">other</field>
+            <field name="name">Mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_217" model="account.account.template">
+            <field name="code">217</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_217_child" model="account.account.template">
+            <field name="code">217</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_217"/>
+            <field name="type">other</field>
+            <field name="name">Equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_218" model="account.account.template">
+            <field name="code">218</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_218_child" model="account.account.template">
+            <field name="code">218</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_218"/>
+            <field name="type">other</field>
+            <field name="name">Elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_219" model="account.account.template">
+            <field name="code">219</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_21"/>
+            <field name="type">view</field>
+            <field name="name">Otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_219_child" model="account.account.template">
+            <field name="code">219</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_219"/>
+            <field name="type">other</field>
+            <field name="name">Otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_22" model="account.account.template">
+            <field name="code">22</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_220" model="account.account.template">
+            <field name="code">220</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_22"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones en terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_220_child" model="account.account.template">
+            <field name="code">220</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_220"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones en terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_221" model="account.account.template">
+            <field name="code">221</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_22"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones en construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_221_child" model="account.account.template">
+            <field name="code">221</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_221"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones en construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_23" model="account.account.template">
+            <field name="code">23</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Inmovilizaciones materiales en curso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_230" model="account.account.template">
+            <field name="code">230</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Adaptación de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_230_child" model="account.account.template">
+            <field name="code">230</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_230"/>
+            <field name="type">other</field>
+            <field name="name">Adaptación de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_231" model="account.account.template">
+            <field name="code">231</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Construcciones en curso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_231_child" model="account.account.template">
+            <field name="code">231</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_231"/>
+            <field name="type">other</field>
+            <field name="name">Construcciones en curso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_232" model="account.account.template">
+            <field name="code">232</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Instalaciones técnicas en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_232_child" model="account.account.template">
+            <field name="code">232</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_232"/>
+            <field name="type">other</field>
+            <field name="name">Instalaciones técnicas en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_233" model="account.account.template">
+            <field name="code">233</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Maquinaria en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_233_child" model="account.account.template">
+            <field name="code">233</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_233"/>
+            <field name="type">other</field>
+            <field name="name">Maquinaria en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_237" model="account.account.template">
+            <field name="code">237</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Equipos para procesos de información en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_237_child" model="account.account.template">
+            <field name="code">237</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_237"/>
+            <field name="type">other</field>
+            <field name="name">Equipos para procesos de información en montaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_239" model="account.account.template">
+            <field name="code">239</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_23"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos para inmovilizaciones materiales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_239_child" model="account.account.template">
+            <field name="code">239</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_239"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos para inmovilizaciones materiales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_24" model="account.account.template">
+            <field name="code">24</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Bienes del patrimonio histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_240" model="account.account.template">
+            <field name="code">240</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Bienes inmuebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2400" model="account.account.template">
+            <field name="code">2400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Monumentos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2400_child" model="account.account.template">
+            <field name="code">2400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2400"/>
+            <field name="type">other</field>
+            <field name="name">Monumentos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2401" model="account.account.template">
+            <field name="code">2401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Jardines históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2401_child" model="account.account.template">
+            <field name="code">2401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2401"/>
+            <field name="type">other</field>
+            <field name="name">Jardines históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2402" model="account.account.template">
+            <field name="code">2402</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Conjuntos históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2402_child" model="account.account.template">
+            <field name="code">2402</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2402"/>
+            <field name="type">other</field>
+            <field name="name">Conjuntos históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2403" model="account.account.template">
+            <field name="code">2403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Sitios históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2403_child" model="account.account.template">
+            <field name="code">2403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2403"/>
+            <field name="type">other</field>
+            <field name="name">Sitios históricos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2404" model="account.account.template">
+            <field name="code">2404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Zonas arqueológicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2404_child" model="account.account.template">
+            <field name="code">2404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2404"/>
+            <field name="type">other</field>
+            <field name="name">Zonas arqueológicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2405" model="account.account.template">
+            <field name="code">2405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_240"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2405_child" model="account.account.template">
+            <field name="code">2405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2405"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_241" model="account.account.template">
+            <field name="code">241</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Archivos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2413" model="account.account.template">
+            <field name="code">2413</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_241"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2413_child" model="account.account.template">
+            <field name="code">2413</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2413"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2414" model="account.account.template">
+            <field name="code">2414</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_241"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2414_child" model="account.account.template">
+            <field name="code">2414</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2414"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2415" model="account.account.template">
+            <field name="code">2415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_241"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2415_child" model="account.account.template">
+            <field name="code">2415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2415"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_242" model="account.account.template">
+            <field name="code">242</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Bibliotecas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2423" model="account.account.template">
+            <field name="code">2423</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_242"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2423_child" model="account.account.template">
+            <field name="code">2423</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2423"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2424" model="account.account.template">
+            <field name="code">2424</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_242"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2424_child" model="account.account.template">
+            <field name="code">2424</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2424"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2425" model="account.account.template">
+            <field name="code">2425</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_242"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2425_child" model="account.account.template">
+            <field name="code">2425</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2425"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_243" model="account.account.template">
+            <field name="code">243</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_243_child" model="account.account.template">
+            <field name="code">243</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_243"/>
+            <field name="type">other</field>
+            <field name="name">Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_244" model="account.account.template">
+            <field name="code">244</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_244_child" model="account.account.template">
+            <field name="code">244</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_244"/>
+            <field name="type">other</field>
+            <field name="name">Bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_249" model="account.account.template">
+            <field name="code">249</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_24"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+       <record id="pgc_assoc_2490" model="account.account.template">
+            <field name="code">2490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bienes inmuebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2490_child" model="account.account.template">
+            <field name="code">2490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2490"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre bienes inmuebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+       <record id="pgc_assoc_2491" model="account.account.template">
+            <field name="code">2491</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre archivos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2491_child" model="account.account.template">
+            <field name="code">2491</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2491"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre archivos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+       <record id="pgc_assoc_2492" model="account.account.template">
+            <field name="code">2492</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bibliotecas del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2492_child" model="account.account.template">
+            <field name="code">2492</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2492"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre bibliotecas del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2493" model="account.account.template">
+            <field name="code">2493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre museos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2493_child" model="account.account.template">
+            <field name="code">2493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2493"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre museos del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2494" model="account.account.template">
+            <field name="code">2494</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos sobre bienes muebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2494_child" model="account.account.template">
+            <field name="code">2494</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2494"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos sobre bienes muebles del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2495" model="account.account.template">
+            <field name="code">2495</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_249"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2495_child" model="account.account.template">
+            <field name="code">2495</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2495"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_25" model="account.account.template">
+            <field name="code">25</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Otras inversiones financieras</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_250" model="account.account.template">
+            <field name="code">250</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones financieras en instrumentos de patrimonio</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_250_child" model="account.account.template">
+            <field name="code">250</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_250"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones financieras en instrumentos de patrimonio</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_251" model="account.account.template">
+            <field name="code">251</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_251_child" model="account.account.template">
+            <field name="code">251</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_251"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_252" model="account.account.template">
+            <field name="code">252</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_252_child" model="account.account.template">
+            <field name="code">252</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_252"/>
+            <field name="type">other</field>
+            <field name="name">Créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_253" model="account.account.template">
+            <field name="code">253</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Créditos por enajenación de inmovilizado</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_253_child" model="account.account.template">
+            <field name="code">253</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_253"/>
+            <field name="type">other</field>
+            <field name="name">Créditos por enajenación de inmovilizado</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_254" model="account.account.template">
+            <field name="code">254</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Créditos al personal</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_254_child" model="account.account.template">
+            <field name="code">254</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_254"/>
+            <field name="type">other</field>
+            <field name="name">Créditos al personal</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_255" model="account.account.template">
+            <field name="code">255</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Activos por derivados financieros</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_255_child" model="account.account.template">
+            <field name="code">255</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_255"/>
+            <field name="type">other</field>
+            <field name="name">Activos por derivados financieros</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_258" model="account.account.template">
+            <field name="code">258</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Imposiciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_258_child" model="account.account.template">
+            <field name="code">258</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_258"/>
+            <field name="type">other</field>
+            <field name="name">Imposiciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_259" model="account.account.template">
+            <field name="code">259</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_25"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_259_child" model="account.account.template">
+            <field name="code">259</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_259"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_26" model="account.account.template">
+            <field name="code">26</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas y depósitos constituidos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_260" model="account.account.template">
+            <field name="code">260</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_26"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas constituidas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_260_child" model="account.account.template">
+            <field name="code">260</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_260"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas constituidas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_265" model="account.account.template">
+            <field name="code">265</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_26"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos constituidos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_265_child" model="account.account.template">
+            <field name="code">265</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_265"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos constituidos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_28" model="account.account.template">
+            <field name="code">28</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada del inmovilizado y otras cuentas correctoras</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_280" model="account.account.template">
+            <field name="code">280</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2800" model="account.account.template">
+            <field name="code">2800</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2800_child" model="account.account.template">
+            <field name="code">2800</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2800"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2801" model="account.account.template">
+            <field name="code">2801</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2801_child" model="account.account.template">
+            <field name="code">2801</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2801"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2802" model="account.account.template">
+            <field name="code">2802</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2802_child" model="account.account.template">
+            <field name="code">2802</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2802"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2803" model="account.account.template">
+            <field name="code">2803</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2803_child" model="account.account.template">
+            <field name="code">2803</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2803"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2805" model="account.account.template">
+            <field name="code">2805</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2805_child" model="account.account.template">
+            <field name="code">2805</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2805"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2806" model="account.account.template">
+            <field name="code">2806</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2806_child" model="account.account.template">
+            <field name="code">2806</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2806"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2807" model="account.account.template">
+            <field name="code">2807</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_280"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2807_child" model="account.account.template">
+            <field name="code">2807</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2807"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de derechos sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+
+        <record id="pgc_assoc_281" model="account.account.template">
+            <field name="code">281</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2811" model="account.account.template">
+            <field name="code">2811</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2811_child" model="account.account.template">
+            <field name="code">2811</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2811"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2812" model="account.account.template">
+            <field name="code">2812</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2812_child" model="account.account.template">
+            <field name="code">2812</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2812"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2813" model="account.account.template">
+            <field name="code">2813</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2813_child" model="account.account.template">
+            <field name="code">2813</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2813"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2814" model="account.account.template">
+            <field name="code">2814</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2814_child" model="account.account.template">
+            <field name="code">2814</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2814"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2815" model="account.account.template">
+            <field name="code">2815</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2815_child" model="account.account.template">
+            <field name="code">2815</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2815"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2816" model="account.account.template">
+            <field name="code">2816</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2816_child" model="account.account.template">
+            <field name="code">2816</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2816"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2817" model="account.account.template">
+            <field name="code">2817</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2817_child" model="account.account.template">
+            <field name="code">2817</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2817"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2818" model="account.account.template">
+            <field name="code">2818</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2818_child" model="account.account.template">
+            <field name="code">2818</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2818"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2819" model="account.account.template">
+            <field name="code">2819</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_281"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2819_child" model="account.account.template">
+            <field name="code">2819</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2819"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_282" model="account.account.template">
+            <field name="code">282</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Amortización acumulada de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_282_child" model="account.account.template">
+            <field name="code">282</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_282"/>
+            <field name="type">other</field>
+            <field name="name">Amortización acumulada de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_283" model="account.account.template">
+            <field name="code">283</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_28"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso sin contraprestación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2830" model="account.account.template">
+            <field name="code">2830</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_283"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2830_child" model="account.account.template">
+            <field name="code">2830</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2830"/>
+            <field name="type">other</field>
+            <field name="name">Cesiones de uso del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2831" model="account.account.template">
+            <field name="code">2831</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_283"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2831_child" model="account.account.template">
+            <field name="code">2831</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2831"/>
+            <field name="type">other</field>
+            <field name="name">Cesiones de uso del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2832" model="account.account.template">
+            <field name="code">2832</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_283"/>
+            <field name="type">view</field>
+            <field name="name">Cesiones de uso de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>       
+
+
+        <record id="pgc_assoc_2832_child" model="account.account.template">
+            <field name="code">2832</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2832"/>
+            <field name="type">other</field>
+            <field name="name">Cesiones de uso de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_29" model="account.account.template">
+            <field name="code">29</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de activos no corrientes</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_290" model="account.account.template">
+            <field name="code">290</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor del inmovilizado intangible</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2900" model="account.account.template">
+            <field name="code">2900</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2900_child" model="account.account.template">
+            <field name="code">2900</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2900"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de investigación</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2901" model="account.account.template">
+            <field name="code">2901</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2901_child" model="account.account.template">
+            <field name="code">2901</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2901"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de desarrollo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2902" model="account.account.template">
+            <field name="code">2902</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2902_child" model="account.account.template">
+            <field name="code">2902</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2902"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de concesiones administrativas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2903" model="account.account.template">
+            <field name="code">2903</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2903_child" model="account.account.template">
+            <field name="code">2903</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2903"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de propiedad industrial</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2905" model="account.account.template">
+            <field name="code">2905</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2905_child" model="account.account.template">
+            <field name="code">2905</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2905"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de derechos de traspaso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2906" model="account.account.template">
+            <field name="code">2906</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2906_child" model="account.account.template">
+            <field name="code">2906</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2906"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor de aplicaciones informáticas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2907" model="account.account.template">
+            <field name="code">2907</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_290"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2907_child" model="account.account.template">
+            <field name="code">2907</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2907"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro del valor sobre activos cedidos en uso</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+
+
+        <record id="pgc_assoc_291" model="account.account.template">
+            <field name="code">291</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor del inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2910" model="account.account.template">
+            <field name="code">2910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2910_child" model="account.account.template">
+            <field name="code">2910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2910"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2911" model="account.account.template">
+            <field name="code">2911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2911_child" model="account.account.template">
+            <field name="code">2911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2911"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2912" model="account.account.template">
+            <field name="code">2912</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2912_child" model="account.account.template">
+            <field name="code">2912</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2912"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de instalaciones técnicas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2913" model="account.account.template">
+            <field name="code">2913</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2913_child" model="account.account.template">
+            <field name="code">2913</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2913"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de maquinaria</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2914" model="account.account.template">
+            <field name="code">2914</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2914_child" model="account.account.template">
+            <field name="code">2914</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2914"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de utillaje</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2915" model="account.account.template">
+            <field name="code">2915</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2915_child" model="account.account.template">
+            <field name="code">2915</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2915"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de otras instaciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2916" model="account.account.template">
+            <field name="code">2916</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2916_child" model="account.account.template">
+            <field name="code">2916</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2916"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de mobiliario</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2917" model="account.account.template">
+            <field name="code">2917</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2917_child" model="account.account.template">
+            <field name="code">2917</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2917"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de equipos para proceso de información</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2918" model="account.account.template">
+            <field name="code">2918</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2918_child" model="account.account.template">
+            <field name="code">2918</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2918"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de elementos de transporte</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2919" model="account.account.template">
+            <field name="code">2919</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_291"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2919_child" model="account.account.template">
+            <field name="code">2919</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2919"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de otro inmovilizado material</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_292" model="account.account.template">
+            <field name="code">292</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2920" model="account.account.template">
+            <field name="code">2920</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_292"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2920_child" model="account.account.template">
+            <field name="code">2920</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2920"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los terrenos y bienes naturales</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2921" model="account.account.template">
+            <field name="code">2921</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_292"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2921_child" model="account.account.template">
+            <field name="code">2921</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2921"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de construcciones</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_293" model="account.account.template">
+            <field name="code">293</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones en partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2933" model="account.account.template">
+            <field name="code">2933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_293"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones en empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2933_child" model="account.account.template">
+            <field name="code">2933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2933"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones en empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2934" model="account.account.template">
+            <field name="code">2934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_293"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones en empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2934_child" model="account.account.template">
+            <field name="code">2934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2934"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones en empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2935" model="account.account.template">
+            <field name="code">2935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_293"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a largo plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2935_child" model="account.account.template">
+            <field name="code">2935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2935"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a largo plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_294" model="account.account.template">
+            <field name="code">294</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2943" model="account.account.template">
+            <field name="code">2943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_294"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2943_child" model="account.account.template">
+            <field name="code">2943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2943"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2944" model="account.account.template">
+            <field name="code">2944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_294"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2944_child" model="account.account.template">
+            <field name="code">2944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2944"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2945" model="account.account.template">
+            <field name="code">2945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_294"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2945_child" model="account.account.template">
+            <field name="code">2945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2945"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_295" model="account.account.template">
+            <field name="code">295</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2953" model="account.account.template">
+            <field name="code">2953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_295"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2953_child" model="account.account.template">
+            <field name="code">2953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2953"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a empresas del grupo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2954" model="account.account.template">
+            <field name="code">2954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_295"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2954_child" model="account.account.template">
+            <field name="code">2954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2954"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a empresas asociadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2955" model="account.account.template">
+            <field name="code">2955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_295"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2955_child" model="account.account.template">
+            <field name="code">2955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2955"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_296" model="account.account.template">
+            <field name="code">296</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de  valor de participaciones en el patrimonio neto a largo plazo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_296_child" model="account.account.template">
+            <field name="code">296</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_296"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de  valor de participaciones en el patrimonio neto a largo plazo</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_297" model="account.account.template">
+            <field name="code">297</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_297_child" model="account.account.template">
+            <field name="code">297</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_297"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_298" model="account.account.template">
+            <field name="code">298</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_298_child" model="account.account.template">
+            <field name="code">298</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_298"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_299" model="account.account.template">
+            <field name="code">299</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_29"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_299_child" model="account.account.template">
+            <field name="code">299</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2990" model="account.account.template">
+            <field name="code">2990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes inmuebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+<!--
+        <record id="pgc_assoc_2990_child" model="account.account.template">
+            <field name="code">2990</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_2990"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes inmuebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+-->
+        <record id="pgc_assoc_2991" model="account.account.template">
+            <field name="code">2991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de archivos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2991_child" model="account.account.template">
+            <field name="code">2991</field>
+            <field name="reconcile" eval="False"/>     
+            <field name="parent_id" ref="pgc_assoc_2991"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de archivos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2992" model="account.account.template">
+            <field name="code">2992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bibliotecas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2992_child" model="account.account.template">
+            <field name="code">2992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2992"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bibliotecas</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+        <record id="pgc_assoc_2993" model="account.account.template">
+            <field name="code">2993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2993_child" model="account.account.template">
+            <field name="code">2993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2993"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de Museos</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_2994" model="account.account.template">
+            <field name="code">2994</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_299"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+        <record id="pgc_assoc_2994_child" model="account.account.template">
+            <field name="code">2994</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_2994"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes muebles</field>
+            <field name="user_type" ref="inmo"/>
+        </record>
+
+
+        <record id="pgc_assoc_3" model="account.account.template">
+            <field name="code">3</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Existencias</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_30" model="account.account.template">
+            <field name="code">30</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Bienes destinados a la actividad</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_300" model="account.account.template">
+            <field name="code">300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_30"/>
+            <field name="type">view</field>
+            <field name="name">Mercaderías A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_300_child" model="account.account.template">
+            <field name="code">300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_300"/>
+            <field name="type">other</field>
+            <field name="name">Mercaderías A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_301" model="account.account.template">
+            <field name="code">301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_30"/>
+            <field name="type">view</field>
+            <field name="name">Mercaderías B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_301_child" model="account.account.template">
+            <field name="code">301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_301"/>
+            <field name="type">other</field>
+            <field name="name">Mercaderías B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_31" model="account.account.template">
+            <field name="code">31</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Materias Primas</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_310" model="account.account.template">
+            <field name="code">310</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_31"/>
+            <field name="type">view</field>
+            <field name="name">Materias Primas A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_310_child" model="account.account.template">
+            <field name="code">310</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_310"/>
+            <field name="type">other</field>
+            <field name="name">Materias Primas A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_311" model="account.account.template">
+            <field name="code">311</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_31"/>
+            <field name="type">view</field>
+            <field name="name">Materias Primas B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_311_child" model="account.account.template">
+            <field name="code">311</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_311"/>
+            <field name="type">other</field>
+            <field name="name">Materias Primas B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_32" model="account.account.template">
+            <field name="code">32</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Otros aprovisionamientos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_320" model="account.account.template">
+            <field name="code">320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Elementos y conjuntos incorporables</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_320_child" model="account.account.template">
+            <field name="code">320</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_320"/>
+            <field name="type">other</field>
+            <field name="name">Elementos y conjuntos incorporables</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_321" model="account.account.template">
+            <field name="code">321</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Combustibles</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_321_child" model="account.account.template">
+            <field name="code">321</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_321"/>
+            <field name="type">other</field>
+            <field name="name">Combustibles</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_322" model="account.account.template">
+            <field name="code">322</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Repuestos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_322_child" model="account.account.template">
+            <field name="code">322</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_322"/>
+            <field name="type">other</field>
+            <field name="name">Repuestos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_325" model="account.account.template">
+            <field name="code">325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Materiales diversos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_325_child" model="account.account.template">
+            <field name="code">325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_325"/>
+            <field name="type">other</field>
+            <field name="name">Materiales diversos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_326" model="account.account.template">
+            <field name="code">326</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Embalajes</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_326_child" model="account.account.template">
+            <field name="code">326</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_326"/>
+            <field name="type">other</field>
+            <field name="name">Embalajes</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_327" model="account.account.template">
+            <field name="code">327</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Envases</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_327_child" model="account.account.template">
+            <field name="code">327</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_327"/>
+            <field name="type">other</field>
+            <field name="name">Envases</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_328" model="account.account.template">
+            <field name="code">328</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_32"/>
+            <field name="type">view</field>
+            <field name="name">Material de oficina</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_328_child" model="account.account.template">
+            <field name="code">328</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_328"/>
+            <field name="type">other</field>
+            <field name="name">Material de oficina</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_33" model="account.account.template">
+            <field name="code">33</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Productos en curso</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_330" model="account.account.template">
+            <field name="code">330</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_33"/>
+            <field name="type">view</field>
+            <field name="name">Productos en curso A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_330_child" model="account.account.template">
+            <field name="code">330</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_330"/>
+            <field name="type">other</field>
+            <field name="name">Productos en curso A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_331" model="account.account.template">
+            <field name="code">331</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_33"/>
+            <field name="type">view</field>
+            <field name="name">Productos en curso B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_331_child" model="account.account.template">
+            <field name="code">331</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_331"/>
+            <field name="type">other</field>
+            <field name="name">Productos en curso B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_34" model="account.account.template">
+            <field name="code">34</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Productos semiterminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_340" model="account.account.template">
+            <field name="code">340</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_34"/>
+            <field name="type">view</field>
+            <field name="name">Productos semiterminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_340_child" model="account.account.template">
+            <field name="code">340</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_340"/>
+            <field name="type">other</field>
+            <field name="name">Productos semiterminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_341" model="account.account.template">
+            <field name="code">341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_34"/>
+            <field name="type">view</field>
+            <field name="name">Productos semiterminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_341_child" model="account.account.template">
+            <field name="code">341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_341"/>
+            <field name="type">other</field>
+            <field name="name">Productos semiterminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_35" model="account.account.template">
+            <field name="code">35</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Productos terminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_350" model="account.account.template">
+            <field name="code">350</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_35"/>
+            <field name="type">view</field>
+            <field name="name">Productos terminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_350_child" model="account.account.template">
+            <field name="code">350</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_350"/>
+            <field name="type">other</field>
+            <field name="name">Productos terminados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_351" model="account.account.template">
+            <field name="code">351</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_35"/>
+            <field name="type">view</field>
+            <field name="name">Productos terminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_351_child" model="account.account.template">
+            <field name="code">351</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_351"/>
+            <field name="type">other</field>
+            <field name="name">Productos terminados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_36" model="account.account.template">
+            <field name="code">36</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_360" model="account.account.template">
+            <field name="code">360</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Subproductos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_360_child" model="account.account.template">
+            <field name="code">360</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_360"/>
+            <field name="type">other</field>
+            <field name="name">Subproductos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_361" model="account.account.template">
+            <field name="code">361</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Subproductos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_361_child" model="account.account.template">
+            <field name="code">361</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_361"/>
+            <field name="type">other</field>
+            <field name="name">Subproductos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_365" model="account.account.template">
+            <field name="code">365</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Residuos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_365_child" model="account.account.template">
+            <field name="code">365</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_365"/>
+            <field name="type">other</field>
+            <field name="name">Residuos A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_366" model="account.account.template">
+            <field name="code">366</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Residuos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_366_child" model="account.account.template">
+            <field name="code">366</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_366"/>
+            <field name="type">other</field>
+            <field name="name">Residuos B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_368" model="account.account.template">
+            <field name="code">368</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Materiales recuperados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_368_child" model="account.account.template">
+            <field name="code">368</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_368"/>
+            <field name="type">other</field>
+            <field name="name">Materiales recuperados A</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_369" model="account.account.template">
+            <field name="code">369</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_36"/>
+            <field name="type">view</field>
+            <field name="name">Materiales recuperados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_369_child" model="account.account.template">
+            <field name="code">369</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_369"/>
+            <field name="type">other</field>
+            <field name="name">Materiales recuperados B</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_39" model="account.account.template">
+            <field name="code">39</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_3"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de las existencias</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_390" model="account.account.template">
+            <field name="code">390</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de bienes destinados a la actividad</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_390_child" model="account.account.template">
+            <field name="code">390</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_390"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de bienes destinados a la actividad</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_391" model="account.account.template">
+            <field name="code">391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de las materias primas</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_391_child" model="account.account.template">
+            <field name="code">391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_391"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de las materias primas</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_392" model="account.account.template">
+            <field name="code">392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de otros aprovisionamientos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_392_child" model="account.account.template">
+            <field name="code">392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_392"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de otros aprovisionamientos</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_393" model="account.account.template">
+            <field name="code">393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los productos en curso</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_393_child" model="account.account.template">
+            <field name="code">393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_393"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los productos en curso</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_394" model="account.account.template">
+            <field name="code">394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los productos semiterminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_394_child" model="account.account.template">
+            <field name="code">394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_394"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los productos semiterminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_395" model="account.account.template">
+            <field name="code">395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los productos terminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_395_child" model="account.account.template">
+            <field name="code">395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_395"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los productos terminados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_396" model="account.account.template">
+            <field name="code">396</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_39"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de los subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_396_child" model="account.account.template">
+            <field name="code">396</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_396"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de los subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="stock"/>
+        </record>
+        <record id="pgc_assoc_4" model="account.account.template">
+            <field name="code">4</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores y deudores por operaciones de la actividad</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_40" model="account.account.template">
+            <field name="code">40</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_400" model="account.account.template">
+            <field name="code">400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4000" model="account.account.template">
+            <field name="code">4000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_400"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4000_child" model="account.account.template">
+            <field name="code">4000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4000"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4004" model="account.account.template">
+            <field name="code">4004</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_400"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4004_child" model="account.account.template">
+            <field name="code">4004</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4004"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4009" model="account.account.template">
+            <field name="code">4009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4009_child" model="account.account.template">
+            <field name="code">4009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_401" model="account.account.template">
+            <field name="code">401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_401_child" model="account.account.template">
+            <field name="code">401</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_401"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_403" model="account.account.template">
+            <field name="code">403</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4030" model="account.account.template">
+            <field name="code">4030</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4030_child" model="account.account.template">
+            <field name="code">4030</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4030"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores, empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4031" model="account.account.template">
+            <field name="code">4031</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4031_child" model="account.account.template">
+            <field name="code">4031</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4031"/>
+            <field name="type">payable</field>
+            <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4034" model="account.account.template">
+            <field name="code">4034</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_403"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4034_child" model="account.account.template">
+            <field name="code">4034</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4034"/>
+            <field name="type">payable</field>
+            <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4036" model="account.account.template">
+            <field name="code">4036</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4036_child" model="account.account.template">
+            <field name="code">4036</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4039" model="account.account.template">
+            <field name="code">4039</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4039_child" model="account.account.template">
+            <field name="code">4039</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_404" model="account.account.template">
+            <field name="code">404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_404_child" model="account.account.template">
+            <field name="code">404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_404"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_405" model="account.account.template">
+            <field name="code">405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_405_child" model="account.account.template">
+            <field name="code">405</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_405"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_406" model="account.account.template">
+            <field name="code">406</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Envases y embalajes a devolver a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_406_child" model="account.account.template">
+            <field name="code">406</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_406"/>
+            <field name="type">other</field>
+            <field name="name">Envases y embalajes a devolver a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_407" model="account.account.template">
+            <field name="code">407</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_40"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_407_child" model="account.account.template">
+            <field name="code">407</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_407"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos a proveedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_41" model="account.account.template">
+            <field name="code">41</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Benerificiarios y acreedores varios</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_410" model="account.account.template">
+            <field name="code">410</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por prestaciones de servicios</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4100" model="account.account.template">
+            <field name="code">4100</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_410"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por prestaciones de servicios (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4100_child" model="account.account.template">
+            <field name="code">4100</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4100"/>
+            <field name="type">payable</field>
+            <field name="name">Acreedores por prestaciones de servicios (euros)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4104" model="account.account.template">
+            <field name="code">4104</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_410"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4104_child" model="account.account.template">
+            <field name="code">4104</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4104"/>
+            <field name="type">payable</field>
+            <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_4109" model="account.account.template">
+            <field name="code">4109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4109_child" model="account.account.template">
+            <field name="code">4109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_411" model="account.account.template">
+            <field name="code">411</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_411_child" model="account.account.template">
+            <field name="code">411</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_411"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores, efectos comerciales a pagar</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_412" model="account.account.template">
+            <field name="code">412</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Beneficiarios, acreedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_412_child" model="account.account.template">
+            <field name="code">412</field>
+            <field name="reconcile" eval="True"/> 
+            <field name="parent_id" ref="pgc_assoc_412"/>
+            <field name="type">other</field>
+            <field name="name">Beneficiarios, acreedores</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+
+
+
+
+
+        <record id="pgc_assoc_419" model="account.account.template">
+            <field name="code">419</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_41"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_419_child" model="account.account.template">
+            <field name="code">419</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_419"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_43" model="account.account.template">
+            <field name="code">43</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_430" model="account.account.template">
+            <field name="code">430</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4300" model="account.account.template">
+            <field name="code">4300</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_430"/>
+            <field name="type">view</field>
+            <field name="name">Clientes (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4300_child" model="account.account.template">
+            <field name="code">4300</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4300"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4304" model="account.account.template">
+            <field name="code">4304</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_430"/>
+            <field name="type">view</field>
+            <field name="name">Clientes (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4304_child" model="account.account.template">
+            <field name="code">4304</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4304"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4309" model="account.account.template">
+            <field name="code">4309</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4309_child" model="account.account.template">
+            <field name="code">4309</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_431" model="account.account.template">
+            <field name="code">431</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, efectos comerciales a cobrar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4310" model="account.account.template">
+            <field name="code">4310</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4310_child" model="account.account.template">
+            <field name="code">4310</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4310"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4311" model="account.account.template">
+            <field name="code">4311</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4311_child" model="account.account.template">
+            <field name="code">4311</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4311"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4312" model="account.account.template">
+            <field name="code">4312</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales en gestión de cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4312_child" model="account.account.template">
+            <field name="code">4312</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4312"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales en gestión de cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4315" model="account.account.template">
+            <field name="code">4315</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_431"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4315_child" model="account.account.template">
+            <field name="code">4315</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4315"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_432" model="account.account.template">
+            <field name="code">432</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_432_child" model="account.account.template">
+            <field name="code">432</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_432"/>
+            <field name="type">other</field>
+            <field name="name">Clientes, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_433" model="account.account.template">
+            <field name="code">433</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4330" model="account.account.template">
+            <field name="code">4330</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4330_child" model="account.account.template">
+            <field name="code">4330</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4330"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4331" model="account.account.template">
+            <field name="code">4331</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4331_child" model="account.account.template">
+            <field name="code">4331</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4331"/>
+            <field name="type">receivable</field>
+            <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4332" model="account.account.template">
+            <field name="code">4332</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4332_child" model="account.account.template">
+            <field name="code">4332</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4332"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4334" model="account.account.template">
+            <field name="code">4334</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4334_child" model="account.account.template">
+            <field name="code">4334</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4334"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4336" model="account.account.template">
+            <field name="code">4336</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_433"/>
+            <field name="type">view</field>
+            <field name="name">Clientes empresas del grupo de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4336_child" model="account.account.template">
+            <field name="code">4336</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4336"/>
+            <field name="type">receivable</field>
+            <field name="name">Clientes empresas del grupo de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4337" model="account.account.template">
+            <field name="code">4337</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4337_child" model="account.account.template">
+            <field name="code">4337</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4339" model="account.account.template">
+            <field name="code">4339</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4339_child" model="account.account.template">
+            <field name="code">4339</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_434" model="account.account.template">
+            <field name="code">434</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_434_child" model="account.account.template">
+            <field name="code">434</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_434"/>
+            <field name="type">other</field>
+            <field name="name">Clientes, empresas asociadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_435" model="account.account.template">
+            <field name="code">435</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_435_child" model="account.account.template">
+            <field name="code">435</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_435"/>
+            <field name="type">other</field>
+            <field name="name">Clientes, otras partes vinculadas</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_436" model="account.account.template">
+            <field name="code">436</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Clientes de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_436_child" model="account.account.template">
+            <field name="code">436</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_436"/>
+            <field name="type">other</field>
+            <field name="name">Clientes de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_437" model="account.account.template">
+            <field name="code">437</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Envases y embalajes a devolver por clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_437_child" model="account.account.template">
+            <field name="code">437</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_437"/>
+            <field name="type">other</field>
+            <field name="name">Envases y embalajes a devolver por clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_438" model="account.account.template">
+            <field name="code">438</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_43"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos de clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_438_child" model="account.account.template">
+            <field name="code">438</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_438"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos de clientes</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_44" model="account.account.template">
+            <field name="code">44</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Usuarios y deudores varios</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_440" model="account.account.template">
+            <field name="code">440</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4400" model="account.account.template">
+            <field name="code">4400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_440"/>
+            <field name="type">view</field>
+            <field name="name">Deudores (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4400_child" model="account.account.template">
+            <field name="code">4400</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4400"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores (euros)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4404" model="account.account.template">
+            <field name="code">4404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_440"/>
+            <field name="type">view</field>
+            <field name="name">Deudores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4404_child" model="account.account.template">
+            <field name="code">4404</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4404"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores (moneda extranjera)</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4409" model="account.account.template">
+            <field name="code">4409</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_440"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, facturas pendientes de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4409_child" model="account.account.template">
+            <field name="code">4409</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4409"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, facturas pendientes de formalizar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_441" model="account.account.template">
+            <field name="code">441</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales a cobrar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4410" model="account.account.template">
+            <field name="code">4410</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_441"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4410_child" model="account.account.template">
+            <field name="code">4410</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4410"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, efectos comerciales en cartera</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4411" model="account.account.template">
+            <field name="code">4411</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_441"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4411_child" model="account.account.template">
+            <field name="code">4411</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4411"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, efectos comerciales descontados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4412" model="account.account.template">
+            <field name="code">4412</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4412_child" model="account.account.template">
+            <field name="code">4412</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_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"/>
+        </record>
+        <record id="pgc_assoc_4415" model="account.account.template">
+            <field name="code">4415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_441"/>
+            <field name="type">view</field>
+            <field name="name">Deudores, efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4415_child" model="account.account.template">
+            <field name="code">4415</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4415"/>
+            <field name="type">receivable</field>
+            <field name="name">Deudores, efectos comerciales impagados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_446" model="account.account.template">
+            <field name="code">446</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_446_child" model="account.account.template">
+            <field name="code">446</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_446"/>
+            <field name="type">other</field>
+            <field name="name">Deudores de dudoso cobro</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+        <record id="pgc_assoc_447" model="account.account.template">
+            <field name="code">447</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Usuarios, deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_447_child" model="account.account.template">
+            <field name="code">447</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_447"/>
+            <field name="type">other</field>
+            <field name="name">Usuarios, deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_448" model="account.account.template">
+            <field name="code">448</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinadores, afiliados y otros deudores</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4480" model="account.account.template">
+            <field name="code">4480</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_448"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinadores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4480_child" model="account.account.template">
+            <field name="code">4480</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4480"/>
+            <field name="type">other</field>
+            <field name="name">Patrocinadores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+       <record id="pgc_assoc_4482" model="account.account.template">
+            <field name="code">4482</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_448"/>
+            <field name="type">view</field>
+            <field name="name">Afiliados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4482_child" model="account.account.template">
+            <field name="code">4482</field> 
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4482"/>
+            <field name="type">other</field> 
+            <field name="name">Afiliados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+       <record id="pgc_assoc_4489" model="account.account.template">
+            <field name="code">4489</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_448"/>
+            <field name="type">view</field>
+            <field name="name">Otros deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_4489_child" model="account.account.template">
+            <field name="code">4489</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4489"/>
+            <field name="type">other</field>
+            <field name="name">Otros deudores</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+
+        <record id="pgc_assoc_449" model="account.account.template">
+            <field name="code">449</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_44"/>
+            <field name="type">view</field>
+            <field name="name">Deudores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_449_child" model="account.account.template">
+            <field name="code">449</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_449"/>
+            <field name="type">other</field>
+            <field name="name">Deudores por operaciones en común</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_46" model="account.account.template">
+            <field name="code">46</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Personal</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_460" model="account.account.template">
+            <field name="code">460</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_46"/>
+            <field name="type">view</field>
+            <field name="name">Anticipos de remuneraciones</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_460_child" model="account.account.template">
+            <field name="code">460</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_460"/>
+            <field name="type">other</field>
+            <field name="name">Anticipos de remuneraciones</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+        <record id="pgc_assoc_464" model="account.account.template">
+            <field name="code">464</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_46"/>
+            <field name="type">view</field>
+            <field name="name">Entregas para gastos a justificar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_464_child" model="account.account.template">
+            <field name="code">464</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_464"/>
+            <field name="type">other</field>
+            <field name="name">Entregas para gastos a justificar</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+
+
+        <record id="pgc_assoc_465" model="account.account.template">
+            <field name="code">465</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_46"/>
+            <field name="type">view</field>
+            <field name="name">Remuneraciones pendientes de pago</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_465_child" model="account.account.template">
+            <field name="code">465</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_465"/>
+            <field name="type">other</field>
+            <field name="name">Remuneraciones pendientes de pago</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_47" model="account.account.template">
+            <field name="code">47</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Administraciones públicas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_470" model="account.account.template">
+            <field name="code">470</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por diversos conceptos</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4700" model="account.account.template">
+            <field name="code">4700</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4700_child" model="account.account.template">
+            <field name="code">4700</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4700"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4707" model="account.account.template">
+            <field name="code">4707</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4707_child" model="account.account.template">
+            <field name="code">4707</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4707"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por colaboración en la entrega y distribución de subvenciones (art.12 Ley de Subvenciones)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+
+        <record id="pgc_assoc_4708" model="account.account.template">
+            <field name="code">4708</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por subvenciones concedidas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4708_child" model="account.account.template">
+            <field name="code">4708</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4708"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por subvenciones concedidas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4709" model="account.account.template">
+            <field name="code">4709</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_470"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, deudora por devolución de impuestos</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4709_child" model="account.account.template">
+            <field name="code">4709</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4709"/>
+            <field name="type">receivable</field>
+            <field name="name">Hacienda Pública, deudora por devolución de impuestos</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_471" model="account.account.template">
+            <field name="code">471</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Organismos de la Seguridad Social, deudores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_471_child" model="account.account.template">
+            <field name="code">471</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_471"/>
+            <field name="type">other</field>
+            <field name="name">Organismos de la Seguridad Social, deudores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_472" model="account.account.template">
+            <field name="code">472</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_473" model="account.account.template">
+            <field name="code">473</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, retenciones y pagos a cuenta</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_474" model="account.account.template">
+            <field name="code">474</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Activos por impuesto diferido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4740" model="account.account.template">
+            <field name="code">4740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_474"/>
+            <field name="type">view</field>
+            <field name="name">Activos por diferencias temporarias deducibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4740_child" model="account.account.template">
+            <field name="code">4740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4740"/>
+            <field name="type">other</field>
+            <field name="name">Activos por diferencias temporarias deducibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4742" model="account.account.template">
+            <field name="code">4742</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_474"/>
+            <field name="type">view</field>
+            <field name="name">Derechos por deducciones y bonificaciones pendientes de aplicar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4742_child" model="account.account.template">
+            <field name="code">4742</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4742"/>
+            <field name="type">other</field>
+            <field name="name">Derechos por deducciones y bonificaciones pendientes de aplicar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4745" model="account.account.template">
+            <field name="code">4745</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_474"/>
+            <field name="type">view</field>
+            <field name="name">Crédito por pérdidas a compensar del ejercicio</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4745_child" model="account.account.template">
+            <field name="code">4745</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4745"/>
+            <field name="type">other</field>
+            <field name="name">Crédito por pérdidas a compensar del ejercicio</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_475" model="account.account.template">
+            <field name="code">475</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por conceptos fiscales</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4750" model="account.account.template">
+            <field name="code">4750</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_475000" model="account.account.template">
+            <field name="code">475000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4750"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por IVA</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4751" model="account.account.template">
+            <field name="code">4751</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4751_child" model="account.account.template">
+            <field name="code">4751</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por retenciones practicadas</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4752" model="account.account.template">
+            <field name="code">4752</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por impuesto sobre sociedades</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4752_child" model="account.account.template">
+            <field name="code">4752</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4752"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por impuesto sobre sociedades</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_4757" model="account.account.template">
+            <field name="code">4757</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvenciones)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4757_child" model="account.account.template">
+            <field name="code">4757</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4757"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones recibidas en concepto de entidad colaboradora (art.12 Ley de Subvencioens)</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_4758" model="account.account.template">
+            <field name="code">4758</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_475"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones a reintegrar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_4758_child" model="account.account.template">
+            <field name="code">4758</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4758"/>
+            <field name="type">payable</field>
+            <field name="name">Hacienda Pública, acreedora por subvenciones a reintegrar</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_476" model="account.account.template">
+            <field name="code">476</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Organismos de la Seguridad Social, acreedores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_476_child" model="account.account.template">
+            <field name="code">476</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_476"/>
+            <field name="type">other</field>
+            <field name="name">Organismos de la Seguridad Social, acreedores</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_477" model="account.account.template">
+            <field name="code">477</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Hacienda Pública, IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_479" model="account.account.template">
+            <field name="code">479</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_47"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por diferencias temporarias imponibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_479_child" model="account.account.template">
+            <field name="code">479</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_479"/>
+            <field name="type">other</field>
+            <field name="name">Pasivos por diferencias temporarias imponibles</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+        <record id="pgc_assoc_48" model="account.account.template">
+            <field name="code">48</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes por periodificación</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_480" model="account.account.template">
+            <field name="code">480</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_48"/>
+            <field name="type">view</field>
+            <field name="name">Gastos anticipados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_480_child" model="account.account.template">
+            <field name="code">480</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_480"/>
+            <field name="type">other</field>
+            <field name="name">Gastos anticipados</field>
+            <field name="user_type" ref="terceros_-_rec"/>
+        </record>
+        <record id="pgc_assoc_485" model="account.account.template">
+            <field name="code">485</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_48"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos anticipados</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_485_child" model="account.account.template">
+            <field name="code">485</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_485"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos anticipados</field>
+            <field name="user_type" ref="terceros_-_pay"/>
+        </record>
+        <record id="pgc_assoc_49" model="account.account.template">
+            <field name="code">49</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_4"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor por operaciones de la actividad y provisiones a corto plazo</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_490" model="account.account.template">
+            <field name="code">490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_49"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_490_child" model="account.account.template">
+            <field name="code">490</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_490"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_493" model="account.account.template">
+            <field name="code">493</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_49"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con partes vinculadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4933" model="account.account.template">
+            <field name="code">4933</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_493"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas del grupo</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4933_child" model="account.account.template">
+            <field name="code">4933</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4933"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas del grupo</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4934" model="account.account.template">
+            <field name="code">4934</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_493"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas asociadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4934_child" model="account.account.template">
+            <field name="code">4934</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4934"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con empresas asociadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4935" model="account.account.template">
+            <field name="code">4935</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_493"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4935_child" model="account.account.template">
+            <field name="code">4935</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4935"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos por operaciones comerciales con otras partes vinculadas</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_499" model="account.account.template">
+            <field name="code">499</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_49"/>
+            <field name="type">view</field>
+            <field name="name">Provisiones por operaciones comerciales</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4994" model="account.account.template">
+            <field name="code">4994</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_499"/>
+            <field name="type">view</field>
+            <field name="name">Provisión por contratos onerosos</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4994_child" model="account.account.template">
+            <field name="code">4994</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4994"/>
+            <field name="type">other</field>
+            <field name="name">Provisión por contratos onerosos</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4999" model="account.account.template">
+            <field name="code">4999</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_499"/>
+            <field name="type">view</field>
+            <field name="name">Provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_4999_child" model="account.account.template">
+            <field name="code">4999</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4999"/>
+            <field name="type">other</field>
+            <field name="name">Provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="terceros"/>
+        </record>
+        <record id="pgc_assoc_5" model="account.account.template">
+            <field name="code">5</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Cuentas financieras</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_50" model="account.account.template">
+            <field name="code">50</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Empréstitos, deudas con características especiales y otras emisiones análogas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_500" model="account.account.template">
+            <field name="code">500</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Obligaciones y bonos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_500_child" model="account.account.template">
+            <field name="code">500</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_500"/>
+            <field name="type">other</field>
+            <field name="name">Obligaciones y bonos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_502" model="account.account.template">
+            <field name="code">502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Acciones o participaciones a corto plazo consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_502_child" model="account.account.template">
+            <field name="code">502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_502"/>
+            <field name="type">other</field>
+            <field name="name">Acciones o participaciones a corto plazo consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_505" model="account.account.template">
+            <field name="code">505</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Deudas representadas en otros valores negociables a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_505_child" model="account.account.template">
+            <field name="code">505</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_505"/>
+            <field name="type">other</field>
+            <field name="name">Deudas representadas en otros valores negociables a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_506" model="account.account.template">
+            <field name="code">506</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de empréstitos y otras emisiones análogas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_506_child" model="account.account.template">
+            <field name="code">506</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_506"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de empréstitos y otras emisiones análogas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_507" model="account.account.template">
+            <field name="code">507</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_507_child" model="account.account.template">
+            <field name="code">507</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_507"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_509" model="account.account.template">
+            <field name="code">509</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_50"/>
+            <field name="type">view</field>
+            <field name="name">Valores negociables amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5090" model="account.account.template">
+            <field name="code">5090</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_509"/>
+            <field name="type">view</field>
+            <field name="name">Obligaciones y bonos amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5090_child" model="account.account.template">
+            <field name="code">5090</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5090"/>
+            <field name="type">other</field>
+            <field name="name">Obligaciones y bonos amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5095" model="account.account.template">
+            <field name="code">5095</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_509"/>
+            <field name="type">view</field>
+            <field name="name">Otros valores negociables amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5095_child" model="account.account.template">
+            <field name="code">5095</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5095"/>
+            <field name="type">other</field>
+            <field name="name">Otros valores negociables amortizados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_51" model="account.account.template">
+            <field name="code">51</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_510" model="account.account.template">
+            <field name="code">510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5103" model="account.account.template">
+            <field name="code">5103</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_510"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5103_child" model="account.account.template">
+            <field name="code">5103</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5103"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5104" model="account.account.template">
+            <field name="code">5104</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_510"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5104_child" model="account.account.template">
+            <field name="code">5104</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5104"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5105" model="account.account.template">
+            <field name="code">5105</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_510"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5105_child" model="account.account.template">
+            <field name="code">5105</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5105"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo con otras entidades de crédito vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_511" model="account.account.template">
+            <field name="code">511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5113" model="account.account.template">
+            <field name="code">5113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_511"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5113_child" model="account.account.template">
+            <field name="code">5113</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5113"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5114" model="account.account.template">
+            <field name="code">5114</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_511"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5114_child" model="account.account.template">
+            <field name="code">5114</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5114"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5115" model="account.account.template">
+            <field name="code">5115</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_511"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5115_child" model="account.account.template">
+            <field name="code">5115</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5115"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_512" model="account.account.template">
+            <field name="code">512</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5123" model="account.account.template">
+            <field name="code">5123</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_512"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5123_child" model="account.account.template">
+            <field name="code">5123</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5123"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5124" model="account.account.template">
+            <field name="code">5124</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_512"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5124_child" model="account.account.template">
+            <field name="code">5124</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5124"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5125" model="account.account.template">
+            <field name="code">5125</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_512"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5125_child" model="account.account.template">
+            <field name="code">5125</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5125"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_513" model="account.account.template">
+            <field name="code">513</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5133" model="account.account.template">
+            <field name="code">5133</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_513"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5133_child" model="account.account.template">
+            <field name="code">5133</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5133"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas a corto plazo con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5134" model="account.account.template">
+            <field name="code">5134</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_513"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5134_child" model="account.account.template">
+            <field name="code">5134</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5134"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas a corto plazo con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5135" model="account.account.template">
+            <field name="code">5135</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_513"/>
+            <field name="type">view</field>
+            <field name="name">Otras deudas a corto plazo con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5135_child" model="account.account.template">
+            <field name="code">5135</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5135"/>
+            <field name="type">other</field>
+            <field name="name">Otras deudas a corto plazo con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_514" model="account.account.template">
+            <field name="code">514</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_51"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5143" model="account.account.template">
+            <field name="code">5143</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_514"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5143_child" model="account.account.template">
+            <field name="code">5143</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5143"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5144" model="account.account.template">
+            <field name="code">5144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_514"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5144_child" model="account.account.template">
+            <field name="code">5144</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5144"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5145" model="account.account.template">
+            <field name="code">5145</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_514"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5145_child" model="account.account.template">
+            <field name="code">5145</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5145"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_52" model="account.account.template">
+            <field name="code">52</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo por préstamos recibidos y otros conceptos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_520" model="account.account.template">
+            <field name="code">520</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo con entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5200" model="account.account.template">
+            <field name="code">5200</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Préstamos a corto plazo de entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5200_child" model="account.account.template">
+            <field name="code">5200</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5200"/>
+            <field name="type">other</field>
+            <field name="name">Préstamos a corto plazo de entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5201" model="account.account.template">
+            <field name="code">5201</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo por crédito dispuesto</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5201_child" model="account.account.template">
+            <field name="code">5201</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5201"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo por crédito dispuesto</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5208" model="account.account.template">
+            <field name="code">5208</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Deudas por efectos descontados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5208_child" model="account.account.template">
+            <field name="code">5208</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5208"/>
+            <field name="type">other</field>
+            <field name="name">Deudas por efectos descontados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5209" model="account.account.template">
+            <field name="code">5209</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_520"/>
+            <field name="type">view</field>
+            <field name="name">Deudas por operaciones de “factoring”</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5209_child" model="account.account.template">
+            <field name="code">5209</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5209"/>
+            <field name="type">other</field>
+            <field name="name">Deudas por operaciones de “factoring”</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_521" model="account.account.template">
+            <field name="code">521</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_521_child" model="account.account.template">
+            <field name="code">521</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_521"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_522" model="account.account.template">
+            <field name="code">522</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Deudas a corto plazo transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_522_child" model="account.account.template">
+            <field name="code">522</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_522"/>
+            <field name="type">other</field>
+            <field name="name">Deudas a corto plazo transformables en subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_523" model="account.account.template">
+            <field name="code">523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_523_child" model="account.account.template">
+            <field name="code">523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_523"/>
+            <field name="type">other</field>
+            <field name="name">Proveedores de inmovilizado a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_524" model="account.account.template">
+            <field name="code">524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_524_child" model="account.account.template">
+            <field name="code">524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_524"/>
+            <field name="type">other</field>
+            <field name="name">Acreedores por arrendamiento financiero a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_525" model="account.account.template">
+            <field name="code">525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Efectos a pagar a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_525_child" model="account.account.template">
+            <field name="code">525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_525"/>
+            <field name="type">other</field>
+            <field name="name">Efectos a pagar a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_526" model="account.account.template">
+            <field name="code">526</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo activo a pagar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_526_child" model="account.account.template">
+            <field name="code">526</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_526"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo activo a pagar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_527" model="account.account.template">
+            <field name="code">527</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas con entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_527_child" model="account.account.template">
+            <field name="code">527</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_527"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas con entidades de crédito</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_528" model="account.account.template">
+            <field name="code">528</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_528_child" model="account.account.template">
+            <field name="code">528</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_528"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_529" model="account.account.template">
+            <field name="code">529</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_52"/>
+            <field name="type">view</field>
+            <field name="name">Provisiones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5290" model="account.account.template">
+            <field name="code">5290</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo por retribuciones al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5290_child" model="account.account.template">
+            <field name="code">5290</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5290"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo por retribuciones al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5291" model="account.account.template">
+            <field name="code">5291</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo para impuestos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5291_child" model="account.account.template">
+            <field name="code">5291</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5291"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo para impuestos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5292" model="account.account.template">
+            <field name="code">5292</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo para otras responsabilidades</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5292_child" model="account.account.template">
+            <field name="code">5292</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5292"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo para otras responsabilidades</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5293" model="account.account.template">
+            <field name="code">5293</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5293_child" model="account.account.template">
+            <field name="code">5293</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5293"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5295" model="account.account.template">
+            <field name="code">5295</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_529"/>
+            <field name="type">view</field>
+            <field name="name">Provisión a corto plazo para actuaciones medioambientales</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5295_child" model="account.account.template">
+            <field name="code">5295</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_5295"/>
+            <field name="type">other</field>
+            <field name="name">Provisión a corto plazo para actuaciones medioambientales</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_53" model="account.account.template">
+            <field name="code">53</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones financieras a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_530" model="account.account.template">
+            <field name="code">530</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5303" model="account.account.template">
+            <field name="code">5303</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_530"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5303_child" model="account.account.template">
+            <field name="code">5303</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5303"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5304" model="account.account.template">
+            <field name="code">5304</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_530"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5304_child" model="account.account.template">
+            <field name="code">5304</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5304"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5305" model="account.account.template">
+            <field name="code">5305</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_530"/>
+            <field name="type">view</field>
+            <field name="name">Participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5305_child" model="account.account.template">
+            <field name="code">5305</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5305"/>
+            <field name="type">other</field>
+            <field name="name">Participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_531" model="account.account.template">
+            <field name="code">531</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5313" model="account.account.template">
+            <field name="code">5313</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_531"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5313_child" model="account.account.template">
+            <field name="code">5313</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5313"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5314" model="account.account.template">
+            <field name="code">5314</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_531"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5314_child" model="account.account.template">
+            <field name="code">5314</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5314"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5315" model="account.account.template">
+            <field name="code">5315</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_531"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5315_child" model="account.account.template">
+            <field name="code">5315</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5315"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_532" model="account.account.template">
+            <field name="code">532</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5323" model="account.account.template">
+            <field name="code">5323</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_532"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5323_child" model="account.account.template">
+            <field name="code">5323</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5323"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5324" model="account.account.template">
+            <field name="code">5324</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_532"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5324_child" model="account.account.template">
+            <field name="code">5324</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5324"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5325" model="account.account.template">
+            <field name="code">5325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_532"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5325_child" model="account.account.template">
+            <field name="code">5325</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5325"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_533" model="account.account.template">
+            <field name="code">533</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5333" model="account.account.template">
+            <field name="code">5333</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_533"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5333_child" model="account.account.template">
+            <field name="code">5333</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5333"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5334" model="account.account.template">
+            <field name="code">5334</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_533"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5334_child" model="account.account.template">
+            <field name="code">5334</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5334"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5335" model="account.account.template">
+            <field name="code">5335</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_533"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5335_child" model="account.account.template">
+            <field name="code">5335</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5335"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deuda de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_534" model="account.account.template">
+            <field name="code">534</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5343" model="account.account.template">
+            <field name="code">5343</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_534"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5343_child" model="account.account.template">
+            <field name="code">5343</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5343"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5344" model="account.account.template">
+            <field name="code">5344</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_534"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5344_child" model="account.account.template">
+            <field name="code">5344</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5344"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5345" model="account.account.template">
+            <field name="code">5345</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_534"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5345_child" model="account.account.template">
+            <field name="code">5345</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5345"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_535" model="account.account.template">
+            <field name="code">535</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5353" model="account.account.template">
+            <field name="code">5353</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_535"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5353_child" model="account.account.template">
+            <field name="code">5353</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5353"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5354" model="account.account.template">
+            <field name="code">5354</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_535"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5354_child" model="account.account.template">
+            <field name="code">5354</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5354"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5355" model="account.account.template">
+            <field name="code">5355</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_535"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5355_child" model="account.account.template">
+            <field name="code">5355</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5355"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar de inversiones financieras en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_539" model="account.account.template">
+            <field name="code">539</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_53"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5393" model="account.account.template">
+            <field name="code">5393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_539"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5393_child" model="account.account.template">
+            <field name="code">5393</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5393"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5394" model="account.account.template">
+            <field name="code">5394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_539"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5394_child" model="account.account.template">
+            <field name="code">5394</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5394"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5395" model="account.account.template">
+            <field name="code">5395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_539"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5395_child" model="account.account.template">
+            <field name="code">5395</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5395"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_54" model="account.account.template">
+            <field name="code">54</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Otras inversiones financieras a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_540" model="account.account.template">
+            <field name="code">540</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones financieras a corto plazo en instrumentos de patrimonio</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_540_child" model="account.account.template">
+            <field name="code">540</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_540"/>
+            <field name="type">other</field>
+            <field name="name">Inversiones financieras a corto plazo en instrumentos de patrimonio</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_541" model="account.account.template">
+            <field name="code">541</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_541_child" model="account.account.template">
+            <field name="code">541</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_541"/>
+            <field name="type">other</field>
+            <field name="name">Valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_542" model="account.account.template">
+            <field name="code">542</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_542_child" model="account.account.template">
+            <field name="code">542</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_542"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_543" model="account.account.template">
+            <field name="code">543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo por enajenación de inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_543_child" model="account.account.template">
+            <field name="code">543</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_543"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo por enajenación de inmovilizado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_544" model="account.account.template">
+            <field name="code">544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Créditos a corto plazo al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_544_child" model="account.account.template">
+            <field name="code">544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_544"/>
+            <field name="type">other</field>
+            <field name="name">Créditos a corto plazo al personal</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_545" model="account.account.template">
+            <field name="code">545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo a cobrar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_545_child" model="account.account.template">
+            <field name="code">545</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_545"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo a cobrar</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_546" model="account.account.template">
+            <field name="code">546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_546_child" model="account.account.template">
+            <field name="code">546</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_546"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de valores representativos de deudas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_547" model="account.account.template">
+            <field name="code">547</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Intereses a corto plazo de créditos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_547_child" model="account.account.template">
+            <field name="code">547</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_547"/>
+            <field name="type">other</field>
+            <field name="name">Intereses a corto plazo de créditos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_548" model="account.account.template">
+            <field name="code">548</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Imposiciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_548_child" model="account.account.template">
+            <field name="code">548</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_548"/>
+            <field name="type">other</field>
+            <field name="name">Imposiciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_549" model="account.account.template">
+            <field name="code">549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_54"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_549_child" model="account.account.template">
+            <field name="code">549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_549"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos pendientes sobre participaciones en el patrimonio neto a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_55" model="account.account.template">
+            <field name="code">55</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Otras cuentas no bancarias</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_550" model="account.account.template">
+            <field name="code">550</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Titular de la explotación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_550_child" model="account.account.template">
+            <field name="code">550</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_550"/>
+            <field name="type">other</field>
+            <field name="name">Titular de la explotación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_551" model="account.account.template">
+            <field name="code">551</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con patronos y otros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_551_child" model="account.account.template">
+            <field name="code">551</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_551"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con patronos y otros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_552" model="account.account.template">
+            <field name="code">552</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con otras personas y entidades vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5523" model="account.account.template">
+            <field name="code">5523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_552"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5523_child" model="account.account.template">
+            <field name="code">5523</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5523"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5524" model="account.account.template">
+            <field name="code">5524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_552"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5524_child" model="account.account.template">
+            <field name="code">5524</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5524"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5525" model="account.account.template">
+            <field name="code">5525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_552"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5525_child" model="account.account.template">
+            <field name="code">5525</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5525"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_554" model="account.account.template">
+            <field name="code">554</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Cuenta corriente con uniones temporales de empresas y comunidades de bienes</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_554_child" model="account.account.template">
+            <field name="code">554</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_554"/>
+            <field name="type">other</field>
+            <field name="name">Cuenta corriente con uniones temporales de empresas y comunidades de bienes</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_555" model="account.account.template">
+            <field name="code">555</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Partidas pendientes de aplicación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_555_child" model="account.account.template">
+            <field name="code">555</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_555"/>
+            <field name="type">other</field>
+            <field name="name">Partidas pendientes de aplicación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_556" model="account.account.template">
+            <field name="code">556</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones en el patrimonio neto</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5563" model="account.account.template">
+            <field name="code">5563</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5563_child" model="account.account.template">
+            <field name="code">5563</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5563"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5564" model="account.account.template">
+            <field name="code">5564</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5564_child" model="account.account.template">
+            <field name="code">5564</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5564"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5565" model="account.account.template">
+            <field name="code">5565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5565_child" model="account.account.template">
+            <field name="code">5565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5565"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5566" model="account.account.template">
+            <field name="code">5566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_556"/>
+            <field name="type">view</field>
+            <field name="name">Desembolsos exigidos sobre participaciones de otras empresas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5566_child" model="account.account.template">
+            <field name="code">5566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5566"/>
+            <field name="type">other</field>
+            <field name="name">Desembolsos exigidos sobre participaciones de otras empresas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_557" model="account.account.template">
+            <field name="code">557</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Dividendo activo a cuenta</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_557_child" model="account.account.template">
+            <field name="code">557</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_557"/>
+            <field name="type">other</field>
+            <field name="name">Dividendo activo a cuenta</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_558" model="account.account.template">
+            <field name="code">558</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Fundadores y asociados por desembolsos exigidos</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5580" model="account.account.template">
+            <field name="code">5580</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_558"/>
+            <field name="type">view</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones ordinarias</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5580_child" model="account.account.template">
+            <field name="code">5580</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5580"/>
+            <field name="type">other</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones ordinarias</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5585" model="account.account.template">
+            <field name="code">5585</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_558"/>
+            <field name="type">view</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5585_child" model="account.account.template">
+            <field name="code">5585</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5585"/>
+            <field name="type">other</field>
+            <field name="name">Socios por desembolsos exigidos sobre acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_559" model="account.account.template">
+            <field name="code">559</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_55"/>
+            <field name="type">view</field>
+            <field name="name">Derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5590" model="account.account.template">
+            <field name="code">5590</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_559"/>
+            <field name="type">view</field>
+            <field name="name">Activos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5590_child" model="account.account.template">
+            <field name="code">5590</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5590"/>
+            <field name="type">other</field>
+            <field name="name">Activos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5595" model="account.account.template">
+            <field name="code">5595</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_559"/>
+            <field name="type">view</field>
+            <field name="name">Pasivos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5595_child" model="account.account.template">
+            <field name="code">5595</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5595"/>
+            <field name="type">other</field>
+            <field name="name">Pasivos por derivados financieros a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_56" model="account.account.template">
+            <field name="code">56</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas y depósitos recibidos y constituidos a corto plazo y ajustes por periodificación</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_560" model="account.account.template">
+            <field name="code">560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas recibidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_560_child" model="account.account.template">
+            <field name="code">560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_560"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas recibidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_561" model="account.account.template">
+            <field name="code">561</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos recibidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_561_child" model="account.account.template">
+            <field name="code">561</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_561"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos recibidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_565" model="account.account.template">
+            <field name="code">565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Fianzas constituidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_565_child" model="account.account.template">
+            <field name="code">565</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_565"/>
+            <field name="type">other</field>
+            <field name="name">Fianzas constituidas a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_566" model="account.account.template">
+            <field name="code">566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Depósitos constituidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_566_child" model="account.account.template">
+            <field name="code">566</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_566"/>
+            <field name="type">other</field>
+            <field name="name">Depósitos constituidos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_567" model="account.account.template">
+            <field name="code">567</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Intereses pagados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_567_child" model="account.account.template">
+            <field name="code">567</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_567"/>
+            <field name="type">other</field>
+            <field name="name">Intereses pagados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_568" model="account.account.template">
+            <field name="code">568</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_56"/>
+            <field name="type">view</field>
+            <field name="name">Intereses cobrados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_568_child" model="account.account.template">
+            <field name="code">568</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_568"/>
+            <field name="type">other</field>
+            <field name="name">Intereses cobrados por anticipado</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_57" model="account.account.template">
+            <field name="code">57</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Tesorería</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_570" model="account.account.template">
+            <field name="code">570</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Caja, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_570_child" model="account.account.template">
+            <field name="code">570</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_570"/>
+            <field name="type">liquidity</field>
+            <field name="name">Caja, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_571" model="account.account.template">
+            <field name="code">571</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Caja, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_571_child" model="account.account.template">
+            <field name="code">571</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_571"/>
+            <field name="type">liquidity</field>
+            <field name="name">Caja, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_572" model="account.account.template">
+            <field name="code">572</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_572_child" model="account.account.template">
+            <field name="code">572</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_572"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_573" model="account.account.template">
+            <field name="code">573</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_573_child" model="account.account.template">
+            <field name="code">573</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_573"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito c/c vista, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_574" model="account.account.template">
+            <field name="code">574</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_574_child" model="account.account.template">
+            <field name="code">574</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_574"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, euros</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_575" model="account.account.template">
+            <field name="code">575</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_575_child" model="account.account.template">
+            <field name="code">575</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_575"/>
+            <field name="type">liquidity</field>
+            <field name="name">Bancos e instituciones de crédito, cuentas de ahorro, moneda extranjera</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_576" model="account.account.template">
+            <field name="code">576</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_57"/>
+            <field name="type">view</field>
+            <field name="name">Inversiones a corto plazo de gran liquidez</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_576_child" model="account.account.template">
+            <field name="code">576</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_576"/>
+            <field name="type">liquidity</field>
+            <field name="name">Inversiones a corto plazo de gran liquidez</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_59" model="account.account.template">
+            <field name="code">59</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro del valor de inversiones financieras a corto plazo y de activos no corrientes mantenidos para la venta</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_593" model="account.account.template">
+            <field name="code">593</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5933" model="account.account.template">
+            <field name="code">5933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_593"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5933_child" model="account.account.template">
+            <field name="code">5933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5933"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5934" model="account.account.template">
+            <field name="code">5934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_593"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5934_child" model="account.account.template">
+            <field name="code">5934</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5934"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5935" model="account.account.template">
+            <field name="code">5935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_593"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5935_child" model="account.account.template">
+            <field name="code">5935</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5935"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo en otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_594" model="account.account.template">
+            <field name="code">594</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5943" model="account.account.template">
+            <field name="code">5943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_594"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5943_child" model="account.account.template">
+            <field name="code">5943</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5943"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5944" model="account.account.template">
+            <field name="code">5944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_594"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5944_child" model="account.account.template">
+            <field name="code">5944</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5944"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5945" model="account.account.template">
+            <field name="code">5945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_594"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5945_child" model="account.account.template">
+            <field name="code">5945</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5945"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo de otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_595" model="account.account.template">
+            <field name="code">595</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5953" model="account.account.template">
+            <field name="code">5953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_595"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5953_child" model="account.account.template">
+            <field name="code">5953</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5953"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas del grupo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5954" model="account.account.template">
+            <field name="code">5954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_595"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5954_child" model="account.account.template">
+            <field name="code">5954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5954"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a empresas asociadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5955" model="account.account.template">
+            <field name="code">5955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_595"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_5955_child" model="account.account.template">
+            <field name="code">5955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_5955"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo a otras partes vinculadas</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_596" model="account.account.template">
+            <field name="code">596</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_596_child" model="account.account.template">
+            <field name="code">596</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_596"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de participaciones a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_597" model="account.account.template">
+            <field name="code">597</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_597_child" model="account.account.template">
+            <field name="code">597</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_597"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_598" model="account.account.template">
+            <field name="code">598</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_59"/>
+            <field name="type">view</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_598_child" model="account.account.template">
+            <field name="code">598</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_598"/>
+            <field name="type">other</field>
+            <field name="name">Deterioro de valor de créditos a corto plazo</field>
+            <field name="user_type" ref="financieras"/>
+        </record>
+        <record id="pgc_assoc_6" model="account.account.template">
+            <field name="code">6</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Compras y Gastos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_60" model="account.account.template">
+            <field name="code">60</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Compras</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_600" model="account.account.template">
+            <field name="code">600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_600_child" model="account.account.template">
+            <field name="code">600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_600"/>
+            <field name="type">other</field>
+            <field name="name">Compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_601" model="account.account.template">
+            <field name="code">601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_601_child" model="account.account.template">
+            <field name="code">601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_601"/>
+            <field name="type">other</field>
+            <field name="name">Compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_602" model="account.account.template">
+            <field name="code">602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_602_child" model="account.account.template">
+            <field name="code">602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_602"/>
+            <field name="type">other</field>
+            <field name="name">Compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_606" model="account.account.template">
+            <field name="code">606</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6060" model="account.account.template">
+            <field name="code">6060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_606"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6060_child" model="account.account.template">
+            <field name="code">6060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6060"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre compras por pronto pago de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6061" model="account.account.template">
+            <field name="code">6061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_606"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6061_child" model="account.account.template">
+            <field name="code">6061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6061"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre compras por pronto pago de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6062" model="account.account.template">
+            <field name="code">6062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_606"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre compras por pronto pago de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6062_child" model="account.account.template">
+            <field name="code">6062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6062"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre compras por pronto pago de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_607" model="account.account.template">
+            <field name="code">607</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados por otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_607_child" model="account.account.template">
+            <field name="code">607</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_607"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados por otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_608" model="account.account.template">
+            <field name="code">608</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras y operaciones similares</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6080" model="account.account.template">
+            <field name="code">6080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_608"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6080_child" model="account.account.template">
+            <field name="code">6080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6080"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6081" model="account.account.template">
+            <field name="code">6081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_608"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6081_child" model="account.account.template">
+            <field name="code">6081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6081"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6082" model="account.account.template">
+            <field name="code">6082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_608"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6082_child" model="account.account.template">
+            <field name="code">6082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6082"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_609" model="account.account.template">
+            <field name="code">609</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_60"/>
+            <field name="type">view</field>
+            <field name="name">“Rappels” por compras</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6090" model="account.account.template">
+            <field name="code">6090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_609"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" por compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6090_child" model="account.account.template">
+            <field name="code">6090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6090"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" por compras de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6091" model="account.account.template">
+            <field name="code">6091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_609"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" por compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6091_child" model="account.account.template">
+            <field name="code">6091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6091"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" por compras de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6092" model="account.account.template">
+            <field name="code">6092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_609"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" por compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6092_child" model="account.account.template">
+            <field name="code">6092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6092"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" por compras de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_61" model="account.account.template">
+            <field name="code">61</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_610" model="account.account.template">
+            <field name="code">610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_61"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de bienes destinados a la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_610_child" model="account.account.template">
+            <field name="code">610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_610"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de mercaderías</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_611" model="account.account.template">
+            <field name="code">611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_61"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_611_child" model="account.account.template">
+            <field name="code">611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_611"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_612" model="account.account.template">
+            <field name="code">612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_61"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_612_child" model="account.account.template">
+            <field name="code">612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_612"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_62" model="account.account.template">
+            <field name="code">62</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Servicios Exteriores</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_620" model="account.account.template">
+            <field name="code">620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Gastos en investigación y desarrollo del ejercicio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_620_child" model="account.account.template">
+            <field name="code">620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_620"/>
+            <field name="type">other</field>
+            <field name="name">Gastos en investigación y desarrollo del ejercicio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_621" model="account.account.template">
+            <field name="code">621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Arrendamientos y cánones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_621_child" model="account.account.template">
+            <field name="code">621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_621"/>
+            <field name="type">other</field>
+            <field name="name">Arrendamientos y cánones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_622" model="account.account.template">
+            <field name="code">622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Reparaciones y conservación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_622_child" model="account.account.template">
+            <field name="code">622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_622"/>
+            <field name="type">other</field>
+            <field name="name">Reparaciones y conservación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_623" model="account.account.template">
+            <field name="code">623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Servicios de profesionales independientes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_623_child" model="account.account.template">
+            <field name="code">623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_623"/>
+            <field name="type">other</field>
+            <field name="name">Servicios de profesionales independientes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_624" model="account.account.template">
+            <field name="code">624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Transportes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_624_child" model="account.account.template">
+            <field name="code">624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_624"/>
+            <field name="type">other</field>
+            <field name="name">Transportes</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_625" model="account.account.template">
+            <field name="code">625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Primas de seguros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_625_child" model="account.account.template">
+            <field name="code">625</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_625"/>
+            <field name="type">other</field>
+            <field name="name">Primas de seguros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_626" model="account.account.template">
+            <field name="code">626</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Servicios bancarios y similares</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_626_child" model="account.account.template">
+            <field name="code">626</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_626"/>
+            <field name="type">other</field>
+            <field name="name">Servicios bancarios y similares</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_627" model="account.account.template">
+            <field name="code">627</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Publicidad, propaganda y relaciones públicas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_627_child" model="account.account.template">
+            <field name="code">627</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_627"/>
+            <field name="type">other</field>
+            <field name="name">Publicidad, propaganda y relaciones públicas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_628" model="account.account.template">
+            <field name="code">628</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Suministros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_628_child" model="account.account.template">
+            <field name="code">628</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_628"/>
+            <field name="type">other</field>
+            <field name="name">Suministros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_629" model="account.account.template">
+            <field name="code">629</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_62"/>
+            <field name="type">view</field>
+            <field name="name">Otros servicios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_629_child" model="account.account.template">
+            <field name="code">629</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_629"/>
+            <field name="type">other</field>
+            <field name="name">Otros servicios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_63" model="account.account.template">
+            <field name="code">63</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Tributos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_630" model="account.account.template">
+            <field name="code">630</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Impuesto sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6300" model="account.account.template">
+            <field name="code">6300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_630"/>
+            <field name="type">view</field>
+            <field name="name">Impuesto corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6300_child" model="account.account.template">
+            <field name="code">6300</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6300"/>
+            <field name="type">other</field>
+            <field name="name">Impuesto corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6301" model="account.account.template">
+            <field name="code">6301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_630"/>
+            <field name="type">view</field>
+            <field name="name">Impuesto diferido</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6301_child" model="account.account.template">
+            <field name="code">6301</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6301"/>
+            <field name="type">other</field>
+            <field name="name">Impuesto diferido</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_631" model="account.account.template">
+            <field name="code">631</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Otros tributos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_631_child" model="account.account.template">
+            <field name="code">631</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_631"/>
+            <field name="type">other</field>
+            <field name="name">Otros tributos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_633" model="account.account.template">
+            <field name="code">633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_633_child" model="account.account.template">
+            <field name="code">633</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_633"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes negativos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_634" model="account.account.template">
+            <field name="code">634</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en la imposición indirecta</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6341" model="account.account.template">
+            <field name="code">6341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_634"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6341_child" model="account.account.template">
+            <field name="code">6341</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6341"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes negativos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6342" model="account.account.template">
+            <field name="code">6342</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_634"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes negativos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6342_child" model="account.account.template">
+            <field name="code">6342</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6342"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes negativos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_636" model="account.account.template">
+            <field name="code">636</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Devolución de impuestos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_636_child" model="account.account.template">
+            <field name="code">636</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_636"/>
+            <field name="type">other</field>
+            <field name="name">Devolución de impuestos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_638" model="account.account.template">
+            <field name="code">638</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_638_child" model="account.account.template">
+            <field name="code">638</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_638"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes positivos en la imposición sobre beneficios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_639" model="account.account.template">
+            <field name="code">639</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_63"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en la imposición indirecta</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6391" model="account.account.template">
+            <field name="code">6391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_639"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6391_child" model="account.account.template">
+            <field name="code">6391</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6391"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes positivos en IVA de activo corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6392" model="account.account.template">
+            <field name="code">6392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_639"/>
+            <field name="type">view</field>
+            <field name="name">Ajustes positivos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6392_child" model="account.account.template">
+            <field name="code">6392</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6392"/>
+            <field name="type">other</field>
+            <field name="name">Ajustes positivos en IVA de inversiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_64" model="account.account.template">
+            <field name="code">64</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Gastos de personal</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_640" model="account.account.template">
+            <field name="code">640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Sueldos y salarios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_640_child" model="account.account.template">
+            <field name="code">640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_640"/>
+            <field name="type">other</field>
+            <field name="name">Sueldos y salarios</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_641" model="account.account.template">
+            <field name="code">641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Indemnizaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_641_child" model="account.account.template">
+            <field name="code">641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_641"/>
+            <field name="type">other</field>
+            <field name="name">Indemnizaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_642" model="account.account.template">
+            <field name="code">642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Seguridad Social a cargo de la empresa</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_642_child" model="account.account.template">
+            <field name="code">642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_642"/>
+            <field name="type">other</field>
+            <field name="name">Seguridad Social a cargo de la empresa</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_649" model="account.account.template">
+            <field name="code">649</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_64"/>
+            <field name="type">view</field>
+            <field name="name">Otros gastos sociales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_649_child" model="account.account.template">
+            <field name="code">649</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_649"/>
+            <field name="type">other</field>
+            <field name="name">Otros gastos sociales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_65" model="account.account.template">
+            <field name="code">65</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias de la entidad y otros gastos de gestión</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_650" model="account.account.template">
+            <field name="code">650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6501" model="account.account.template">
+            <field name="code">6501</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6501_child" model="account.account.template">
+            <field name="code">6501</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6501"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6502" model="account.account.template">
+            <field name="code">6502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6502_child" model="account.account.template">
+            <field name="code">6502</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6502"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6503" model="account.account.template">
+            <field name="code">6503</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6503_child" model="account.account.template">
+            <field name="code">6503</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6503"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6504" model="account.account.template">
+            <field name="code">6504</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_650"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6504_child" model="account.account.template">
+            <field name="code">6504</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6504"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+
+
+        <record id="pgc_assoc_651" model="account.account.template">
+            <field name="code">651</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6510" model="account.account.template">
+            <field name="code">6510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6510_child" model="account.account.template">
+            <field name="code">6510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6510"/>
+            <field name="type">other</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6511" model="account.account.template">
+            <field name="code">6511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6511_child" model="account.account.template">
+            <field name="code">6511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6511"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias individuales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6512" model="account.account.template">
+            <field name="code">6512</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6512_child" model="account.account.template">
+            <field name="code">6512</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6512"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias a entidades</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6513" model="account.account.template">
+            <field name="code">6513</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6513_child" model="account.account.template">
+            <field name="code">6513</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6513"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias realizadas a través de otras entidades o centros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6514" model="account.account.template">
+            <field name="code">6514</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_651"/>
+            <field name="type">view</field>
+            <field name="name">Ayudas no monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6514_child" model="account.account.template">
+            <field name="code">6514</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6514"/>
+            <field name="type">other</field>
+            <field name="name">Ayudas no monetarias de cooperación internacional</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_653" model="account.account.template">
+            <field name="code">653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Compensación de gastos por prestaciones de colaboración</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_653_child" model="account.account.template">
+            <field name="code">653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_653"/>
+            <field name="type">other</field>
+            <field name="name">Compensación de gastos por prestaciones de colaboración</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_654" model="account.account.template">
+            <field name="code">654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Reembolsos de gastos al órgano de gobierno</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_654_child" model="account.account.template">
+            <field name="code">654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_654"/>
+            <field name="type">other</field>
+            <field name="name">Reembolsos de gastos al órgano de gobierno</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_655" model="account.account.template">
+            <field name="code">655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos derivados de la actividad incobrables</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_655_child" model="account.account.template">
+            <field name="code">655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_655"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos derivados de la actividad incobrables</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+        <record id="pgc_assoc_656" model="account.account.template">
+            <field name="code">656</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Resultados de operaciones en común</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6560" model="account.account.template">
+            <field name="code">6560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_656"/>
+            <field name="type">view</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6560_child" model="account.account.template">
+            <field name="code">6560</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6560"/>
+            <field name="type">other</field>
+            <field name="name">Beneficio transferido (gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6561" model="account.account.template">
+            <field name="code">6561</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_656"/>
+            <field name="type">view</field>
+            <field name="name">Pérdida soportada (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6561_child" model="account.account.template">
+            <field name="code">6561</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_6561"/>
+            <field name="type">other</field>
+            <field name="name">Pérdida soportada(partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_658" model="account.account.template">
+            <field name="code">658</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Reintegro de subvenciones, donaciones y legados recibidos, afectados a la actividad propia de la entidad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_658_child" model="account.account.template">
+            <field name="code">658</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_658"/>
+            <field name="type">other</field>
+            <field name="name">Reintegro de subvenciones, donaciones y legados recibidos, afectos a la actividad propia de la entidad </field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+        <record id="pgc_assoc_659" model="account.account.template">
+            <field name="code">659</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_65"/>
+            <field name="type">view</field>
+            <field name="name">Otras pérdidas en gestión corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_659_child" model="account.account.template">
+            <field name="code">659</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_659"/>
+            <field name="type">other</field>
+            <field name="name">Otras pérdidas en gestión corriente</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_66" model="account.account.template">
+            <field name="code">66</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Gastos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_660" model="account.account.template">
+            <field name="code">660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Gastos financieros por actualización de provisiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_660_child" model="account.account.template">
+            <field name="code">660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_660"/>
+            <field name="type">other</field>
+            <field name="name">Gastos financieros por actualización de provisiones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_661" model="account.account.template">
+            <field name="code">661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6610" model="account.account.template">
+            <field name="code">6610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6610_child" model="account.account.template">
+            <field name="code">6610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6610"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6611" model="account.account.template">
+            <field name="code">6611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6611_child" model="account.account.template">
+            <field name="code">6611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6611"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6612" model="account.account.template">
+            <field name="code">6612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6612_child" model="account.account.template">
+            <field name="code">6612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6612"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6613" model="account.account.template">
+            <field name="code">6613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6613_child" model="account.account.template">
+            <field name="code">6613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6613"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6615" model="account.account.template">
+            <field name="code">6615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6615_child" model="account.account.template">
+            <field name="code">6615</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6615"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6616" model="account.account.template">
+            <field name="code">6616</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6616_child" model="account.account.template">
+            <field name="code">6616</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6616"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6617" model="account.account.template">
+            <field name="code">6617</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6617_child" model="account.account.template">
+            <field name="code">6617</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6617"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6618" model="account.account.template">
+            <field name="code">6618</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_661"/>
+            <field name="type">view</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6618_child" model="account.account.template">
+            <field name="code">6618</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6618"/>
+            <field name="type">other</field>
+            <field name="name">Intereses de obligaciones y bonos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_662" model="account.account.template">
+            <field name="code">662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6620" model="account.account.template">
+            <field name="code">6620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6620_child" model="account.account.template">
+            <field name="code">6620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6620"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6621" model="account.account.template">
+            <field name="code">6621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6621_child" model="account.account.template">
+            <field name="code">6621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6621"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6622" model="account.account.template">
+            <field name="code">6622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6622_child" model="account.account.template">
+            <field name="code">6622</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6622"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6623" model="account.account.template">
+            <field name="code">6623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6623_child" model="account.account.template">
+            <field name="code">6623</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6623"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6624" model="account.account.template">
+            <field name="code">6624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_662"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6624_child" model="account.account.template">
+            <field name="code">6624</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6624"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_663" model="account.account.template">
+            <field name="code">663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_663_child" model="account.account.template">
+            <field name="code">663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_663"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_664" model="account.account.template">
+            <field name="code">664</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de acciones o participaciones consideradas como pasivos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6640" model="account.account.template">
+            <field name="code">6640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6640_child" model="account.account.template">
+            <field name="code">6640</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6640"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6641" model="account.account.template">
+            <field name="code">6641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6641_child" model="account.account.template">
+            <field name="code">6641</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6641"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6642" model="account.account.template">
+            <field name="code">6642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6642_child" model="account.account.template">
+            <field name="code">6642</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6642"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6643" model="account.account.template">
+            <field name="code">6643</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_664"/>
+            <field name="type">view</field>
+            <field name="name">Dividendos de pasivos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6643_child" model="account.account.template">
+            <field name="code">6643</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6643"/>
+            <field name="type">other</field>
+            <field name="name">Dividendos de pasivos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_665" model="account.account.template">
+            <field name="code">665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos y operaciones de “factoring”</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6650" model="account.account.template">
+            <field name="code">6650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6650_child" model="account.account.template">
+            <field name="code">6650</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6650"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6651" model="account.account.template">
+            <field name="code">6651</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6651_child" model="account.account.template">
+            <field name="code">6651</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6651"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6652" model="account.account.template">
+            <field name="code">6652</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6652_child" model="account.account.template">
+            <field name="code">6652</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6652"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6653" model="account.account.template">
+            <field name="code">6653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por descuento de efectos en otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6653_child" model="account.account.template">
+            <field name="code">6653</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6653"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por descuento de efectos en otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6654" model="account.account.template">
+            <field name="code">6654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6654_child" model="account.account.template">
+            <field name="code">6654</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6654"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6655" model="account.account.template">
+            <field name="code">6655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6655_child" model="account.account.template">
+            <field name="code">6655</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6655"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6656" model="account.account.template">
+            <field name="code">6656</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6656_child" model="account.account.template">
+            <field name="code">6656</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6656"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con entidades de crédito vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6657" model="account.account.template">
+            <field name="code">6657</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_665"/>
+            <field name="type">view</field>
+            <field name="name">Intereses por operaciones de "factoring" con otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6657_child" model="account.account.template">
+            <field name="code">6657</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6657"/>
+            <field name="type">other</field>
+            <field name="name">Intereses por operaciones de "factoring" con otras entidades de crédito</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_666" model="account.account.template">
+            <field name="code">666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en participaciones y valores representativos de deuda</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6660" model="account.account.template">
+            <field name="code">6660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6660_child" model="account.account.template">
+            <field name="code">6660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6660"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6661" model="account.account.template">
+            <field name="code">6661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6661_child" model="account.account.template">
+            <field name="code">6661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6661"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6662" model="account.account.template">
+            <field name="code">6662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6662_child" model="account.account.template">
+            <field name="code">6662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6662"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6663" model="account.account.template">
+            <field name="code">6663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6663_child" model="account.account.template">
+            <field name="code">6663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6663"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6665" model="account.account.template">
+            <field name="code">6665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6665_child" model="account.account.template">
+            <field name="code">6665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6665"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6666" model="account.account.template">
+            <field name="code">6666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6666_child" model="account.account.template">
+            <field name="code">6666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6666"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6667" model="account.account.template">
+            <field name="code">6667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6667_child" model="account.account.template">
+            <field name="code">6667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6667"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6668" model="account.account.template">
+            <field name="code">6668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_666"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6668_child" model="account.account.template">
+            <field name="code">6668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6668"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_667" model="account.account.template">
+            <field name="code">667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos no comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6670" model="account.account.template">
+            <field name="code">6670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6670_child" model="account.account.template">
+            <field name="code">6670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6670"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6671" model="account.account.template">
+            <field name="code">6671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6671_child" model="account.account.template">
+            <field name="code">6671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6671"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6672" model="account.account.template">
+            <field name="code">6672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6672_child" model="account.account.template">
+            <field name="code">6672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6672"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6673" model="account.account.template">
+            <field name="code">6673</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6673_child" model="account.account.template">
+            <field name="code">6673</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6673"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6675" model="account.account.template">
+            <field name="code">6675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6675_child" model="account.account.template">
+            <field name="code">6675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6675"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6676" model="account.account.template">
+            <field name="code">6676</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6676_child" model="account.account.template">
+            <field name="code">6676</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6676"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6677" model="account.account.template">
+            <field name="code">6677</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6677_child" model="account.account.template">
+            <field name="code">6677</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6677"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6678" model="account.account.template">
+            <field name="code">6678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_667"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6678_child" model="account.account.template">
+            <field name="code">6678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6678"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_668" model="account.account.template">
+            <field name="code">668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Diferencias negativas de cambio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_668_child" model="account.account.template">
+            <field name="code">668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_668"/>
+            <field name="type">other</field>
+            <field name="name">Diferencias negativas de cambio</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_669" model="account.account.template">
+            <field name="code">669</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_66"/>
+            <field name="type">view</field>
+            <field name="name">Otros gastos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_669_child" model="account.account.template">
+            <field name="code">669</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_669"/>
+            <field name="type">other</field>
+            <field name="name">Otros gastos financieros</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_67" model="account.account.template">
+            <field name="code">67</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de activos no corrientes y gastos excepcionales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_670" model="account.account.template">
+            <field name="code">670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_670_child" model="account.account.template">
+            <field name="code">670</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_670"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_671" model="account.account.template">
+            <field name="code">671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_671_child" model="account.account.template">
+            <field name="code">671</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_671"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_672" model="account.account.template">
+            <field name="code">672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_672_child" model="account.account.template">
+            <field name="code">672</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_672"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_673" model="account.account.template">
+            <field name="code">673</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones en partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6733" model="account.account.template">
+            <field name="code">6733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_673"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones en, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6733_child" model="account.account.template">
+            <field name="code">6733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6733"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de participaciones en, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6734" model="account.account.template">
+            <field name="code">6734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_673"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6734_child" model="account.account.template">
+            <field name="code">6734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6734"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de participaciones, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6735" model="account.account.template">
+            <field name="code">6735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_673"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas procedentes de participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6735_child" model="account.account.template">
+            <field name="code">6735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6735"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas procedentes de participaciones, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_675" model="account.account.template">
+            <field name="code">675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_675_child" model="account.account.template">
+            <field name="code">675</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_675"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_678" model="account.account.template">
+            <field name="code">678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_67"/>
+            <field name="type">view</field>
+            <field name="name">Gastos excepcionales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_678_child" model="account.account.template">
+            <field name="code">678</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_678"/>
+            <field name="type">other</field>
+            <field name="name">Gastos excepcionales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_68" model="account.account.template">
+            <field name="code">68</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Dotaciones para amortizaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_680" model="account.account.template">
+            <field name="code">680</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_68"/>
+            <field name="type">view</field>
+            <field name="name">Amortización del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_680_child" model="account.account.template">
+            <field name="code">680</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_680"/>
+            <field name="type">other</field>
+            <field name="name">Amortización del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_681" model="account.account.template">
+            <field name="code">681</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_68"/>
+            <field name="type">view</field>
+            <field name="name">Amortización del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_681_child" model="account.account.template">
+            <field name="code">681</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_681"/>
+            <field name="type">other</field>
+            <field name="name">Amortización del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_682" model="account.account.template">
+            <field name="code">682</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_68"/>
+            <field name="type">view</field>
+            <field name="name">Amortización de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_682_child" model="account.account.template">
+            <field name="code">682</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_682"/>
+            <field name="type">other</field>
+            <field name="name">Amortización de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_69" model="account.account.template">
+            <field name="code">69</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro y otras dotaciones</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_690" model="account.account.template">
+            <field name="code">690</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_690_child" model="account.account.template">
+            <field name="code">690</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_690"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_691" model="account.account.template">
+            <field name="code">691</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_691_child" model="account.account.template">
+            <field name="code">691</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_691"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material y bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+        <record id="pgc_assoc_6910" model="account.account.template">
+            <field name="code">6910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_691"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <!--
+        <record id="pgc_assoc_6910_child" model="account.account.template">
+            <field name="code">6910</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6910"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro del inmovilizado material</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+-->
+        <record id="pgc_assoc_6911" model="account.account.template">
+            <field name="code">6911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_691"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6911_child" model="account.account.template">
+            <field name="code">6911</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6911"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+
+
+
+        <record id="pgc_assoc_692" model="account.account.template">
+            <field name="code">692</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_692_child" model="account.account.template">
+            <field name="code">692</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_692"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_693" model="account.account.template">
+            <field name="code">693</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de existencias</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6930" model="account.account.template">
+            <field name="code">6930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6930_child" model="account.account.template">
+            <field name="code">6930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6930"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6931" model="account.account.template">
+            <field name="code">6931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de mercaderías</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6931_child" model="account.account.template">
+            <field name="code">6931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6931"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de mercaderías</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6932" model="account.account.template">
+            <field name="code">6932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6932_child" model="account.account.template">
+            <field name="code">6932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6932"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de materias primas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6933" model="account.account.template">
+            <field name="code">6933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_693"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6933_child" model="account.account.template">
+            <field name="code">6933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6933"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_694" model="account.account.template">
+            <field name="code">694</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_694_child" model="account.account.template">
+            <field name="code">694</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_694"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_695" model="account.account.template">
+            <field name="code">695</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Dotación a la provisión por operaciones comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6954" model="account.account.template">
+            <field name="code">6954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_695"/>
+            <field name="type">view</field>
+            <field name="name">Dotación a la provisión por contratos onerosos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6954_child" model="account.account.template">
+            <field name="code">6954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6954"/>
+            <field name="type">other</field>
+            <field name="name">Dotación a la provisión por contratos onerosos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6959" model="account.account.template">
+            <field name="code">6959</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_695"/>
+            <field name="type">view</field>
+            <field name="name">Dotación a la provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6959_child" model="account.account.template">
+            <field name="code">6959</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6959"/>
+            <field name="type">other</field>
+            <field name="name">Dotación a la provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_696" model="account.account.template">
+            <field name="code">696</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones y valores representativos de deuda</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6960" model="account.account.template">
+            <field name="code">6960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6960_child" model="account.account.template">
+            <field name="code">6960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6960"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6961" model="account.account.template">
+            <field name="code">6961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6961_child" model="account.account.template">
+            <field name="code">6961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6961"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6962" model="account.account.template">
+            <field name="code">6962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6962_child" model="account.account.template">
+            <field name="code">6962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6962"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6963" model="account.account.template">
+            <field name="code">6963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6963_child" model="account.account.template">
+            <field name="code">6963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6963"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6965" model="account.account.template">
+            <field name="code">6965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6965_child" model="account.account.template">
+            <field name="code">6965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6965"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6966" model="account.account.template">
+            <field name="code">6966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6966_child" model="account.account.template">
+            <field name="code">6966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6966"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6967" model="account.account.template">
+            <field name="code">6967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6967_child" model="account.account.template">
+            <field name="code">6967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6967"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6968" model="account.account.template">
+            <field name="code">6968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_696"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6968_child" model="account.account.template">
+            <field name="code">6968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6968"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_697" model="account.account.template">
+            <field name="code">697</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6970" model="account.account.template">
+            <field name="code">6970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6970_child" model="account.account.template">
+            <field name="code">6970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6970"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6971" model="account.account.template">
+            <field name="code">6971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6971_child" model="account.account.template">
+            <field name="code">6971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6971"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6972" model="account.account.template">
+            <field name="code">6972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6972_child" model="account.account.template">
+            <field name="code">6972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6972"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6973" model="account.account.template">
+            <field name="code">6973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_697"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6973_child" model="account.account.template">
+            <field name="code">6973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6973"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_698" model="account.account.template">
+            <field name="code">698</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones y valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6980" model="account.account.template">
+            <field name="code">6980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6980_child" model="account.account.template">
+            <field name="code">6980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6980"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6981" model="account.account.template">
+            <field name="code">6981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6981_child" model="account.account.template">
+            <field name="code">6981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6981"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6985" model="account.account.template">
+            <field name="code">6985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6985_child" model="account.account.template">
+            <field name="code">6985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6985"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6986" model="account.account.template">
+            <field name="code">6986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6986_child" model="account.account.template">
+            <field name="code">6986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6986"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6987" model="account.account.template">
+            <field name="code">6987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6987_child" model="account.account.template">
+            <field name="code">6987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6987"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6988" model="account.account.template">
+            <field name="code">6988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_698"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6988_child" model="account.account.template">
+            <field name="code">6988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6988"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_699" model="account.account.template">
+            <field name="code">699</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_69"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6990" model="account.account.template">
+            <field name="code">6990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6990_child" model="account.account.template">
+            <field name="code">6990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6990"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6991" model="account.account.template">
+            <field name="code">6991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6991_child" model="account.account.template">
+            <field name="code">6991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6991"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6992" model="account.account.template">
+            <field name="code">6992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6992_child" model="account.account.template">
+            <field name="code">6992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6992"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6993" model="account.account.template">
+            <field name="code">6993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_699"/>
+            <field name="type">view</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_6993_child" model="account.account.template">
+            <field name="code">6993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_6993"/>
+            <field name="type">other</field>
+            <field name="name">Pérdidas por deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="gastos"/>
+        </record>
+        <record id="pgc_assoc_7" model="account.account.template">
+            <field name="code">7</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_0"/>
+            <field name="type">view</field>
+            <field name="name">Ventas e ingresos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_70" model="account.account.template">
+            <field name="code">70</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías, de producción propia, de servicios, etc.</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_700" model="account.account.template">
+            <field name="code">700</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7000" model="account.account.template">
+            <field name="code">7000</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_700"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7000_child" model="account.account.template">
+            <field name="code">7000</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7000"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de mercaderías en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7001" model="account.account.template">
+            <field name="code">7001</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_700"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7001_child" model="account.account.template">
+            <field name="code">7001</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7001"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de mercaderías Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7002" model="account.account.template">
+            <field name="code">7002</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_700"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de mercaderías Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7002_child" model="account.account.template">
+            <field name="code">7002</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7002"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de mercaderías Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_701" model="account.account.template">
+            <field name="code">701</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7010" model="account.account.template">
+            <field name="code">7010</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_701"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7010_child" model="account.account.template">
+            <field name="code">7010</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7010"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos terminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7011" model="account.account.template">
+            <field name="code">7011</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_701"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7011_child" model="account.account.template">
+            <field name="code">7011</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7011"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos terminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7012" model="account.account.template">
+            <field name="code">7012</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_701"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos terminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7012_child" model="account.account.template">
+            <field name="code">7012</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7012"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos terminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_702" model="account.account.template">
+            <field name="code">702</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7020" model="account.account.template">
+            <field name="code">7020</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_702"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7020_child" model="account.account.template">
+            <field name="code">7020</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7020"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos semiterminados en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7021" model="account.account.template">
+            <field name="code">7021</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_702"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7021_child" model="account.account.template">
+            <field name="code">7021</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7021"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos semiterminados Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7022" model="account.account.template">
+            <field name="code">7022</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_702"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de productos semiterminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7022_child" model="account.account.template">
+            <field name="code">7022</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7022"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de productos semiterminados Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_703" model="account.account.template">
+            <field name="code">703</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7030" model="account.account.template">
+            <field name="code">7030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_703"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7030_child" model="account.account.template">
+            <field name="code">7030</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7030"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de subproductos y residuos en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7031" model="account.account.template">
+            <field name="code">7031</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_703"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7031_child" model="account.account.template">
+            <field name="code">7031</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7031"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de subproductos y residuos Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7032" model="account.account.template">
+            <field name="code">7032</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_703"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de subproductos y residuos Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7032_child" model="account.account.template">
+            <field name="code">7032</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7032"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de subproductos y residuos Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_704" model="account.account.template">
+            <field name="code">704</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7040" model="account.account.template">
+            <field name="code">7040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_704"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7040_child" model="account.account.template">
+            <field name="code">7040</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7040"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de envases y embalajes en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7041" model="account.account.template">
+            <field name="code">7041</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_704"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7041_child" model="account.account.template">
+            <field name="code">7041</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7041"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de envases y embalajes Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7042" model="account.account.template">
+            <field name="code">7042</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_704"/>
+            <field name="type">view</field>
+            <field name="name">Ventas de envases y embalajes Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7042_child" model="account.account.template">
+            <field name="code">7042</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7042"/>
+            <field name="type">other</field>
+            <field name="name">Ventas de envases y embalajes Exportación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_705" model="account.account.template">
+            <field name="code">705</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7050" model="account.account.template">
+            <field name="code">7050</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_705"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7050_child" model="account.account.template">
+            <field name="code">7050</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7050"/>
+            <field name="type">other</field>
+            <field name="name">Prestaciones de servicios en España</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7051" model="account.account.template">
+            <field name="code">7051</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_705"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7051_child" model="account.account.template">
+            <field name="code">7051</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7051"/>
+            <field name="type">other</field>
+            <field name="name">Prestaciones de servicios Intracomunitarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7052" model="account.account.template">
+            <field name="code">7052</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_705"/>
+            <field name="type">view</field>
+            <field name="name">Prestaciones de servicios fuera de la UE</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7052_child" model="account.account.template">
+            <field name="code">7052</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7052"/>
+            <field name="type">other</field>
+            <field name="name">Prestaciones de servicios fuera de la UE</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_706" model="account.account.template">
+            <field name="code">706</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7060" model="account.account.template">
+            <field name="code">7060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7060_child" model="account.account.template">
+            <field name="code">7060</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7060"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7061" model="account.account.template">
+            <field name="code">7061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7061_child" model="account.account.template">
+            <field name="code">7061</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7061"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7062" model="account.account.template">
+            <field name="code">7062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7062_child" model="account.account.template">
+            <field name="code">7062</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7062"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7063" model="account.account.template">
+            <field name="code">7063</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_706"/>
+            <field name="type">view</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7063_child" model="account.account.template">
+            <field name="code">7063</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7063"/>
+            <field name="type">other</field>
+            <field name="name">Descuentos sobre ventas por pronto pago de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_708" model="account.account.template">
+            <field name="code">708</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas y operaciones similares</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7080" model="account.account.template">
+            <field name="code">7080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7080_child" model="account.account.template">
+            <field name="code">7080</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7080"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7081" model="account.account.template">
+            <field name="code">7081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7081_child" model="account.account.template">
+            <field name="code">7081</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7081"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7082" model="account.account.template">
+            <field name="code">7082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7082_child" model="account.account.template">
+            <field name="code">7082</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7082"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7083" model="account.account.template">
+            <field name="code">7083</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7083_child" model="account.account.template">
+            <field name="code">7083</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7083"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7084" model="account.account.template">
+            <field name="code">7084</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_708"/>
+            <field name="type">view</field>
+            <field name="name">Devoluciones de ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7084_child" model="account.account.template">
+            <field name="code">7084</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7084"/>
+            <field name="type">other</field>
+            <field name="name">Devoluciones de ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_709" model="account.account.template">
+            <field name="code">709</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_70"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7090" model="account.account.template">
+            <field name="code">7090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7090_child" model="account.account.template">
+            <field name="code">7090</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7090"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7091" model="account.account.template">
+            <field name="code">7091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7091_child" model="account.account.template">
+            <field name="code">7091</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7091"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7092" model="account.account.template">
+            <field name="code">7092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7092_child" model="account.account.template">
+            <field name="code">7092</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7092"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7093" model="account.account.template">
+            <field name="code">7093</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7093_child" model="account.account.template">
+            <field name="code">7093</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7093"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de subproductos y residuos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7094" model="account.account.template">
+            <field name="code">7094</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_709"/>
+            <field name="type">view</field>
+            <field name="name">"Rappels" sobre ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7094_child" model="account.account.template">
+            <field name="code">7094</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7094"/>
+            <field name="type">other</field>
+            <field name="name">"Rappels" sobre ventas de envases y embalajes</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_71" model="account.account.template">
+            <field name="code">71</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_710" model="account.account.template">
+            <field name="code">710</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de productos en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_710_child" model="account.account.template">
+            <field name="code">710</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_710"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de productos en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_711" model="account.account.template">
+            <field name="code">711</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_711_child" model="account.account.template">
+            <field name="code">711</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_711"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de productos semiterminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_712" model="account.account.template">
+            <field name="code">712</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_712_child" model="account.account.template">
+            <field name="code">712</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_712"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de productos terminados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_713" model="account.account.template">
+            <field name="code">713</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_71"/>
+            <field name="type">view</field>
+            <field name="name">Variación de existencias de subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_713_child" model="account.account.template">
+            <field name="code">713</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_713"/>
+            <field name="type">other</field>
+            <field name="name">Variación de existencias de subproductos, residuos y materiales recuperados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_72" model="account.account.template">
+            <field name="code">72</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos propios de la entidad</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_720" model="account.account.template">
+            <field name="code">720</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Cuotas de asociados y afiliados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_720_child" model="account.account.template">
+            <field name="code">720</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_720"/>
+            <field name="type">other</field>
+            <field name="name">Cuotas de asociados y afiliados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_721" model="account.account.template">
+            <field name="code">721</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Cuotas de usuarios</field>
+            <field name="user_type" ref="ingresos"/> 
+        </record>
+        <record id="pgc_assoc_721_child" model="account.account.template">
+            <field name="code">721</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_721"/>
+            <field name="type">other</field>
+            <field name="name">Cuotas de usuarios</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_722" model="account.account.template">
+            <field name="code">722</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Promociones de captación de recursos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_722_child" model="account.account.template">
+            <field name="code">722</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_722"/>
+            <field name="type">other</field>
+            <field name="name">Promociones de captación de recursos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_723" model="account.account.template">
+            <field name="code">723</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de patrocinadores y colaboraciones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7230" model="account.account.template">
+            <field name="code">7230</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_723"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7230_child" model="account.account.template">
+            <field name="code">7230</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_7230"/>
+            <field name="type">other</field>
+            <field name="name">Patrocinio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+        <record id="pgc_assoc_7231" model="account.account.template">
+            <field name="code">7231</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_723"/>
+            <field name="type">view</field>
+            <field name="name">Patrocinio publicitario</field>
+            <field name="user_type" ref="ingresos"/> 
+        </record>
+        <record id="pgc_assoc_7231_child" model="account.account.template">
+            <field name="code">7231</field>
+            <field name="reconcile" eval="False"/>     
+            <field name="parent_id" ref="pgc_assoc_7231"/>
+            <field name="type">other</field>
+            <field name="name">Patrocinio publicitario</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+
+        <record id="pgc_assoc_7233" model="account.account.template">
+            <field name="code">7233</field>
+            <field name="reconcile" eval="False"/>    
+            <field name="parent_id" ref="pgc_assoc_723"/>
+            <field name="type">view</field>
+            <field name="name">Colaboraciones empresariales</field>
+            <field name="user_type" ref="ingresos"/>  
+        </record>
+        <record id="pgc_assoc_7233_child" model="account.account.template">
+            <field name="code">7233</field>
+            <field name="reconcile" eval="False"/>     
+            <field name="parent_id" ref="pgc_assoc_7233"/>
+            <field name="type">other</field>
+            <field name="name">Colaboraciones empresariales</field>
+            <field name="user_type" ref="ingresos"/>  
+        </record>
+
+
+
+        <record id="pgc_assoc_728" model="account.account.template">
+            <field name="code">728</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_72"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por reintegro de ayudas y asignaciones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_728_child" model="account.account.template">
+            <field name="code">728</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_728"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por reintegro de ayudas y asignaciones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+
+
+        <record id="pgc_assoc_73" model="account.account.template">
+            <field name="code">73</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para la empresa</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_730" model="account.account.template">
+            <field name="code">730</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para el inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_730_child" model="account.account.template">
+            <field name="code">730</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_730"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados para el inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_731" model="account.account.template">
+            <field name="code">731</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para el inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_731_child" model="account.account.template">
+            <field name="code">731</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_731"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados para el inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_732" model="account.account.template">
+            <field name="code">732</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados en inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_732_child" model="account.account.template">
+            <field name="code">732</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_732"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados en inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_733" model="account.account.template">
+            <field name="code">733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_73"/>
+            <field name="type">view</field>
+            <field name="name">Trabajos realizados para el inmovilizado material en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_733_child" model="account.account.template">
+            <field name="code">733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_733"/>
+            <field name="type">other</field>
+            <field name="name">Trabajos realizados para el inmovilizado material en curso</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_74" model="account.account.template">
+            <field name="code">74</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y legados</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_740" model="account.account.template">
+            <field name="code">740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_74"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y legados a la explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_740_child" model="account.account.template">
+            <field name="code">740</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_740"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones, donaciones y legados a la explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_746" model="account.account.template">
+            <field name="code">746</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_74"/>
+            <field name="type">view</field>
+            <field name="name">Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_746_child" model="account.account.template">
+            <field name="code">746</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_746"/>
+            <field name="type">other</field>
+            <field name="name">Subvenciones, donaciones y legados de capital transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_747" model="account.account.template">
+            <field name="code">747</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_74"/>
+            <field name="type">view</field>
+            <field name="name">Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_747_child" model="account.account.template">
+            <field name="code">747</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_747"/>
+            <field name="type">other</field>
+            <field name="name">Otras subvenciones, donaciones y legados transferidos al resultado del ejercicio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_75" model="account.account.template">
+            <field name="code">75</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Otros ingresos de gestión</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_751" model="account.account.template">
+            <field name="code">751</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Resultados de operaciones en común</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7510" model="account.account.template">
+            <field name="code">7510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_751"/>
+            <field name="type">view</field>
+            <field name="name">Pérdida transferido (gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7510_child" model="account.account.template">
+            <field name="code">7510</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7510"/>
+            <field name="type">other</field>
+            <field name="name">Pérdida transferido (gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7511" model="account.account.template">
+            <field name="code">7511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_751"/>
+            <field name="type">view</field>
+            <field name="name">Beneficio atribuido (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7511_child" model="account.account.template">
+            <field name="code">7511</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7511"/>
+            <field name="type">other</field>
+            <field name="name">Beneficio atribuido (partícipe o asociado no gestor)</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_752" model="account.account.template">
+            <field name="code">752</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por arrendamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_752_child" model="account.account.template">
+            <field name="code">752</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_752"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por arrendamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_753" model="account.account.template">
+            <field name="code">753</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de propiedad industrial cedida en explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_753_child" model="account.account.template">
+            <field name="code">753</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_753"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de propiedad industrial cedida en explotación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_754" model="account.account.template">
+            <field name="code">754</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por comisiones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_754_child" model="account.account.template">
+            <field name="code">754</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_754"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por comisiones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_755" model="account.account.template">
+            <field name="code">755</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por servicios al personal</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_755_child" model="account.account.template">
+            <field name="code">755</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_755"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por servicios al personal</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_759" model="account.account.template">
+            <field name="code">759</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_75"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos por servicios diversos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_759_child" model="account.account.template">
+            <field name="code">759</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_759"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos por servicios diversos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76" model="account.account.template">
+            <field name="code">76</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos financieros</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_760" model="account.account.template">
+            <field name="code">760</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7600" model="account.account.template">
+            <field name="code">7600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7600_child" model="account.account.template">
+            <field name="code">7600</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7600"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7601" model="account.account.template">
+            <field name="code">7601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7601_child" model="account.account.template">
+            <field name="code">7601</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7601"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7602" model="account.account.template">
+            <field name="code">7602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7602_child" model="account.account.template">
+            <field name="code">7602</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7602"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7603" model="account.account.template">
+            <field name="code">7603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_760"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7603_child" model="account.account.template">
+            <field name="code">7603</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7603"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de participaciones en instrumentos de patrimonio, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_761" model="account.account.template">
+            <field name="code">761</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7610" model="account.account.template">
+            <field name="code">7610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7610_child" model="account.account.template">
+            <field name="code">7610</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7610"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7611" model="account.account.template">
+            <field name="code">7611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7611_child" model="account.account.template">
+            <field name="code">7611</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7611"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7612" model="account.account.template">
+            <field name="code">7612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7612_child" model="account.account.template">
+            <field name="code">7612</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7612"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7613" model="account.account.template">
+            <field name="code">7613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_761"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7613_child" model="account.account.template">
+            <field name="code">7613</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7613"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de valores representativos de deuda, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_762" model="account.account.template">
+            <field name="code">762</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7620" model="account.account.template">
+            <field name="code">7620</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_762"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76200" model="account.account.template">
+            <field name="code">76200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76200_child" model="account.account.template">
+            <field name="code">76200</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76200"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76201" model="account.account.template">
+            <field name="code">76201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76201_child" model="account.account.template">
+            <field name="code">76201</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76201"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76202" model="account.account.template">
+            <field name="code">76202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76202_child" model="account.account.template">
+            <field name="code">76202</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76202"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76203" model="account.account.template">
+            <field name="code">76203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7620"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76203_child" model="account.account.template">
+            <field name="code">76203</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76203"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7621" model="account.account.template">
+            <field name="code">7621</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_762"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76210" model="account.account.template">
+            <field name="code">76210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76210_child" model="account.account.template">
+            <field name="code">76210</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76210"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76211" model="account.account.template">
+            <field name="code">76211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76211_child" model="account.account.template">
+            <field name="code">76211</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76211"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76212" model="account.account.template">
+            <field name="code">76212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76212_child" model="account.account.template">
+            <field name="code">76212</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76212"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76213" model="account.account.template">
+            <field name="code">76213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7621"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_76213_child" model="account.account.template">
+            <field name="code">76213</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76213"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_763" model="account.account.template">
+            <field name="code">763</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_763_child" model="account.account.template">
+            <field name="code">763</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_763"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios por valoración de activos y pasivos financieros por su valor razonable</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_766" model="account.account.template">
+            <field name="code">766</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en participaciones y valores representativos de deuda</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7660" model="account.account.template">
+            <field name="code">7660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7660_child" model="account.account.template">
+            <field name="code">7660</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7660"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7661" model="account.account.template">
+            <field name="code">7661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7661_child" model="account.account.template">
+            <field name="code">7661</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7661"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7662" model="account.account.template">
+            <field name="code">7662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7662_child" model="account.account.template">
+            <field name="code">7662</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7662"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7663" model="account.account.template">
+            <field name="code">7663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7663_child" model="account.account.template">
+            <field name="code">7663</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7663"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7665" model="account.account.template">
+            <field name="code">7665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7665_child" model="account.account.template">
+            <field name="code">7665</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7665"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7666" model="account.account.template">
+            <field name="code">7666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7666_child" model="account.account.template">
+            <field name="code">7666</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7666"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7667" model="account.account.template">
+            <field name="code">7667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7667_child" model="account.account.template">
+            <field name="code">7667</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7667"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7668" model="account.account.template">
+            <field name="code">7668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_766"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7668_child" model="account.account.template">
+            <field name="code">7668</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7668"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios en valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_768" model="account.account.template">
+            <field name="code">768</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Diferencias positivas de cambio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_768_child" model="account.account.template">
+            <field name="code">768</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_768"/>
+            <field name="type">other</field>
+            <field name="name">Diferencias positivas de cambio</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_769" model="account.account.template">
+            <field name="code">769</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_76"/>
+            <field name="type">view</field>
+            <field name="name">Otros ingresos financieros</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_769_child" model="account.account.template">
+            <field name="code">769</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_769"/>
+            <field name="type">other</field>
+            <field name="name">Otros ingresos financieros</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_77" model="account.account.template">
+            <field name="code">77</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de activos no corrientes e ingresos excepcionales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_770" model="account.account.template">
+            <field name="code">770</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_770_child" model="account.account.template">
+            <field name="code">770</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_770"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_771" model="account.account.template">
+            <field name="code">771</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes del inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_771_child" model="account.account.template">
+            <field name="code">771</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_771"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes del inmovilizado material</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_772" model="account.account.template">
+            <field name="code">772</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_772_child" model="account.account.template">
+            <field name="code">772</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_772"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_773" model="account.account.template">
+            <field name="code">773</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo en partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7733" model="account.account.template">
+            <field name="code">7733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_773"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo en, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7733_child" model="account.account.template">
+            <field name="code">7733</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7733"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo en, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7734" model="account.account.template">
+            <field name="code">7734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_773"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7734_child" model="account.account.template">
+            <field name="code">7734</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7734"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7735" model="account.account.template">
+            <field name="code">7735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_773"/>
+            <field name="type">view</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7735_child" model="account.account.template">
+            <field name="code">7735</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7735"/>
+            <field name="type">other</field>
+            <field name="name">Beneficios procedentes de participaciones a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_775" model="account.account.template">
+            <field name="code">775</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Beneficos por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_775_child" model="account.account.template">
+            <field name="code">775</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_775"/>
+            <field name="type">other</field>
+            <field name="name">Beneficos por operaciones con obligaciones propias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_778" model="account.account.template">
+            <field name="code">778</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_77"/>
+            <field name="type">view</field>
+            <field name="name">Ingresos excepcionales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_778_child" model="account.account.template">
+            <field name="code">778</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_778"/>
+            <field name="type">other</field>
+            <field name="name">Ingresos excepcionales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79" model="account.account.template">
+            <field name="code">79</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7"/>
+            <field name="type">view</field>
+            <field name="name">Excesos y aplicaciones de provisiones y de pérdidas por deterioro</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_790" model="account.account.template">
+            <field name="code">790</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_790_child" model="account.account.template">
+            <field name="code">790</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_790"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro del inmovilizado intangible</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_791" model="account.account.template">
+            <field name="code">791</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_791_child" model="account.account.template">
+            <field name="code">791</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_791"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro del inmovilizado material y de bienes del Patrimonio Histórico</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_792" model="account.account.template">
+            <field name="code">792</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_792_child" model="account.account.template">
+            <field name="code">792</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_792"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de las inversiones inmobiliarias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_793" model="account.account.template">
+            <field name="code">793</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de existencias</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7930" model="account.account.template">
+            <field name="code">7930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7930_child" model="account.account.template">
+            <field name="code">7930</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7930"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de productos terminados y en curso de fabricación</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7931" model="account.account.template">
+            <field name="code">7931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7931_child" model="account.account.template">
+            <field name="code">7931</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7931"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de mercaderías</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7932" model="account.account.template">
+            <field name="code">7932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de materias primas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7932_child" model="account.account.template">
+            <field name="code">7932</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7932"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de materias primas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7933" model="account.account.template">
+            <field name="code">7933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_793"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7933_child" model="account.account.template">
+            <field name="code">7933</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7933"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de otros aprovisionamientos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_794" model="account.account.template">
+            <field name="code">794</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_794_child" model="account.account.template">
+            <field name="code">794</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_794"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos por operaciones de la actividad</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_795" model="account.account.template">
+            <field name="code">795</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisiones</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7951" model="account.account.template">
+            <field name="code">7951</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para impuestos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7951_child" model="account.account.template">
+            <field name="code">7951</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7951"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para impuestos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7952" model="account.account.template">
+            <field name="code">7952</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para otras responsabilidades</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7952_child" model="account.account.template">
+            <field name="code">7952</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7952"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para otras responsabilidades</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7954" model="account.account.template">
+            <field name="code">7954</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión por operaciones comerciales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79544" model="account.account.template">
+            <field name="code">79544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7954"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión por contratos onerosos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79544_child" model="account.account.template">
+            <field name="code">79544</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79544"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión por contratos onerosos</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79549" model="account.account.template">
+            <field name="code">79549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7954"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_79549_child" model="account.account.template">
+            <field name="code">79549</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79549"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para otras operaciones comerciales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7955" model="account.account.template">
+            <field name="code">7955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_795"/>
+            <field name="type">view</field>
+            <field name="name">Exceso de provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7955_child" model="account.account.template">
+            <field name="code">7955</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7955"/>
+            <field name="type">other</field>
+            <field name="name">Exceso de provisión para actuaciones medioambientales</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_796" model="account.account.template">
+            <field name="code">796</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones y valores representativos de deuda a largo plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7960" model="account.account.template">
+            <field name="code">7960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7960_child" model="account.account.template">
+            <field name="code">7960</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7960"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7961" model="account.account.template">
+            <field name="code">7961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7961_child" model="account.account.template">
+            <field name="code">7961</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7961"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7962" model="account.account.template">
+            <field name="code">7962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7962_child" model="account.account.template">
+            <field name="code">7962</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7962"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7963" model="account.account.template">
+            <field name="code">7963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7963_child" model="account.account.template">
+            <field name="code">7963</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7963"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7965" model="account.account.template">
+            <field name="code">7965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7965_child" model="account.account.template">
+            <field name="code">7965</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7965"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7966" model="account.account.template">
+            <field name="code">7966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7966_child" model="account.account.template">
+            <field name="code">7966</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7966"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7967" model="account.account.template">
+            <field name="code">7967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7967_child" model="account.account.template">
+            <field name="code">7967</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7967"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7968" model="account.account.template">
+            <field name="code">7968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_796"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7968_child" model="account.account.template">
+            <field name="code">7968</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7968"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_797" model="account.account.template">
+            <field name="code">797</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7970" model="account.account.template">
+            <field name="code">7970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7970_child" model="account.account.template">
+            <field name="code">7970</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7970"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7971" model="account.account.template">
+            <field name="code">7971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7971_child" model="account.account.template">
+            <field name="code">7971</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7971"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7972" model="account.account.template">
+            <field name="code">7972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7972_child" model="account.account.template">
+            <field name="code">7972</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7972"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7973" model="account.account.template">
+            <field name="code">7973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_797"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7973_child" model="account.account.template">
+            <field name="code">7973</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7973"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a largo plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_798" model="account.account.template">
+            <field name="code">798</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_79"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones y valores representativos de deuda a corto plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7980" model="account.account.template">
+            <field name="code">7980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7980_child" model="account.account.template">
+            <field name="code">7980</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7980"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7981" model="account.account.template">
+            <field name="code">7981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7981_child" model="account.account.template">
+            <field name="code">7981</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7981"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de participaciones en instrumentos de patrimonio neto a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7985" model="account.account.template">
+            <field name="code">7985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7985_child" model="account.account.template">
+            <field name="code">7985</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7985"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7986" model="account.account.template">
+            <field name="code">7986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7986_child" model="account.account.template">
+            <field name="code">7986</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7986"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7987" model="account.account.template">
+            <field name="code">7987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7987_child" model="account.account.template">
+            <field name="code">7987</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7987"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7988" model="account.account.template">
+            <field name="code">7988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7988_child" model="account.account.template">
+            <field name="code">7988</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7988"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de valores representativos de deuda a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_799" model="account.account.template">
+            <field name="code">799</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7990" model="account.account.template">
+            <field name="code">7990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7990_child" model="account.account.template">
+            <field name="code">7990</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7990"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas del grupo</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7991" model="account.account.template">
+            <field name="code">7991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_798"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7991_child" model="account.account.template">
+            <field name="code">7991</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7991"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, empresas asociadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7992" model="account.account.template">
+            <field name="code">7992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_799"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7992_child" model="account.account.template">
+            <field name="code">7992</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7992"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras partes vinculadas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7993" model="account.account.template">
+            <field name="code">7993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_799"/>
+            <field name="type">view</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+        <record id="pgc_assoc_7993_child" model="account.account.template">
+            <field name="code">7993</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_assoc_7993"/>
+            <field name="type">other</field>
+            <field name="name">Reversión del deterioro de créditos a corto plazo, otras empresas</field>
+            <field name="user_type" ref="ingresos"/>
+        </record>
+
+      <!-- Tax Code Configuration -->
+
+        <record id="vat_code_chart_assoc_root" model="account.tax.code.template">
+            <field name="name">Plantilla Plan de Impuestos ASSOC</field>
+        </record>
+
+      <!-- Chart template -->
+
+        <record id="l10nES_chart_template_assoc" model="account.chart.template">
+            <field name="name">Plantilla PGCE Asociaciones 2008</field>
+            <field name="account_root_id" ref="pgc_assoc_0"/>
+            <field name="tax_code_root_id" ref="vat_code_chart_assoc_root"/>
+            <field name="bank_account_view_id" ref="pgc_assoc_572"/>
+            <field name="property_account_receivable" ref="pgc_assoc_4300_child"/>
+            <field name="property_account_payable" ref="pgc_assoc_4100_child"/>
+            <field name="property_account_expense_categ" ref="pgc_assoc_600_child"/>
+            <field name="property_account_income_categ" ref="pgc_assoc_7000_child"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index ed2e4f18e7c..223d80e3193 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
   
       <!-- 
       Plantilla del árbol de cuentas del Plan General Contable PYMES 2008.
@@ -11,23 +11,23 @@
       como base para los siguientes cambios:
 
       - Se eliminan las cuentas: 
-            (111), (1110), (1111), (1143), (115), (133), (134), (1340), (1341),
+    	    (111), (1110), (1111), (1143), (115), (133), (134), (1340), (1341),
                 (135), (136), (140), (146), (147), (1765), (1768), (178), (189),
-            (204), (2550), (2553), (257),
-            (466),
-            (501), (5091), (5290), (5296), (5297), (553), (5530), (5531),
+    	    (204), (2550), (2553), (257),
+    	    (466),
+    	    (501), (5091), (5290), (5296), (5297), (553), (5530), (5531),
                 (5532), (5533), (5593), (5598), (569), (58), (580), (581),
                 (582), (583), (584), (585), (586), (587), (588), (589),
                 (599), (5990), (5991), (5992), (5993), (5994),
-            (643), (643), (644), (645), (644), (6440), (6442), (645), (6450), 
+    	    (643), (643), (644), (645), (644), (6440), (6442), (645), (6450), 
                 (6457), (6630), (6631), (6632), (6633),
-            (7630), (7631), (7632), (7633), (767), (774), (7950), (7956), (7957);
-            el grupo 8 entero;
-            el grupo 9 entero.
+    	    (7630), (7631), (7632), (7633), (767), (774), (7950), (7956), (7957);
+    	    el grupo 8 entero;
+    	    el grupo 9 entero.
       - Cambian de nombre las cuentas: 
-            (2935), (296), (5935), (596), (7962), (7963)
+    	    (2935), (296), (5935), (596), (7962), (7963)
       - Se crean las cuentas:
-            (5590), (5595), (663), (763)
+    	    (5590), (5595), (663), (763)
 
       Otros cambios:
 
@@ -2357,7 +2357,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_281"/>
             <field name="type">view</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_pymes_2815_child" model="account.account.template">
@@ -2365,7 +2365,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_2815"/>
             <field name="type">other</field>
-            <field name="name">Amortización acumulada de otras instaciones</field>
+            <field name="name">Amortización acumulada de otras instalaciones</field>
             <field name="user_type" ref="inmo"/>
         </record>
         <record id="pgc_pymes_2816" model="account.account.template">
@@ -4410,7 +4410,7 @@
         </record>
         <record id="pgc_pymes_460_child" model="account.account.template">
             <field name="code">460</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
@@ -4426,7 +4426,7 @@
         </record>
         <record id="pgc_pymes_465_child" model="account.account.template">
             <field name="code">465</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
@@ -4456,8 +4456,8 @@
             <field name="name">Hacienda Pública, deudora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_pymes_4700_child" model="account.account.template">
-            <field name="code">4700</field>
+        <record id="pgc_pymes_470000" model="account.account.template">
+            <field name="code">470000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_4700"/>
             <field name="type">receivable</field>
@@ -4520,6 +4520,14 @@
             <field name="name">Hacienda Pública, IVA soportado</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_pymes_472000" model="account.account.template">
+            <field name="code">472000</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_472"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. IVA soportado</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_pymes_473" model="account.account.template">
             <field name="code">473</field>
             <field name="reconcile" eval="False"/>
@@ -4600,8 +4608,8 @@
             <field name="name">Hacienda Pública, acreedora por IVA</field>
             <field name="user_type" ref="tax"/>
         </record>
-        <record id="pgc_pymes_4750_child" model="account.account.template">
-            <field name="code">4750</field>
+        <record id="pgc_pymes_475000" model="account.account.template">
+            <field name="code">475000</field>
             <field name="reconcile" eval="True"/>
             <field name="parent_id" ref="pgc_pymes_4750"/>
             <field name="type">payable</field>
@@ -4680,6 +4688,14 @@
             <field name="name">Hacienda Pública, IVA repercutido</field>
             <field name="user_type" ref="tax"/>
         </record>
+        <record id="pgc_pymes_477000" model="account.account.template">
+            <field name="code">477000</field>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="pgc_pymes_477"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública, IVA repercutido</field>
+            <field name="user_type" ref="tax"/>
+        </record>
         <record id="pgc_pymes_479" model="account.account.template">
             <field name="code">479</field>
             <field name="reconcile" eval="False"/>
@@ -7869,7 +7885,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_66"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo</field>
+            <field name="name">Intereses de deudas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6620" model="account.account.template">
@@ -7877,7 +7893,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6620_child" model="account.account.template">
@@ -7885,7 +7901,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6620"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas del grupo</field>
+            <field name="name">Intereses de deudas, empresas del grupo</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6621" model="account.account.template">
@@ -7893,7 +7909,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6621_child" model="account.account.template">
@@ -7901,7 +7917,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6621"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, empresas asociadas</field>
+            <field name="name">Intereses de deudas, empresas asociadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6622" model="account.account.template">
@@ -7909,7 +7925,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6622_child" model="account.account.template">
@@ -7917,7 +7933,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6622"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras partes vinculadas</field>
+            <field name="name">Intereses de deudas, otras partes vinculadas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6623" model="account.account.template">
@@ -7925,7 +7941,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6623_child" model="account.account.template">
@@ -7933,7 +7949,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6623"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo con entidades de crédito</field>
+            <field name="name">Intereses de deudas con entidades de crédito</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6624" model="account.account.template">
@@ -7941,7 +7957,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_662"/>
             <field name="type">view</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_6624_child" model="account.account.template">
@@ -7949,7 +7965,7 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="pgc_pymes_6624"/>
             <field name="type">other</field>
-            <field name="name">Ingresos de créditos a largo plazo, otras empresas</field>
+            <field name="name">Intereses de deudas, otras empresas</field>
             <field name="user_type" ref="gastos"/>
         </record>
         <record id="pgc_pymes_663" model="account.account.template">
diff --git a/addons/l10n_es/fiscal_templates.xml b/addons/l10n_es/fiscal_templates.xml
index 5c6d056d2f6..d603e7181b4 100644
--- a/addons/l10n_es/fiscal_templates.xml
+++ b/addons/l10n_es/fiscal_templates.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
     <!-- Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
-         Extracomunitario, Intracomunitario y Retención de IRPF 18%, 15%, 7%, 1%
+         Extracomunitario, Intracomunitario y Retención de IRPFs
 
          Añadidas posiciones fiscales Retención de IRPF 18%, 15%, 7%, 1% :
            Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2009-11-21
 
          Añadidas posiciones fiscales Retención de IRPF 19%, 2% :
-           Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18 -->
+           Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18
+
+        Añadido mapeo de cuentas del regimen de equivalencia para compras :
+           Ignacio Ibeas (Acysos) - ignacio@acysos.com 2011-02-22 -->
+
+        <!-- Fiscal Position Templates -->
 
-    <!-- Fiscal Position Templates -->
         <record id="fp_nacional" model="account.fiscal.position.template">
             <field name="name">Régimen Nacional</field>
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -32,6 +36,16 @@
             <field name="chart_template_id" ref="l10nES_chart_template"/>
         </record>
 
+        <record id="fp_irpf21" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 21%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+        </record>
+
+        <record id="fp_irpf20" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 20%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+        </record>
+
         <record id="fp_irpf19" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 19%</field>
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -47,6 +61,11 @@
             <field name="chart_template_id" ref="l10nES_chart_template"/>
         </record>
 
+        <record id="fp_irpf9" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 9%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+        </record>
+
         <record id="fp_irpf7" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 7%</field>
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -68,6 +87,54 @@
 
     <!-- Extracomunitarios fiscal.position.tax.template-->
 
+        <record id="fptt_extra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="iva_X4_compras_bc" />
+        </record>
+
+        <record id="fptt_extra_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_X4_compras_bi" />
+        </record>
+
+        <record id="fptt_extra_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="iva_X7_compras_bc" />
+        </record>
+
+        <record id="fptt_extra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_X7_compras_bi" />
+        </record>
+
+        <record id="fptt_extra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_X8_compras_bc" />
+        </record>
+
+        <record id="fptt_extra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_X8_compras_bi" />
+        </record>
+
+        <record id="fptt_extra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_X10_compras_bc" />
+        </record>
+
+        <record id="fptt_extra_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_X10_compras_bi" />
+        </record>
+
         <record id="fptt_extra_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -78,7 +145,7 @@
             <field name="tax_src_id" ref="iva_sop_16_inv" />
             <field name="tax_dest_id" ref="iva_X16_compras_bi" />
         </record>
-    
+
         <record id="fptt_extra_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -90,35 +157,15 @@
             <field name="tax_dest_id" ref="iva_X18_compras_bi" />
         </record>
 
-        <record id="fptt_extra_7" model="account.fiscal.position.tax.template">
+        <record id="fptt_extra_21" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_7" />
-            <field name="tax_dest_id" ref="iva_X7_compras_bc" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_X21_compras_bc" />
         </record>
-        <record id="fptt_extra_7_inv" model="account.fiscal.position.tax.template">
+        <record id="fptt_extra_21_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_7_inv" />
-            <field name="tax_dest_id" ref="iva_X7_compras_bi" />
-        </record>
-        <record id="fptt_extra_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_X8_compras_bc" />
-        </record>
-        <record id="fptt_extra_8_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_8_inv" />
-            <field name="tax_dest_id" ref="iva_X8_compras_bi" />
-        </record>
-        <record id="fptt_extra_4" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_4" />
-            <field name="tax_dest_id" ref="iva_X4_compras_bc" />
-        </record>
-        <record id="fptt_extra_4_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_extra" />
-            <field name="tax_src_id" ref="iva_sop_4_inv" />
-            <field name="tax_dest_id" ref="iva_X4_compras_bi" />
+            <field name="tax_src_id" ref="iva_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_X21_compras_bi" />
         </record>
 
         <record id="fptt_extra_ventas_4" model="account.fiscal.position.tax.template">
@@ -138,6 +185,12 @@
             <field name="tax_dest_id" ref="iva_X0" />
         </record>
 
+        <record id="fptt_extra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_X0" />
+        </record>
+
         <record id="fptt_extra_ventas_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_extra" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -148,29 +201,24 @@
             <field name="tax_src_id" ref="iva_rep_18" />
             <field name="tax_dest_id" ref="iva_X0" />
         </record>
+        <record id="fptt_extra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_extra" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_X0" />
+        </record>
 
     <!-- Intracomunitarios fiscal.position.tax.template-->
 
-        <record id="fptt_intra_16" model="account.fiscal.position.tax.template">
+        <record id="fptt_intra_4" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="iva_IC_compras_16_bc" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="iva_IC_compras_4_bc" />
         </record>
-        <record id="fptt_intra_16_inv" model="account.fiscal.position.tax.template">
+
+        <record id="fptt_intra_4_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_16_inv" />
-            <field name="tax_dest_id" ref="iva_IC_compras_16_bi" />
-        </record>
-    
-        <record id="fptt_intra_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_18" />
-            <field name="tax_dest_id" ref="iva_IC_compras_18_bc" />
-        </record>
-        <record id="fptt_intra_18_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_18_inv" />
-            <field name="tax_dest_id" ref="iva_IC_compras_18_bi" />
+            <field name="tax_src_id" ref="iva_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_IC_compras_4_bi" />
         </record>
 
         <record id="fptt_intra_7" model="account.fiscal.position.tax.template">
@@ -178,30 +226,71 @@
             <field name="tax_src_id" ref="iva_sop_7" />
             <field name="tax_dest_id" ref="iva_IC_compras_7_bc" />
         </record>
+
         <record id="fptt_intra_7_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_sop_7_inv" />
             <field name="tax_dest_id" ref="iva_IC_compras_7_bi" />
         </record>
+
         <record id="fptt_intra_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_sop_8" />
             <field name="tax_dest_id" ref="iva_IC_compras_8_bc" />
         </record>
+
         <record id="fptt_intra_8_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_sop_8_inv" />
             <field name="tax_dest_id" ref="iva_IC_compras_8_bi" />
         </record>
-        <record id="fptt_intra_4" model="account.fiscal.position.tax.template">
+
+        <record id="fptt_intra_10" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_4" />
-            <field name="tax_dest_id" ref="iva_IC_compras_4_bc" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_IC_compras_10_bc" />
         </record>
-        <record id="fptt_intra_4_inv" model="account.fiscal.position.tax.template">
+
+        <record id="fptt_intra_10_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
-            <field name="tax_src_id" ref="iva_sop_4_inv" />
-            <field name="tax_dest_id" ref="iva_IC_compras_4_bi" />
+            <field name="tax_src_id" ref="iva_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_IC_compras_10_bi" />
+        </record>
+
+        <record id="fptt_intra_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_IC_compras_16_bc" />
+        </record>
+
+        <record id="fptt_intra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_IC_compras_16_bi" />
+        </record>
+
+        <record id="fptt_intra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_IC_compras_18_bc" />
+        </record>
+
+        <record id="fptt_intra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_IC_compras_18_bi" />
+        </record>
+
+        <record id="fptt_intra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_IC_compras_21_bc" />
+        </record>
+
+        <record id="fptt_intra_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_IC_compras_21_bi" />
         </record>
 
         <record id="fptt_intra_ventas_4" model="account.fiscal.position.tax.template">
@@ -215,27 +304,87 @@
             <field name="tax_src_id" ref="iva_rep_7" />
             <field name="tax_dest_id" ref="iva_IO" />
         </record>
-    
+
         <record id="fptt_intra_ventas_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_rep_8" />
             <field name="tax_dest_id" ref="iva_IO" />
         </record>
 
+        <record id="fptt_intra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_IO" />
+        </record>
+
         <record id="fptt_intra_ventas_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_rep_16" />
             <field name="tax_dest_id" ref="iva_IO" />
         </record>
-    
+
         <record id="fptt_intra_ventas_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_intra" />
             <field name="tax_src_id" ref="iva_rep_18" />
             <field name="tax_dest_id" ref="iva_IO" />
         </record>
 
+        <record id="fptt_intra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_intra" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_IO" />
+        </record>
+
     <!-- Recargo de equivalencia fiscal.position.tax.template-->
 
+        <record id="fptt_recargo_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="iva_rep_4" />
+        </record>
+
+        <record id="fptt_recargo_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="re_05" />
+        </record>
+
+        <record id="fptt_recargo_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <field name="tax_dest_id" ref="iva_rep_7" />
+        </record>
+
+        <record id="fptt_recargo_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <field name="tax_dest_id" ref="re_1" />
+        </record>
+
+        <record id="fptt_recargo_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_recargo_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="re_1" />
+        </record>
+
+        <record id="fptt_recargo_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_recargo_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="re_14" />
+        </record>
+
         <record id="fptt_recargo_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_recargo" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -260,42 +409,188 @@
             <field name="tax_dest_id" ref="re_4" />
         </record>
 
-        <record id="fptt_recargo_7" model="account.fiscal.position.tax.template">
+        <record id="fptt_recargo_21" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_7" />
-            <field name="tax_dest_id" ref="iva_rep_7" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
         </record>
 
-        <record id="fptt_recargo_7_2" model="account.fiscal.position.tax.template">
+        <record id="fptt_recargo_21_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_7" />
-            <field name="tax_dest_id" ref="re_1" />
-        </record>
-    
-        <record id="fptt_recargo_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="re_52" />
         </record>
 
-        <record id="fptt_recargo_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="re_1" />
+        <record id="fptt_recargo_buy_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="iva_sop_4" />
         </record>
 
-        <record id="fptt_recargo_4" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_4" />
-            <field name="tax_dest_id" ref="iva_rep_4" />
+        <record id="fptt_recargo_buy_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="re_buy_05" />
         </record>
 
-        <record id="fptt_recargo_4_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_recargo" />
-            <field name="tax_src_id" ref="iva_rep_4" />
-            <field name="tax_dest_id" ref="re_05" />
+        <record id="fptt_recargo_buy_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="iva_sop_7" />
         </record>
 
+        <record id="fptt_recargo_buy_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </record>
+
+        <record id="fptt_recargo_buy_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_recargo_buy_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </record>
+
+        <record id="fptt_recargo_buy_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_recargo_buy_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="re_buy_14" />
+        </record>
+
+         <record id="fptt_recargo_buy_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_sop_4_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_4_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_4_inv" />
+            <field name="tax_dest_id" ref="re_buy_05" />
+        </record>
+
+        <record id="fptt_recargo_buy_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_sop_7_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_7_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_7_inv" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </record>
+
+        <record id="fptt_recargo_buy_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_sop_8_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_8_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_8_inv" />
+            <field name="tax_dest_id" ref="re_buy_1" />
+        </record>
+
+        <record id="fptt_recargo_buy_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_sop_10_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_10_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_10_inv" />
+            <field name="tax_dest_id" ref="re_buy_14" />
+        </record>
+
+
+        <record id="fptt_recargo_buy_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_recargo_buy_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </record>
+
+        <record id="fptt_recargo_buy_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_recargo_buy_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </record>
+
+        <record id="fptt_recargo_buy_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_recargo_buy_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="re_buy_52" />
+        </record>
+
+        <record id="fptt_recargo_buy_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_sop_16_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_16_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_16_inv" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </record>
+
+        <record id="fptt_recargo_buy_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_sop_18_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_18_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_18_inv" />
+            <field name="tax_dest_id" ref="re_buy_4" />
+        </record>
+
+        <record id="fptt_recargo_buy_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_sop_21_inv" />
+        </record>
+
+        <record id="fptt_recargo_buy_21_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_recargo"  />
+            <field name="tax_src_id" ref="iva_sop_21_inv" />
+            <field name="tax_dest_id" ref="re_buy_52" />
+        </record>
+
+
     <!-- Extracomunitarios fiscal.position.account.template-->
 
         <record id="fpat_extra_acc_1" model="account.fiscal.position.account.template">
@@ -372,7 +667,310 @@
             <field name="account_dest_id" ref="pgc_7051" />
         </record>
 
-    <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
+        <!-- Retenciones IRPF 20% fiscal.position.tax.template-->
+        <record id="fptt_irpf20sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf20sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+        <record id="fptt_irpf20sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="iva_rep_18" />
+        </record>
+
+        <record id="fptt_irpf20sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+        <record id="fptt_irpf20sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <field name="tax_dest_id" ref="iva_rep_16" />
+        </record>
+
+        <record id="fptt_irpf20sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+         <record id="fptt_irpf20sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf20sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+        <record id="fptt_irpf20sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf20sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+        <record id="fptt_irpf20sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <field name="tax_dest_id" ref="iva_rep_7" />
+        </record>
+
+        <record id="fptt_irpf20sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_7" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+        <record id="fptt_irpf20sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="iva_rep_4" />
+        </record>
+
+        <record id="fptt_irpf20sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record>
+
+        <record id="fptt_irpf20_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf20_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_irpf20_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_irpf20_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf20_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf20_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="iva_sop_7" />
+        </record>
+
+        <record id="fptt_irpf20_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_7" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <record id="fptt_irpf20_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="iva_sop_4" />
+        </record>
+
+        <record id="fptt_irpf20_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+
+        <!-- Retenciones IRPF 21% fiscal.position.tax.template-->
+
+        <record id="fptt_irpf21sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf21sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_21" />
+        </record>
+
+        <record id="fptt_irpf21sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="iva_rep_18" />
+        </record>
+
+        <record id="fptt_irpf21sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="irpf_sale_21" />
+        </record>
+
+        <record id="fptt_irpf21sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf21sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_21" />
+        </record>
+
+        <record id="fptt_irpf21sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf21sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_21" />
+        </record>
+
+        <record id="fptt_irpf21sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="iva_rep_4" />
+        </record>
+
+        <record id="fptt_irpf21sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="irpf_sale_21" />
+        </record>
+
+        <record id="fptt_irpf21_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf21_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_21" />
+        </record>
+
+        <record id="fptt_irpf21_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_irpf21_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="irpf_21" />
+        </record>
+
+         <record id="fptt_irpf21_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf21_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_21" />
+        </record>
+
+        <record id="fptt_irpf21_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf21_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_21" />
+        </record>
+
+        <record id="fptt_irpf21_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="iva_sop_4" />
+        </record>
+
+        <record id="fptt_irpf21_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="irpf_21" />
+        </record>
+
+        <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
+
+        <record id="fptt_irpf19sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf19sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>
+
 
         <record id="fptt_irpf19sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
@@ -386,18 +984,6 @@
             <field name="tax_dest_id" ref="irpf_sale_19" />
         </record>
 
-        <record id="fptt_irpf19sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf19sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_19" />
-        </record>
-
         <record id="fptt_irpf19sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -410,6 +996,30 @@
             <field name="tax_dest_id" ref="irpf_sale_19" />
         </record>
 
+        <record id="fptt_irpf19sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf19sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>
+
+        <record id="fptt_irpf19sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf19sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>
+
         <record id="fptt_irpf19sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -434,6 +1044,18 @@
             <field name="tax_dest_id" ref="irpf_sale_19" />
         </record>
 
+        <record id="fptt_irpf19_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf19_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+
         <record id="fptt_irpf19_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -446,18 +1068,6 @@
             <field name="tax_dest_id" ref="irpf_19" />
         </record>
 
-        <record id="fptt_irpf19_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf19_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf19" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_19" />
-        </record>
-
         <record id="fptt_irpf19_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -470,6 +1080,30 @@
             <field name="tax_dest_id" ref="irpf_19" />
         </record>
 
+         <record id="fptt_irpf19_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf19_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+
+        <record id="fptt_irpf19_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf19_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+
         <record id="fptt_irpf19_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf19" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -495,6 +1129,18 @@
         </record>
 
     <!-- Retenciones IRPF 18% fiscal.position.tax.template-->
+        <record id="fptt_irpf18sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf18sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>
+
 
         <record id="fptt_irpf18sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
@@ -508,6 +1154,30 @@
             <field name="tax_dest_id" ref="irpf_sale_18" />
         </record>
 
+         <record id="fptt_irpf18sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <field name="tax_dest_id" ref="iva_rep_16" />
+        </record>
+
+        <record id="fptt_irpf18sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_16" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>
+
+        <record id="fptt_irpf18sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf18sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>
+
         <record id="fptt_irpf18sale_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_rep_8" />
@@ -520,18 +1190,6 @@
             <field name="tax_dest_id" ref="irpf_sale_18" />
         </record>
 
-        <record id="fptt_irpf18sale_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_rep_16" />
-            <field name="tax_dest_id" ref="iva_rep_16" />
-        </record>
-
-        <record id="fptt_irpf18sale_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_rep_16" />
-            <field name="tax_dest_id" ref="irpf_sale_18" />
-        </record>
-
         <record id="fptt_irpf18sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -556,6 +1214,18 @@
             <field name="tax_dest_id" ref="irpf_sale_18" />
         </record>
 
+        <record id="fptt_irpf18_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf18_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+
         <record id="fptt_irpf18_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -568,6 +1238,30 @@
             <field name="tax_dest_id" ref="irpf_18" />
         </record>
 
+         <record id="fptt_irpf18_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_irpf18_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+
+        <record id="fptt_irpf18_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf18_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+
         <record id="fptt_irpf18_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_sop_8" />
@@ -580,18 +1274,6 @@
             <field name="tax_dest_id" ref="irpf_18" />
         </record>
 
-        <record id="fptt_irpf18_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="iva_sop_16" />
-        </record>
-
-        <record id="fptt_irpf18_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf18" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="irpf_18" />
-        </record>
-
         <record id="fptt_irpf18_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf18" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -616,7 +1298,19 @@
             <field name="tax_dest_id" ref="irpf_18" />
         </record>
 
-    <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
+        <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
+
+        <record id="fptt_irpf15sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf15sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_15" />
+        </record>
 
         <record id="fptt_irpf15sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
@@ -630,18 +1324,6 @@
             <field name="tax_dest_id" ref="irpf_sale_15" />
         </record>
 
-        <record id="fptt_irpf15sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf15sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_15" />
-        </record>
-
         <record id="fptt_irpf15sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -654,6 +1336,30 @@
             <field name="tax_dest_id" ref="irpf_sale_15" />
         </record>
 
+        <record id="fptt_irpf15sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf15sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_15" />
+        </record>
+
+        <record id="fptt_irpf15sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf15sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_15" />
+        </record>
+
         <record id="fptt_irpf15sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -678,6 +1384,18 @@
             <field name="tax_dest_id" ref="irpf_sale_15" />
         </record>
 
+        <record id="fptt_irpf15_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf15_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_15" />
+        </record>
+
         <record id="fptt_irpf15_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -690,18 +1408,6 @@
             <field name="tax_dest_id" ref="irpf_15" />
         </record>
 
-        <record id="fptt_irpf15_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf15_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf15" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_15" />
-        </record>
-
         <record id="fptt_irpf15_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -714,6 +1420,30 @@
             <field name="tax_dest_id" ref="irpf_15" />
         </record>
 
+         <record id="fptt_irpf15_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf15_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_15" />
+        </record>
+
+        <record id="fptt_irpf15_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf15_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_15" />
+        </record>
+
         <record id="fptt_irpf15_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf15" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -738,7 +1468,142 @@
             <field name="tax_dest_id" ref="irpf_15" />
         </record>
 
-    <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
+        <!-- Retenciones IRPF 9% fiscal.position.tax.template-->
+
+        <record id="fptt_irpf9sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf9sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_9" />
+        </record>
+
+        <record id="fptt_irpf9sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="iva_rep_18" />
+        </record>
+
+        <record id="fptt_irpf9sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_18" />
+            <field name="tax_dest_id" ref="irpf_sale_9" />
+        </record>
+
+        <record id="fptt_irpf9sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf9sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_9" />
+        </record>
+
+        <record id="fptt_irpf9sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf9sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_9" />
+        </record>
+
+        <record id="fptt_irpf9sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="iva_rep_4" />
+        </record>
+
+        <record id="fptt_irpf9sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_4" />
+            <field name="tax_dest_id" ref="irpf_sale_9" />
+        </record>
+
+        <record id="fptt_irpf9_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf9_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_9" />
+        </record>
+
+        <record id="fptt_irpf9_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="iva_sop_18" />
+        </record>
+
+        <record id="fptt_irpf9_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_18" />
+            <field name="tax_dest_id" ref="irpf_9" />
+        </record>
+
+        <record id="fptt_irpf9_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf9_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_9" />
+        </record>
+
+        <record id="fptt_irpf9_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf9_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_9" />
+        </record>
+
+        <record id="fptt_irpf9_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="iva_sop_4" />
+        </record>
+
+        <record id="fptt_irpf9_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_4" />
+            <field name="tax_dest_id" ref="irpf_9" />
+        </record>
+
+        <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
+
+        <record id="fptt_irpf7sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf7sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_7" />
+        </record>
+
 
         <record id="fptt_irpf7sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
@@ -752,18 +1617,6 @@
             <field name="tax_dest_id" ref="irpf_sale_7" />
         </record>
 
-        <record id="fptt_irpf7sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf7sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_7" />
-        </record>
-
         <record id="fptt_irpf7sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -776,6 +1629,30 @@
             <field name="tax_dest_id" ref="irpf_sale_7" />
         </record>
 
+        <record id="fptt_irpf7sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf7sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_7" />
+        </record>
+
+        <record id="fptt_irpf7sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf7sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_7" />
+        </record>
+
         <record id="fptt_irpf7sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -800,6 +1677,18 @@
             <field name="tax_dest_id" ref="irpf_sale_7" />
         </record>
 
+        <record id="fptt_irpf7_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf7_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_7" />
+        </record>
+
         <record id="fptt_irpf7_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -812,6 +1701,30 @@
             <field name="tax_dest_id" ref="irpf_7" />
         </record>
 
+         <record id="fptt_irpf7_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="iva_sop_16" />
+        </record>
+
+        <record id="fptt_irpf7_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_16" />
+            <field name="tax_dest_id" ref="irpf_7" />
+        </record>
+
+        <record id="fptt_irpf7_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf7_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_7" />
+        </record>
+
         <record id="fptt_irpf7_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_sop_8" />
@@ -824,18 +1737,6 @@
             <field name="tax_dest_id" ref="irpf_7" />
         </record>
 
-        <record id="fptt_irpf7_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="iva_sop_16" />
-        </record>
-
-        <record id="fptt_irpf7_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf7" />
-            <field name="tax_src_id" ref="iva_sop_16" />
-            <field name="tax_dest_id" ref="irpf_7" />
-        </record>
-
         <record id="fptt_irpf7_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf7" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -862,6 +1763,18 @@
 
     <!-- Retenciones IRPF 2% fiscal.position.tax.template-->
 
+        <record id="fptt_irpf2sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf2sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_2" />
+        </record>
+
         <record id="fptt_irpf2sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_rep_18" />
@@ -874,18 +1787,6 @@
             <field name="tax_dest_id" ref="irpf_sale_2" />
         </record>
 
-        <record id="fptt_irpf2sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf2sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_2" />
-        </record>
-
         <record id="fptt_irpf2sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -898,6 +1799,30 @@
             <field name="tax_dest_id" ref="irpf_sale_2" />
         </record>
 
+        <record id="fptt_irpf2sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf2sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_2" />
+        </record>
+
+        <record id="fptt_irpf2sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf2sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_2" />
+        </record>
+
         <record id="fptt_irpf2sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -922,6 +1847,18 @@
             <field name="tax_dest_id" ref="irpf_sale_2" />
         </record>
 
+        <record id="fptt_irpf2_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf2_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_2" />
+        </record>
+
         <record id="fptt_irpf2_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -934,18 +1871,6 @@
             <field name="tax_dest_id" ref="irpf_2" />
         </record>
 
-        <record id="fptt_irpf2_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf2_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf2" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_2" />
-        </record>
-
         <record id="fptt_irpf2_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -958,6 +1883,30 @@
             <field name="tax_dest_id" ref="irpf_2" />
         </record>
 
+        <record id="fptt_irpf2_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf2_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_2" />
+        </record>
+
+        <record id="fptt_irpf2_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf2_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_2" />
+        </record>
+
         <record id="fptt_irpf2_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf2" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -984,6 +1933,19 @@
 
     <!-- Retenciones IRPF 1% fiscal.position.tax.template-->
 
+        <record id="fptt_irpf1sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="iva_rep_21" />
+        </record>
+
+        <record id="fptt_irpf1sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_21" />
+            <field name="tax_dest_id" ref="irpf_sale_1" />
+        </record>
+
+
         <record id="fptt_irpf1sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_rep_18" />
@@ -996,18 +1958,6 @@
             <field name="tax_dest_id" ref="irpf_sale_1" />
         </record>
 
-        <record id="fptt_irpf1sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="iva_rep_8" />
-        </record>
-
-        <record id="fptt_irpf1sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_rep_8" />
-            <field name="tax_dest_id" ref="irpf_sale_1" />
-        </record>
-
         <record id="fptt_irpf1sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_rep_16" />
@@ -1020,6 +1970,30 @@
             <field name="tax_dest_id" ref="irpf_sale_1" />
         </record>
 
+        <record id="fptt_irpf1sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="iva_rep_10" />
+        </record>
+
+        <record id="fptt_irpf1sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_10" />
+            <field name="tax_dest_id" ref="irpf_sale_1" />
+        </record>
+
+        <record id="fptt_irpf1sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="iva_rep_8" />
+        </record>
+
+        <record id="fptt_irpf1sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_8" />
+            <field name="tax_dest_id" ref="irpf_sale_1" />
+        </record>
+
         <record id="fptt_irpf1sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_rep_7" />
@@ -1044,6 +2018,18 @@
             <field name="tax_dest_id" ref="irpf_sale_1" />
         </record>
 
+        <record id="fptt_irpf1_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="iva_sop_21" />
+        </record>
+
+        <record id="fptt_irpf1_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_21" />
+            <field name="tax_dest_id" ref="irpf_1" />
+        </record>
+
         <record id="fptt_irpf1_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_sop_18" />
@@ -1056,18 +2042,6 @@
             <field name="tax_dest_id" ref="irpf_1" />
         </record>
 
-        <record id="fptt_irpf1_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="iva_sop_8" />
-        </record>
-
-        <record id="fptt_irpf1_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_irpf1" />
-            <field name="tax_src_id" ref="iva_sop_8" />
-            <field name="tax_dest_id" ref="irpf_1" />
-        </record>
-
         <record id="fptt_irpf1_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_sop_16" />
@@ -1080,6 +2054,30 @@
             <field name="tax_dest_id" ref="irpf_1" />
         </record>
 
+        <record id="fptt_irpf1_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="iva_sop_10" />
+        </record>
+
+        <record id="fptt_irpf1_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_10" />
+            <field name="tax_dest_id" ref="irpf_1" />
+        </record>
+
+        <record id="fptt_irpf1_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="iva_sop_8" />
+        </record>
+
+        <record id="fptt_irpf1_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_8" />
+            <field name="tax_dest_id" ref="irpf_1" />
+        </record>
+
         <record id="fptt_irpf1_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_irpf1" />
             <field name="tax_src_id" ref="iva_sop_7" />
@@ -1104,5 +2102,222 @@
             <field name="tax_dest_id" ref="irpf_1" />
         </record>
 
+        <record id="fptt_irpf21sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf21sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_21" />
+        </record>
+
+        <record id="fptt_irpf20sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf20sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_20" />
+        </record> 
+
+        <record id="fptt_irpf19sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf19sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_19" />
+        </record>        
+
+        <record id="fptt_irpf18sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf18sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18"/>
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_18" />
+        </record>        
+
+        <record id="fptt_irpf15sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf15sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_15" />
+        </record>        
+
+        <record id="fptt_irpf9sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />            
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf9sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_9" />
+        </record>
+
+        <record id="fptt_irpf7sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />            
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf7sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_7" />
+        </record>
+
+        <record id="fptt_irpf2sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />            
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf2sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_2" />
+        </record>
+
+        <record id="fptt_irpf1sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="iva_rep_ex" />
+        </record>
+
+        <record id="fptt_irpf1sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_sale_1" />
+        </record>
+
+        <!-- IVA SOPORTADO -->
+
+        <record id="fptt_irpf21_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf21_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf21"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_21" />
+        </record>
+        
+        <record id="fptt_irpf20_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf20_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf20"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_20" />
+        </record>
+        
+        <record id="fptt_irpf19_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf19_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf19"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_19" />
+        </record>
+        
+        <record id="fptt_irpf18_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf18_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf18" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_18" />
+        </record>
+        
+        <record id="fptt_irpf15_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf15_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf15"/>
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_15" />
+        </record>
+        
+        <record id="fptt_irpf9_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf9_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf9" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_9" />
+        </record>        
+
+        <record id="fptt_irpf7_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf7_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf7" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_7" />
+        </record>        
+
+        <record id="fptt_irpf2_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf2_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf2" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_2" />
+        </record>
+        
+        <record id="fptt_irpf1_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="iva_sop_ex" />
+        </record>
+
+        <record id="fptt_irpf1_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_irpf1" />
+            <field name="tax_src_id" ref="iva_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_1" />
+        </record>
     </data>
 </openerp>
diff --git a/addons/l10n_es/fiscal_templates_assoc.xml b/addons/l10n_es/fiscal_templates_assoc.xml
new file mode 100644
index 00000000000..42c7ab464ee
--- /dev/null
+++ b/addons/l10n_es/fiscal_templates_assoc.xml
@@ -0,0 +1,2047 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+      <!--
+      Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
+      Extracomunitario, Intracomunitario y Retención de IRPF 18%, 15%, 7%, 1%
+
+      Basado en fiscal_templates.xml, con los siguientes cambios:
+
+      - Se sustituyen los códigos:
+            vat_code_chart_root => vat_code_chart_assoc_root
+            l10nES_chart_template => l10nES_chart_template_assoc
+            pgc_* => pgc_assoc_*
+            iva_* => iva_assoc_*
+            re_* => re_assoc_*
+            irpf_* => irpf_assoc__*
+            fp_* => fp_assoc_*
+            fptt_* => fptt_assoc_*
+            fpat_* => fpat_assoc_*
+            irpf_sale => irpf_assoc_sale_*
+
+      Borja López Soilán (Pexego) - borjals@pexego.es (2009-09-09)
+
+        Corrección: El mapeo de cuentas de las posiciones fiscales Régimen Extracomunitario y Intracomunitario
+        no se diferenciaban entre el plan general y el plan pyme (fpat_* => fpat_assoc_*)
+
+        Añadidas posiciones fiscales Retención de IRPF 18%, 15%, 7%, 1% :
+
+       Corrección: Las nuevas posiciones fiscales de retención IRPF tenían
+        referencias incorrectas:
+            iva_* => iva_assoc_*
+            irpf_* => irpf_assoc_*
+
+        -->
+    <!-- Fiscal Position Templates -->
+        <record id="fp_assoc_nacional" model="account.fiscal.position.template">
+            <field name="name">Régimen Nacional</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_recargo" model="account.fiscal.position.template">
+            <field name="name">Recargo de Equivalencia</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_extra" model="account.fiscal.position.template">
+            <field name="name">Régimen Extracomunitario</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_intra" model="account.fiscal.position.template">
+            <field name="name">Régimen Intracomunitario</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf21" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 21%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf20" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 20%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf19" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 19%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf18" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 18%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf15" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 15%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf9" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 9%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf7" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 7%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf2" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 2%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+        <record id="fp_assoc_irpf1" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 1%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+        </record>
+
+
+    <!-- Fiscal Position Tax Templates -->
+    <!-- ************************************************************* -->
+
+    <!-- Extracomunitarios fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_extra_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_X16_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X16_compras_bi" />
+        </record>
+        <record id="fptt_assoc_extra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_X18_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X18_compras_bi" />
+        </record>
+
+        <record id="fptt_assoc_extra_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_X7_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X7_compras_bi" />
+        </record>
+        <record id="fptt_assoc_extra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_X8_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X8_compras_bi" />
+        </record>
+
+        <record id="fptt_assoc_extra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_X10_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X10_compras_bi" />
+        </record>
+
+         <record id="fptt_assoc_extra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_X21_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X21_compras_bi" />
+        </record>
+        <record id="fptt_assoc_extra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_X4_compras_bc" />
+        </record>
+        <record id="fptt_assoc_extra_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_X4_compras_bi" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+        <record id="fptt_assoc_extra_ventas_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+        <record id="fptt_assoc_extra_ventas_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+        <record id="fptt_assoc_extra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+<record id="fptt_assoc_extra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_X0" />
+        </record>
+
+    <!-- Intracomunitarios fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_intra_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_16_bc" />
+        </record>
+        <record id="fptt_assoc_intra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_16_bi" />
+        </record>
+        <record id="fptt_assoc_intra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_18_bc" />
+        </record>
+        <record id="fptt_assoc_intra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_18_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_7_bc" />
+        </record>
+        <record id="fptt_assoc_intra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_7_bi" />
+        </record>
+        <record id="fptt_assoc_intra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_8_bc" />
+        </record>
+        <record id="fptt_assoc_intra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_8_bi" />
+        </record>
+        <record id="fptt_assoc_intra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_4_bc" />
+        </record>
+        <record id="fptt_assoc_intra_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_4_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+        <record id="fptt_assoc_intra_ventas_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+         <record id="fptt_assoc_intra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_10_bc" />
+        </record>
+
+        <record id="fptt_assoc_intra_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_10_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_21_bc" />
+        </record>
+        <record id="fptt_assoc_intra_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_assoc_IC_compras_21_bi" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+
+        <record id="fptt_assoc_intra_ventas_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+        <record id="fptt_assoc_intra_ventas_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+        <record id="fptt_assoc_intra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_IO" />
+        </record>
+
+    <!-- Recargo de equivalencia fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_recargo_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_recargo_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="re_assoc_4" />
+        </record>
+
+        <record id="fptt_assoc_recargo_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_recargo_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="re_assoc_4" />
+        </record>
+
+        <record id="fptt_assoc_recargo_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_recargo_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="re_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_recargo_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_recargo_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="re_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_recargo_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_recargo_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="re_assoc_14" />
+        </record>
+
+        <record id="fptt_assoc_recargo_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_recargo_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="re_assoc_05" />
+        </record>
+
+        <record id="fptt_assoc_recargo_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_recargo_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_recargo"  />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="re_assoc_52" />
+        </record>
+
+    <!-- Extracomunitarios fiscal.position.account.template-->
+
+        <record id="fpat_assoc_extra_acc_1" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7000" />
+            <field name="account_dest_id" ref="pgc_assoc_7002" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_2" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7010" />
+            <field name="account_dest_id" ref="pgc_assoc_7012" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_3" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7020" />
+            <field name="account_dest_id" ref="pgc_assoc_7022" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_4" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7030" />
+            <field name="account_dest_id" ref="pgc_assoc_7032" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_5" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7040" />
+            <field name="account_dest_id" ref="pgc_assoc_7042" />
+        </record>
+
+        <record id="fpat_assoc_extra_acc_6" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_extra"  />
+            <field name="account_src_id" ref="pgc_assoc_7050" />
+            <field name="account_dest_id" ref="pgc_assoc_7052" />
+        </record>
+
+    <!-- Intracomunitarios fiscal.position.account.template-->
+
+        <record id="fpat_assoc_intra_acc_1" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7000" />
+            <field name="account_dest_id" ref="pgc_assoc_7001" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_2" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7010" />
+            <field name="account_dest_id" ref="pgc_assoc_7011" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_3" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7020" />
+            <field name="account_dest_id" ref="pgc_assoc_7021" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_4" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7030" />
+            <field name="account_dest_id" ref="pgc_assoc_7031" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_5" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7040" />
+            <field name="account_dest_id" ref="pgc_assoc_7041" />
+        </record>
+
+        <record id="fpat_assoc_intra_acc_6" model="account.fiscal.position.account.template">
+            <field name="position_id" ref="fp_assoc_intra"  />
+            <field name="account_src_id" ref="pgc_assoc_7050" />
+            <field name="account_dest_id" ref="pgc_assoc_7051" />
+        </record>
+
+<!-- Retenciones IRPF 21% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf21sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf21_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_21" />
+        </record>
+
+        <!-- Retenciones IRPF 20% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf20sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+         <record id="fptt_assoc_irpf20sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf20_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_20" />
+        </record>
+
+
+        <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf19sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+         <record id="fptt_assoc_irpf19sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+         <record id="fptt_assoc_irpf19_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf19_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_19" />
+        </record>
+
+    <!-- Retenciones IRPF 18% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf18sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>
+
+         <record id="fptt_assoc_irpf18_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_8_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf18_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_18" />
+        </record>
+
+    <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf15sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf15_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_15" />
+        </record>
+
+    <!-- Retenciones IRPF 9% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf9sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+         <record id="fptt_assoc_irpf9_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf9_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_9" />
+        </record>
+
+    <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf7sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+         <record id="fptt_assoc_irpf7_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+
+        <record id="fptt_assoc_irpf7_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf7_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_7" />
+        </record>
+
+    <!-- Retenciones IRPF 2% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf2sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf2_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_2" />
+        </record>
+
+    <!-- Retenciones IRPF 1% fiscal.position.tax.template-->
+
+        <record id="fptt_assoc_irpf1sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_21" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_18" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_18" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+         <record id="fptt_assoc_irpf1_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_16" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_16" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_10" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_10" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_8" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_8" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_7" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="iva_assoc_sop_4" />
+        </record>
+
+        <record id="fptt_assoc_irpf1_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_sop_4" />
+            <field name="tax_dest_id" ref="irpf_assoc_1" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf21sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf21" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_21" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf20sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf20" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_20" />
+        </record> 
+
+        <record id="fptt_assoc_irpf19sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf19sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf19" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_19" />
+        </record>        
+
+        <record id="fptt_assoc_irpf18sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf18sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf18"/>
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_18" />
+        </record>        
+
+        <record id="fptt_assoc_irpf15sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf15sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf15" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_15" />
+        </record>        
+
+        <record id="fptt_assoc_irpf9sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />            
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf9sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf9" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_9" />
+        </record>
+        
+        <record id="fptt_assoc_irpf7sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />            
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf7sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf7" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_7" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />            
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf2sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf2" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_2" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="iva_assoc_rep_ex" />
+        </record>
+
+        <record id="fptt_assoc_irpf1sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_assoc_irpf1" />
+            <field name="tax_src_id" ref="iva_assoc_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_assoc_sale_1" />
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_es/fiscal_templates_pymes.xml b/addons/l10n_es/fiscal_templates_pymes.xml
index 05871fad842..2e84e63bc34 100644
--- a/addons/l10n_es/fiscal_templates_pymes.xml
+++ b/addons/l10n_es/fiscal_templates_pymes.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
       <!--
       Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
-      Extracomunitario, Intracomunitario y Retención de IRPF 18%, 15%, 7%, 1%
+      Extracomunitario, Intracomunitario y Retención de IRPFs
 
       Basado en fiscal_templates.xml, con los siguientes cambios:
 
@@ -18,7 +18,7 @@
             fp_* => fp_pymes_*
             fptt_* => fptt_pymes_*
             fpat_* => fpat_pymes_*
-            irpf_sale => irpf_pymes_sale_*
+            irpf_pymes_sale => irpf_pymes_sale_*
 
       Borja López Soilán (Pexego) - borjals@pexego.es (2009-09-09)
 
@@ -35,10 +35,14 @@
             iva_* => iva_pymes_*
             irpf_* => irpf_pymes_*
 
-         Añadidas posiciones fiscales Retención de IRPF 19%, 2% :
-           Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18 -->
+      Añadidas posiciones fiscales Retención de IRPF 19%, 2% :
+        Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com 2010-02-18
+
+      Añadido mapeo de cuentas del regimen de equivalencia para compras y ventas separados:
+        Ignacio Ibeas (Acysos) - ignacio@acysos.com 2011-05-06 -->
+
+        <!-- Fiscal Position Templates -->
 
-    <!-- Fiscal Position Templates -->
         <record id="fp_pymes_nacional" model="account.fiscal.position.template">
             <field name="name">Régimen Nacional</field>
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -59,6 +63,16 @@
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
         </record>
 
+        <record id="fp_pymes_irpf21" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 21%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+        </record>
+
+        <record id="fp_pymes_irpf20" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 20%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+        </record>
+
         <record id="fp_pymes_irpf19" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 19%</field>
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -74,6 +88,11 @@
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
         </record>
 
+        <record id="fp_pymes_irpf9" model="account.fiscal.position.template">
+            <field name="name">Retención IRPF 9%</field>
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+        </record>
+
         <record id="fp_pymes_irpf7" model="account.fiscal.position.template">
             <field name="name">Retención IRPF 7%</field>
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -94,26 +113,16 @@
     <!-- ************************************************************* -->
 
     <!-- Extracomunitarios fiscal.position.tax.template-->
+        <record id="fptt_pymes_extra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bc" />
+        </record>
 
-        <record id="fptt_pymes_extra_16" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_extra_4_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bc" />
-        </record>
-        <record id="fptt_pymes_extra_16_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bi" />
-        </record>
-        <record id="fptt_pymes_extra_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_18" />
-            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bc" />
-        </record>
-        <record id="fptt_pymes_extra_18_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bi" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bi" />
         </record>
 
         <record id="fptt_pymes_extra_7" model="account.fiscal.position.tax.template">
@@ -121,30 +130,69 @@
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
             <field name="tax_dest_id" ref="iva_pymes_X7_compras_bc" />
         </record>
+
         <record id="fptt_pymes_extra_7_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
             <field name="tax_dest_id" ref="iva_pymes_X7_compras_bi" />
         </record>
+
         <record id="fptt_pymes_extra_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
             <field name="tax_dest_id" ref="iva_pymes_X8_compras_bc" />
         </record>
+
         <record id="fptt_pymes_extra_8_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
             <field name="tax_dest_id" ref="iva_pymes_X8_compras_bi" />
         </record>
-        <record id="fptt_pymes_extra_4" model="account.fiscal.position.tax.template">
+
+        <record id="fptt_pymes_extra_10" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4" />
-            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bc" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_X10_compras_bc" />
         </record>
-        <record id="fptt_pymes_extra_4_inv" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_extra_10_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_X4_compras_bi" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X10_compras_bi" />
+        </record>
+
+        <record id="fptt_pymes_extra_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bc" />
+        </record>
+
+        <record id="fptt_pymes_extra_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X16_compras_bi" />
+        </record>
+
+        <record id="fptt_pymes_extra_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bc" />
+        </record>
+
+        <record id="fptt_pymes_extra_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X18_compras_bi" />
+        </record>
+
+        <record id="fptt_pymes_extra_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_X21_compras_bc" />
+        </record>
+        <record id="fptt_pymes_extra_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_X21_compras_bi" />
         </record>
 
         <record id="fptt_pymes_extra_ventas_4" model="account.fiscal.position.tax.template">
@@ -164,6 +212,12 @@
             <field name="tax_dest_id" ref="iva_pymes_X0" />
         </record>
 
+        <record id="fptt_pymes_extra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_X0" />
+        </record>
+
         <record id="fptt_pymes_extra_ventas_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_extra"  />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -175,8 +229,62 @@
             <field name="tax_dest_id" ref="iva_pymes_X0" />
         </record>
 
+        <record id="fptt_pymes_extra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_extra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_X0" />
+        </record>
+
     <!-- Intracomunitarios fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_intra_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bi" />
+        </record>
+
+        <record id="fptt_pymes_intra_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bi" />
+        </record>
+
+        <record id="fptt_pymes_intra_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bi" />
+        </record>
+
+        <record id="fptt_pymes_intra_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_10_bc" />
+        </record>
+
+        <record id="fptt_pymes_intra_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_10_bi" />
+        </record>
+
         <record id="fptt_pymes_intra_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -198,35 +306,15 @@
             <field name="tax_dest_id" ref="iva_pymes_IC_compras_18_bi" />
         </record>
 
-        <record id="fptt_pymes_intra_7" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_intra_21" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_7" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bc" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_21_bc" />
         </record>
-        <record id="fptt_pymes_intra_7_inv" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_intra_21_inv" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_7_bi" />
-        </record>
-        <record id="fptt_pymes_intra_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bc" />
-        </record>
-        <record id="fptt_pymes_intra_8_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_8_bi" />
-        </record>
-        <record id="fptt_pymes_intra_4" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bc" />
-        </record>
-        <record id="fptt_pymes_intra_4_inv" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_intra"  />
-            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
-            <field name="tax_dest_id" ref="iva_pymes_IC_compras_4_bi" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_IC_compras_21_bi" />
         </record>
 
         <record id="fptt_pymes_intra_ventas_4" model="account.fiscal.position.tax.template">
@@ -246,6 +334,12 @@
             <field name="tax_dest_id" ref="iva_pymes_IO" />
         </record>
 
+        <record id="fptt_pymes_intra_ventas_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_IO" />
+        </record>
+
         <record id="fptt_pymes_intra_ventas_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_intra"  />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -257,30 +351,24 @@
             <field name="tax_dest_id" ref="iva_pymes_IO" />
         </record>
 
+         <record id="fptt_pymes_intra_ventas_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_intra"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_IO" />
+        </record>
+
     <!-- Recargo de equivalencia fiscal.position.tax.template-->
 
-        <record id="fptt_pymes_recargo_16" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_4" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_16" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_16" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
         </record>
 
-        <record id="fptt_pymes_recargo_16_2" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_4_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_16" />
-            <field name="tax_dest_id" ref="re_pymes_4" />
-        </record>
-    
-        <record id="fptt_pymes_recargo_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_18" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
-        </record>
-
-        <record id="fptt_pymes_recargo_18_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_18" />
-            <field name="tax_dest_id" ref="re_pymes_4" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="re_pymes_05" />
         </record>
 
         <record id="fptt_pymes_recargo_7" model="account.fiscal.position.tax.template">
@@ -294,7 +382,7 @@
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
             <field name="tax_dest_id" ref="re_pymes_1" />
         </record>
-    
+
         <record id="fptt_pymes_recargo_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
             <field name="tax_src_id" ref="iva_pymes_rep_8" />
@@ -307,16 +395,220 @@
             <field name="tax_dest_id" ref="re_pymes_1" />
         </record>
 
-        <record id="fptt_pymes_recargo_4" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_10" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_4" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
         </record>
 
-        <record id="fptt_pymes_recargo_4_2" model="account.fiscal.position.tax.template">
+        <record id="fptt_pymes_recargo_10_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_recargo"  />
-            <field name="tax_src_id" ref="iva_pymes_rep_4" />
-            <field name="tax_dest_id" ref="re_pymes_05" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="re_pymes_14" />
+        </record>
+
+        <record id="fptt_pymes_recargo_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_16" />
+        </record>
+
+        <record id="fptt_pymes_recargo_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="re_pymes_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_recargo_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="re_pymes_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_recargo_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="re_pymes_52" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="re_pymes_buy_05" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_7" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="re_pymes_buy_14" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="re_pymes_buy_52" />
+        </record>
+
+         <record id="fptt_pymes_recargo_buy_4_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_4_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_4_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_05" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_7_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_7_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_7_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_8_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_8_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_1" />
+        </record>
+
+         <record id="fptt_pymes_recargo_buy_10_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_10_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_10_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_14" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_16_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_16_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_18_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_18_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_4" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21_inv" />
+        </record>
+
+        <record id="fptt_pymes_recargo_buy_21_2_inv" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_recargo"  />
+            <field name="tax_src_id" ref="iva_pymes_sop_21_inv" />
+            <field name="tax_dest_id" ref="re_pymes_buy_52" />
         </record>
 
     <!-- Extracomunitarios fiscal.position.account.template-->
@@ -395,9 +687,312 @@
             <field name="account_dest_id" ref="pgc_pymes_7051" />
         </record>
 
+    <!-- Retenciones IRPF 21% fiscal.position.tax.template-->
+
+        <record id="fptt_pymes_irpf21sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <!-- Retenciones IRPF 20% fiscal.position.tax.template-->
+
+        <record id="fptt_pymes_irpf20sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+         <record id="fptt_pymes_irpf20sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_7" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_7" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_7_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_7" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
 
     <!-- Retenciones IRPF 19% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf19sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -410,18 +1005,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
         </record>
 
-        <record id="fptt_pymes_irpf19sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf19sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
-        </record>
-
         <record id="fptt_pymes_irpf19sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -434,6 +1017,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
         </record>
 
+         <record id="fptt_pymes_irpf19sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -458,6 +1065,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
         </record>
 
+        <record id="fptt_pymes_irpf19_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -470,6 +1089,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_19" />
         </record>
 
+         <record id="fptt_pymes_irpf19_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+
         <record id="fptt_pymes_irpf19_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
@@ -482,18 +1125,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_19" />
         </record>
 
-        <record id="fptt_pymes_irpf19_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
-        </record>
-
-        <record id="fptt_pymes_irpf19_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf19" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="irpf_pymes_19" />
-        </record>
-
         <record id="fptt_pymes_irpf19_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf19" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -520,6 +1151,18 @@
 
     <!-- Retenciones IRPF 18% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf18sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -532,18 +1175,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
         </record>
 
-        <record id="fptt_pymes_irpf18sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf18sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
-        </record>
-
         <record id="fptt_pymes_irpf18sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -556,6 +1187,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
         </record>
 
+        <record id="fptt_pymes_irpf18sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -580,6 +1235,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
         </record>
 
+         <record id="fptt_pymes_irpf18_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -592,18 +1259,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_18" />
         </record>
 
-        <record id="fptt_pymes_irpf18_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf18_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf18" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_18" />
-        </record>
-
         <record id="fptt_pymes_irpf18_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -616,6 +1271,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_18" />
         </record>
 
+        <record id="fptt_pymes_irpf18_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_8_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+
         <record id="fptt_pymes_irpf18_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf18" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -642,6 +1321,18 @@
 
     <!-- Retenciones IRPF 15% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf15sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -654,18 +1345,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
         </record>
 
-        <record id="fptt_pymes_irpf15sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf15sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
-        </record>
-
         <record id="fptt_pymes_irpf15sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -678,6 +1357,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
         </record>
 
+        <record id="fptt_pymes_irpf15sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -702,6 +1405,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
         </record>
 
+        <record id="fptt_pymes_irpf15_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -714,18 +1429,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_15" />
         </record>
 
-        <record id="fptt_pymes_irpf15_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf15_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf15" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_15" />
-        </record>
-
         <record id="fptt_pymes_irpf15_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -738,6 +1441,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_15" />
         </record>
 
+        <record id="fptt_pymes_irpf15_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+
         <record id="fptt_pymes_irpf15_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf15" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -762,8 +1489,142 @@
             <field name="tax_dest_id" ref="irpf_pymes_15" />
         </record>
 
+    <!-- Retenciones IRPF 9% fiscal.position.tax.template-->
+
+        <record id="fptt_pymes_irpf9sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_18" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_18_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_18" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+         <record id="fptt_pymes_irpf9_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_4" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_4_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_4" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>
+
     <!-- Retenciones IRPF 7% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf7sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -776,18 +1637,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
         </record>
 
-        <record id="fptt_pymes_irpf7sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf7sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
-        </record>
-
         <record id="fptt_pymes_irpf7sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -800,6 +1649,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
         </record>
 
+        <record id="fptt_pymes_irpf7sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -824,6 +1697,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
         </record>
 
+        <record id="fptt_pymes_irpf7_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -836,6 +1721,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_7" />
         </record>
 
+        <record id="fptt_pymes_irpf7_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>
+
+         <record id="fptt_pymes_irpf7_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>
+
         <record id="fptt_pymes_irpf7_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
@@ -848,17 +1757,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_7" />
         </record>
 
-        <record id="fptt_pymes_irpf7_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
-        </record>
-
-        <record id="fptt_pymes_irpf7_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf7" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="irpf_pymes_7" />
-        </record>
 
         <record id="fptt_pymes_irpf7_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf7" />
@@ -886,6 +1784,18 @@
 
     <!-- Retenciones IRPF 2% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf2sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -898,18 +1808,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
         </record>
 
-        <record id="fptt_pymes_irpf2sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf2sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
-        </record>
-
         <record id="fptt_pymes_irpf2sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -922,6 +1820,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
         </record>
 
+        <record id="fptt_pymes_irpf2sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -946,6 +1868,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
         </record>
 
+        <record id="fptt_pymes_irpf2_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -958,18 +1892,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_2" />
         </record>
 
-        <record id="fptt_pymes_irpf2_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf2_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf2" />
-            <field name="tax_src_id" ref="iva_pymes_sop_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_2" />
-        </record>
-
         <record id="fptt_pymes_irpf2_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_sop_16" />
@@ -982,6 +1904,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_2" />
         </record>
 
+        <record id="fptt_pymes_irpf2_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+
         <record id="fptt_pymes_irpf2_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf2" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -1008,6 +1954,18 @@
 
     <!-- Retenciones IRPF 1% fiscal.position.tax.template-->
 
+        <record id="fptt_pymes_irpf1sale_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1sale_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_rep_18" />
@@ -1020,18 +1978,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
         </record>
 
-        <record id="fptt_pymes_irpf1sale_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
-        </record>
-
-        <record id="fptt_pymes_irpf1sale_8_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_rep_8" />
-            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
-        </record>
-
         <record id="fptt_pymes_irpf1sale_16" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_rep_16" />
@@ -1044,6 +1990,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
         </record>
 
+        <record id="fptt_pymes_irpf1sale_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_8" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_8_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_8" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1sale_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_rep_7" />
@@ -1068,6 +2038,18 @@
             <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
         </record>
 
+        <record id="fptt_pymes_irpf1_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_21_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_21" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1_18" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_sop_18" />
@@ -1080,6 +2062,30 @@
             <field name="tax_dest_id" ref="irpf_pymes_1" />
         </record>
 
+         <record id="fptt_pymes_irpf1_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_16_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_16" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_10" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_10_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_10" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record>
+
         <record id="fptt_pymes_irpf1_8" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_sop_8" />
@@ -1092,18 +2098,6 @@
             <field name="tax_dest_id" ref="irpf_pymes_1" />
         </record>
 
-        <record id="fptt_pymes_irpf1_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="iva_pymes_sop_16" />
-        </record>
-
-        <record id="fptt_pymes_irpf1_16_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fp_pymes_irpf1" />
-            <field name="tax_src_id" ref="iva_pymes_sop_16" />
-            <field name="tax_dest_id" ref="irpf_pymes_1" />
-        </record>
-
         <record id="fptt_pymes_irpf1_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fp_pymes_irpf1" />
             <field name="tax_src_id" ref="iva_pymes_sop_7" />
@@ -1128,5 +2122,222 @@
             <field name="tax_dest_id" ref="irpf_pymes_1" />
         </record>
 
+        <record id="fptt_pymes_irpf21sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf21sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf20sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_20" />
+        </record> 
+
+        <record id="fptt_pymes_irpf19sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf19sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_19" />
+        </record>        
+
+        <record id="fptt_pymes_irpf18sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf18sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18"/>
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_18" />
+        </record>        
+
+        <record id="fptt_pymes_irpf15sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf15sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_15" />
+        </record>        
+
+        <record id="fptt_pymes_irpf9sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />            
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf9sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_9" />
+        </record>
+        
+        <record id="fptt_pymes_irpf7sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />            
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf7sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_7" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />            
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf2sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_2" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_ex" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_rep_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf1sale_ex_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_rep_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_sale_1" />
+        </record>
+        
+        <!-- IVA SOPORTADO -->
+        
+        <record id="fptt_pymes_irpf21_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf21_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf21"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_21" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf20_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf20"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_20" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf19_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf19"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_19" />
+        </record>
+        
+        <record id="fptt_pymes_irpf18_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf18_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf18" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_18" />
+        </record>
+        
+        <record id="fptt_pymes_irpf15_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf15_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf15"/>
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_15" />
+        </record>
+        
+        <record id="fptt_pymes_irpf9_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf9_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf9" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_9" />
+        </record>        
+
+        <record id="fptt_pymes_irpf7_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf7_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf7" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_7" />
+        </record>        
+
+        <record id="fptt_pymes_irpf2_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf2_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf2" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_2" />
+        </record>
+        
+        <record id="fptt_pymes_irpf1_0" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="iva_pymes_sop_ex" />
+        </record>
+
+        <record id="fptt_pymes_irpf1_0_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fp_pymes_irpf1" />
+            <field name="tax_src_id" ref="iva_pymes_sop_ex" />
+            <field name="tax_dest_id" ref="irpf_pymes_1" />
+        </record> 
     </data>
 </openerp>
diff --git a/addons/l10n_es/taxes_data.xml b/addons/l10n_es/taxes_data.xml
index 41b52ee077d..586358ffc70 100644
--- a/addons/l10n_es/taxes_data.xml
+++ b/addons/l10n_es/taxes_data.xml
@@ -1,25 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
-        
-     <!--
-     Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales
-        
+    <data noupdate="0">
+
+    <!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
+
+    <!-- Plantillas de impuestos para el Plan General Contable 2008.
+
       Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2009-11-28)
         Impuestos IRPF se les ha asignado el grupo others (Otros) en lugar del grupo vat (IVA) por defecto
 
       Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2010-02-18)
-           Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
+        Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
         Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
-     -->
-        
+
+      Ignacio Ibeas (Acysos) - ignacio@acysos.com (2011-02-22)
+        Modificado type_tax_use de los recargos de equivalencia a "all"
+
+      Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2011-08-29)
+        Cambiado Recargos de equivalencia de "all" a "venta" (ya existen los de compra). Ahora quedan definidos de la misma forma que en taxes_data_pymes.xml
+
+      Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2013-01-29)
+        Limpieza de subcuentas de impuestos y corrección de inversión de sujeto pasivo
+
+    -->
+
+
 <!-- Configuracion de codigos de impuesto-->
-        
-    
+
+
     <!-- *********************************************** -->
     <!--IVA DEVENGADO -->
     <!-- *********************************************** -->
-    
+
     <!--Base imponible-->
     <!-- *********************************************** -->
         <record id="iva_dev_base" model="account.tax.code.template">
@@ -28,46 +40,102 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-        
-        
-    
+
+    <!-- Exentas IVA -->
+        <record id="base_sop_ex" model="account.tax.code.template">
+            <field name="name">Base adquisiciones exentas</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_rep_ex" model="account.tax.code.template">
+            <field name="name">Base ventas exentas</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="vat_code_chart_root"/>
+            <field name="sign">1.0</field>
+        </record>         	
+
+        <!-- IVA Soportado -->
+        <record id="iva_sop_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA Soportado exento (operaciones corrientes)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field name="base_code_id" ref="base_sop_ex"/>
+            <field name="ref_base_code_id" ref="base_sop_ex"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_rep_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA Exento</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_rep_ex"/>
+            <field name="ref_base_code_id" ref="base_rep_ex"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
     <!--Régimen general-->
-         
+
         <record id="iva_dev_01" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 4%</field>
             <field name="code">[01]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_dev_04" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 7%</field>
             <field name="code">[04]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_dev_04_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 8%</field>
             <field name="code">[04]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_dev_04_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 10%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_dev_07" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 16%</field>
             <field name="code">[07]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_dev_07_18" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 18%</field>
             <field name="code">[07]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-    
+		<record id="iva_dev_07_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 21%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -75,73 +143,93 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_dev_base"/>
         </record-->
-        
+
         <record id="iva_dev_10" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 0.5%</field>
             <field name="code">[10]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_dev_13" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 1%</field>
             <field name="code">[13]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_dev_13_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 1.4%</field>
+            <field name="code">[13]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_dev_16" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 4%</field>
             <field name="code">[16]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+
+        <record id="iva_dev_16_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 5.2%</field>
+            <field name="code">[16]</field>
+            <field name="parent_id" ref="iva_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS -->
-        
+
         <record id="iva_dev_19" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias. Base Imponible</field>
             <field name="code">[19]</field>
             <field name="parent_id" ref="iva_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
     <!--IVA devengado cuota-->
     <!-- *********************************************** -->
-    
-    
+
+
     <!--Régimen general-->
-         
-         
+
+
         <record id="iva_dev_21" model="account.tax.code.template">
             <field name="name">IVA Cuota total devengada</field>
             <field name="code">[21]</field>
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-         
+
         <record id="iva_dev_03" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 4%</field>
             <field name="code">[03]</field>
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_dev_06" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 7%</field>
             <field name="code">[06]</field>
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_dev_06_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 8%</field>
             <field name="code">[06]</field>
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_dev_06_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 10%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_dev_09" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 16%</field>
             <field name="code">[09]</field>
@@ -155,7 +243,14 @@
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-    
+
+		<record id="iva_dev_09_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 21%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -163,47 +258,61 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_dev_base"/>
         </record-->
-        
+
         <record id="iva_dev_12" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 0.5%</field>
             <field name="code">[12]</field>
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_dev_15" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 1%</field>
             <field name="code">[15]</field>
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_dev_15_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_dev_18" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 4%</field>
             <field name="code">[18]</field>
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+
+        <record id="iva_dev_18_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS -->
-        
+
         <record id="iva_dev_20" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias. Cuota</field>
             <field name="code">[20]</field>
             <field name="parent_id" ref="iva_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
-        
-        
-            
+
+
+
+
+
     <!-- *********************************************** -->
     <!--IVA DEDUCIBLE -->
     <!-- *********************************************** -->
-        
-        
+
+
     <!--IVA Soportado (Deducible) Base Imponible-->
     <!-- *********************************************** -->
         <record id="iva_ded_base_total" model="account.tax.code.template">
@@ -212,7 +321,7 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-        
+
         <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
         <record id="iva_ded_22" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes</field>
@@ -220,19 +329,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_22_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (16%)</field>
+       <record id="iva_ded_22_4" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_22_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_22"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_22_7" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -245,13 +347,30 @@
             <field name="parent_id" ref="iva_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_22_4" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (4%)</field>
+        <record id="iva_ded_22_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+ 		<record id="iva_ded_22_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_22_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_22_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
         <record id="iva_ded_24" model="account.tax.code.template">
             <field name="name">Base operaciones interiores bienes inversión</field>
@@ -259,19 +378,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_24_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
+        <record id="iva_ded_24_4" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_24"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_24_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_24_7" model="account.tax.code.template">
             <field name="name">Base operaciones interiores bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -284,14 +396,31 @@
             <field name="parent_id" ref="iva_ded_24"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_24_4" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (4%)</field>
+        <record id="iva_ded_24_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (10%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_24"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+		<record id="iva_ded_24_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_24_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_24_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Base EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
         <record id="iva_ded_26" model="account.tax.code.template">
             <field name="name">Base importaciones bienes corrientes</field>
@@ -299,6 +428,30 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
+        <record id="iva_ded_26_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_26_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_26_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_26_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
         <record id="iva_ded_26_16" model="account.tax.code.template">
             <field name="name">Base importaciones bienes corrientes (16%)</field>
             <field name="code">--</field>
@@ -311,26 +464,13 @@
             <field name="parent_id" ref="iva_ded_26"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_ded_26_7" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (7%)</field>
+        <record id="iva_ded_26_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_26"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_26_8" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_26"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_ded_26_4" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (4%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_26"/>
-            <field name="sign">1.0</field>
-        </record>
-        
+
         <!-- Base EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
         <record id="iva_ded_28" model="account.tax.code.template">
             <field name="name">Base importaciones bienes inversión</field>
@@ -338,19 +478,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_28_16" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (16%)</field>
+        <record id="iva_ded_28_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_28_18" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_28"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_28_7" model="account.tax.code.template">
             <field name="name">Base importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -363,13 +496,31 @@
             <field name="parent_id" ref="iva_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_28_4" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (4%)</field>
+         <record id="iva_ded_28_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (10%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        
+		<record id="iva_ded_28_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_28_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_28_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
         <record id="iva_ded_30" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes corrientes</field>
@@ -377,6 +528,30 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
+        <record id="iva_ded_30_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_30_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_30_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_30_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
         <record id="iva_ded_30_16" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
             <field name="code">--</field>
@@ -389,26 +564,13 @@
             <field name="parent_id" ref="iva_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_ded_30_7" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</field>
+        <record id="iva_ded_30_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_30_8" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_30"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_ded_30_4" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_30"/>
-            <field name="sign">1.0</field>
-        </record>
-        
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
         <record id="iva_ded_32" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes inversión</field>
@@ -416,19 +578,12 @@
             <field name="parent_id" ref="iva_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_32_16" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</field>
+        <record id="iva_ded_32_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_32"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_32_18" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_32"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_32_7" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -441,18 +596,71 @@
             <field name="parent_id" ref="iva_ded_32"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_32_4" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (4%)</field>
+        <record id="iva_ded_32_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (10%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_32"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
-        
+		<record id="iva_ded_32_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_32_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_32_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- BASE RECARGO DE EQUIVALENCIA-->
+        <record id="iva_ded_10" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 0.5%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_ded_13" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_ded_13_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1.4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_ded_16" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_ded_16_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 5.2%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
     <!-- IVA DEDUCIBLE Cuotas-->
     <!-- *********************************************** -->
-    
+
         <record id="iva_ded_cuota_total" model="account.tax.code.template">
             <field name="name">IVA deducible (Cuota)- Total a deducir [Mod.303]</field>
             <field name="code">[37]</field>
@@ -467,19 +675,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_23_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+        <record id="iva_ded_23_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_23_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_23"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_23_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -492,13 +693,31 @@
             <field name="parent_id" ref="iva_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_23_4" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (4%)</field>
+        <record id="iva_ded_23_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (10%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        
+		<record id="iva_ded_23_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_23_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_23_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Cuotas en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
         <record id="iva_ded_25" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores bienes inversión</field>
@@ -506,19 +725,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_25_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+        <record id="iva_ded_25_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_25_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_25"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_25_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -531,13 +743,31 @@
             <field name="parent_id" ref="iva_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_25_4" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (4%)</field>
+        <record id="iva_ded_25_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (10%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        
+		<record id="iva_ded_25_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_25_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_25_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
         <record id="iva_ded_27" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes corrientes</field>
@@ -545,19 +775,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_27_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+        <record id="iva_ded_27_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_27_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_27"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_27_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -570,13 +793,31 @@
             <field name="parent_id" ref="iva_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_27_4" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
+        <record id="iva_ded_27_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (10%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        
+		<record id="iva_ded_27_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_27_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_27_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
         <record id="iva_ded_29" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes inversión</field>
@@ -584,19 +825,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_29_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+        <record id="iva_ded_29_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_29_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_29"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_29_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -609,13 +843,30 @@
             <field name="parent_id" ref="iva_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_29_4" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (4%)</field>
+        <record id="iva_ded_29_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_ded_29_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_29_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_29_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
         <record id="iva_ded_31" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes corrientes</field>
@@ -623,6 +874,30 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
+        <record id="iva_ded_31_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_31_7" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_31_8" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_31_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
         <record id="iva_ded_31_16" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
             <field name="code">--</field>
@@ -635,26 +910,12 @@
             <field name="parent_id" ref="iva_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_ded_31_7" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</field>
+        <record id="iva_ded_31_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_31_8" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_31"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_ded_31_4" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_31"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
         <record id="iva_ded_33" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes inversión</field>
@@ -662,19 +923,12 @@
             <field name="parent_id" ref="iva_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_33_16" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+        <record id="iva_ded_33_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_33_18" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_ded_33"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_ded_33_7" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -687,8 +941,26 @@
             <field name="parent_id" ref="iva_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_ded_33_4" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (4%)</field>
+        <record id="iva_ded_33_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_ded_33_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_33_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_ded_33_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_ded_33"/>
             <field name="sign">1.0</field>
@@ -716,110 +988,42 @@
             <field name="sign">1.0</field>
         </record>
 
-<!-- ********************************* -->
-<!--Cuentas para IVA-->
-<!-- ********************************* -->
-
-        <record id="pgc_472004" model="account.account.template">
-            <field name="code">472004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 4%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472007" model="account.account.template">
-            <field name="code">472007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472008" model="account.account.template">
-            <field name="code">472008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 8%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472016" model="account.account.template">
-            <field name="code">472016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 16%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_472018" model="account.account.template">
-            <field name="code">472018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477004" model="account.account.template">
-            <field name="code">477004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 4%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477007" model="account.account.template">
-            <field name="code">477007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477008" model="account.account.template">
-            <field name="code">477008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 8%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_477016" model="account.account.template">
-            <field name="code">477016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 16%</field>
-            <field name="user_type" ref="tax"/>
+        <!--Cuota Recargo de Equivalencia-->
+        <record id="iva_ded_12" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 0.5%</field>
+            <field name="code">[12]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
 
-        <record id="pgc_477018" model="account.account.template">
-            <field name="code">477018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 18%</field>
-            <field name="user_type" ref="tax"/>
+        <record id="iva_ded_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_475001" model="account.account.template">
-            <field name="code">475001</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4750"/>
-            <field name="type">payable</field>
-            <field name="name">Hacienda acreedora IVA</field>
-            <field name="user_type" ref="tax"/>
+
+        <record id="iva_ded_15_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        
+
+        <record id="iva_ded_18" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 4%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_ded_18_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
 <!-- ********************************* -->
 <!-- Plantillas de Impuestos IVA       -->
 <!-- ********************************* -->
@@ -831,8 +1035,8 @@
             <field name="name">4% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_4"/>
             <field name="tax_code_id" ref="iva_ded_23_4"/>
             <field name="ref_base_code_id" ref="iva_ded_22_4"/>
@@ -843,14 +1047,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_4_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">4% IVA Soportado (bienes de inversión)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_4"/>
             <field name="tax_code_id" ref="iva_ded_25_4"/>
             <field name="ref_base_code_id" ref="iva_ded_24_4"/>
@@ -861,14 +1065,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">7% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_7"/>
             <field name="tax_code_id" ref="iva_ded_23_7"/>
             <field name="ref_base_code_id" ref="iva_ded_22_7"/>
@@ -879,14 +1083,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_7_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">7% IVA Soportado (bienes de inversión)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_7"/>
             <field name="tax_code_id" ref="iva_ded_25_7"/>
             <field name="ref_base_code_id" ref="iva_ded_24_7"/>
@@ -897,14 +1101,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">8% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_8"/>
             <field name="tax_code_id" ref="iva_ded_23_8"/>
             <field name="ref_base_code_id" ref="iva_ded_22_8"/>
@@ -915,14 +1119,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_8_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">8% IVA Soportado (bienes de inversión)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_8"/>
             <field name="tax_code_id" ref="iva_ded_25_8"/>
             <field name="ref_base_code_id" ref="iva_ded_24_8"/>
@@ -933,14 +1137,50 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+		<record id="iva_sop_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">10% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_22_10"/>
+            <field name="tax_code_id" ref="iva_ded_23_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_22_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_23_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_sop_10_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">10% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_24_10"/>
+            <field name="tax_code_id" ref="iva_ded_25_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_24_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_25_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="iva_sop_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">16% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_16"/>
             <field name="tax_code_id" ref="iva_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_ded_22_16"/>
@@ -951,14 +1191,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_16_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">16% IVA Soportado (bienes de inversión)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_16"/>
             <field name="tax_code_id" ref="iva_ded_25_16"/>
             <field name="ref_base_code_id" ref="iva_ded_24_16"/>
@@ -969,14 +1209,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_sop_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">18% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_18"/>
             <field name="tax_code_id" ref="iva_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_ded_22_18"/>
@@ -986,15 +1226,16 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field name="sequence" eval="0"/>
         </record>
-        
+
         <record id="iva_sop_18_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">18% IVA Soportado (bienes de inversión)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_24_18"/>
             <field name="tax_code_id" ref="iva_ded_25_18"/>
             <field name="ref_base_code_id" ref="iva_ded_24_18"/>
@@ -1005,7 +1246,44 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="iva_sop_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">21% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_23_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="sequence" eval="0"/>
+        </record>
+
+        <record id="iva_sop_21_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">21% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_24_21"/>
+            <field name="tax_code_id" ref="iva_ded_25_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_24_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_25_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- Plantillas para Extracomunitario-->
         <!-- IVA compras -->
         <record id="iva_X0_compras_bc" model="account.tax.template">
@@ -1036,15 +1314,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_X4_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 4% Importaciones bienes corrientes</field>
             <field name="description">IVA 4% Importaciones bienes corrientes</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_4"/>
             <field name="tax_code_id" ref="iva_ded_27_4"/>
             <field name="ref_base_code_id" ref="iva_ded_26_4"/>
@@ -1061,8 +1339,8 @@
             <field name="description">IVA 4% Importaciones bienes de inversión</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472004"/>
-            <field name="account_paid_id" ref="pgc_472004"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_4"/>
             <field name="tax_code_id" ref="iva_ded_29_4"/>
             <field name="ref_base_code_id" ref="iva_ded_28_4"/>
@@ -1073,15 +1351,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-         
+
         <record id="iva_X7_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 7% Importaciones bienes corrientes</field>
             <field name="description">IVA 7% Importaciones bienes corrientes</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_7"/>
             <field name="tax_code_id" ref="iva_ded_27_7"/>
             <field name="ref_base_code_id" ref="iva_ded_26_7"/>
@@ -1098,8 +1376,8 @@
             <field name="description">IVA 7% Importaciones bienes de inversión</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="account_paid_id" ref="pgc_472007"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_7"/>
             <field name="tax_code_id" ref="iva_ded_29_7"/>
             <field name="ref_base_code_id" ref="iva_ded_28_7"/>
@@ -1110,15 +1388,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_X8_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 8% Importaciones bienes corrientes</field>
             <field name="description">IVA 8% Importaciones bienes corrientes</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_8"/>
             <field name="tax_code_id" ref="iva_ded_27_8"/>
             <field name="ref_base_code_id" ref="iva_ded_26_8"/>
@@ -1135,8 +1413,8 @@
             <field name="description">IVA 8% Importaciones bienes de inversión</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="account_paid_id" ref="pgc_472008"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_8"/>
             <field name="tax_code_id" ref="iva_ded_29_8"/>
             <field name="ref_base_code_id" ref="iva_ded_28_8"/>
@@ -1147,15 +1425,53 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="iva_X10_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Importaciones bienes corrientes</field>
+            <field name="description">IVA 10% Importaciones bienes corrientes</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_26_10"/>
+            <field name="tax_code_id" ref="iva_ded_27_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_26_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_27_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_X10_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Importaciones bienes de inversión</field>
+            <field name="description">IVA 10% Importaciones bienes de inversión</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_28_10"/>
+            <field name="tax_code_id" ref="iva_ded_29_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_28_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_29_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <record id="iva_X16_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 16% Importaciones bienes corrientes</field>
             <field name="description">IVA 16% Importaciones bienes corrientes</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_16"/>
             <field name="tax_code_id" ref="iva_ded_27_16"/>
             <field name="ref_base_code_id" ref="iva_ded_26_16"/>
@@ -1172,8 +1488,8 @@
             <field name="description">IVA 16% Importaciones bienes de inversión</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_16"/>
             <field name="tax_code_id" ref="iva_ded_29_16"/>
             <field name="ref_base_code_id" ref="iva_ded_28_16"/>
@@ -1184,15 +1500,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_X18_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 18% Importaciones bienes corrientes</field>
             <field name="description">IVA 18% Importaciones bienes corrientes</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_26_18"/>
             <field name="tax_code_id" ref="iva_ded_27_18"/>
             <field name="ref_base_code_id" ref="iva_ded_26_18"/>
@@ -1209,8 +1525,8 @@
             <field name="description">IVA 18% Importaciones bienes de inversión</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_28_18"/>
             <field name="tax_code_id" ref="iva_ded_29_18"/>
             <field name="ref_base_code_id" ref="iva_ded_28_18"/>
@@ -1221,7 +1537,44 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+		<record id="iva_X21_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Importaciones bienes corrientes</field>
+            <field name="description">IVA 21% Importaciones bienes corrientes</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_26_21"/>
+            <field name="tax_code_id" ref="iva_ded_27_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_26_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_27_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_X21_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Importaciones bienes de inversión</field>
+            <field name="description">IVA 21% Importaciones bienes de inversión</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_28_21"/>
+            <field name="tax_code_id" ref="iva_ded_29_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_28_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_29_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- IVA EXPORTACIONES (VENTAS )-->
         <record id="iva_X0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -1269,16 +1622,16 @@
             <field name="parent_id" ref="iva_ISP_compras_16"/>
             <field name="amount" eval="-0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="account_paid_id" ref="pgc_477016"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07"/>
             <field name="tax_code_id" ref="iva_dev_09"/>
             <field name="ref_base_code_id" ref="iva_dev_07"/>
             <field name="ref_tax_code_id" ref="iva_dev_09"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_ISP_compras_16_3" model="account.tax.template">
@@ -1287,8 +1640,8 @@
             <field name="parent_id" ref="iva_ISP_compras_16"/>
             <field name="amount" eval="0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="account_paid_id" ref="pgc_472016"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_16"/>
             <field name="tax_code_id" ref="iva_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_ded_22_16"/>
@@ -1299,7 +1652,7 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_ISP_compras_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 18% Inversión del sujeto pasivo</field>
@@ -1333,16 +1686,16 @@
             <field name="parent_id" ref="iva_ISP_compras_18"/>
             <field name="amount" eval="-0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="account_paid_id" ref="pgc_477018"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07_18"/>
             <field name="tax_code_id" ref="iva_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_dev_07_18"/>
             <field name="ref_tax_code_id" ref="iva_dev_09_18"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_ISP_compras_18_3" model="account.tax.template">
@@ -1351,8 +1704,8 @@
             <field name="parent_id" ref="iva_ISP_compras_18"/>
             <field name="amount" eval="0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="account_paid_id" ref="pgc_472018"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_22_18"/>
             <field name="tax_code_id" ref="iva_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_ded_22_18"/>
@@ -1363,16 +1716,81 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
-        
+
+
+		<record id="iva_ISP_compras_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_ISP_compras_21_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_ISP_compras_21"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_extra_44"/>
+            <field name="ref_base_code_id" ref="base_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_ISP_compras_21_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_ISP_compras_21"/>
+            <field name="amount" eval="-0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_dev_09_21"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_ISP_compras_21_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_ISP_compras_21"/>
+            <field name="amount" eval="0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_23_21"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <!-- IVA REPERCUTIDO-->
         <record id="iva_rep_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 4%</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477004"/>
-            <field name="account_paid_id" ref="pgc_477004"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_01"/>
             <field name="tax_code_id" ref="iva_dev_03"/>
             <field name="ref_base_code_id" ref="iva_dev_01"/>
@@ -1383,14 +1801,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_rep_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 7%</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477007"/>
-            <field name="account_paid_id" ref="pgc_477007"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_04"/>
             <field name="tax_code_id" ref="iva_dev_06"/>
             <field name="ref_base_code_id" ref="iva_dev_04"/>
@@ -1401,14 +1819,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_rep_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 8%</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477008"/>
-            <field name="account_paid_id" ref="pgc_477008"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_04_8"/>
             <field name="tax_code_id" ref="iva_dev_06_8"/>
             <field name="ref_base_code_id" ref="iva_dev_04_8"/>
@@ -1419,14 +1837,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="iva_rep_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10%</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_04_10"/>
+            <field name="tax_code_id" ref="iva_dev_06_10"/>
+            <field name="ref_base_code_id" ref="iva_dev_04_10"/>
+            <field name="ref_tax_code_id" ref="iva_dev_06_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="iva_rep_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 16%</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="account_paid_id" ref="pgc_477016"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07"/>
             <field name="tax_code_id" ref="iva_dev_09"/>
             <field name="ref_base_code_id" ref="iva_dev_07"/>
@@ -1437,14 +1873,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_rep_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 18%</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="account_paid_id" ref="pgc_477018"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_07_18"/>
             <field name="tax_code_id" ref="iva_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_dev_07_18"/>
@@ -1454,17 +1890,37 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
         </record>
-        
-        
+
+        <record id="iva_rep_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21%</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_dev_09_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+
         <!-- Plantillas para recargo de equivalencia-->
         <record id="re_05" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">0.50% Recargo Equivalencia</field>
+            <field name="name">0.50% Recargo Equivalencia Ventas</field>
             <field eval="0.005" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475001"/>
-            <field name="account_paid_id" ref="pgc_475001"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_10"/>
             <field name="tax_code_id" ref="iva_dev_12"/>
             <field name="ref_base_code_id" ref="iva_dev_10"/>
@@ -1475,14 +1931,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="re_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">1% Recargo Equivalencia</field>
+            <field name="name">1% Recargo Equivalencia Ventas</field>
             <field eval="0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475001"/>
-            <field name="account_paid_id" ref="pgc_475001"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_13"/>
             <field name="tax_code_id" ref="iva_dev_15"/>
             <field name="ref_base_code_id" ref="iva_dev_13"/>
@@ -1493,14 +1949,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="re_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">1.4% Recargo Equivalencia Ventas</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_13_14"/>
+            <field name="tax_code_id" ref="iva_dev_15_14"/>
+            <field name="ref_base_code_id" ref="iva_dev_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_dev_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="re_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">4% Recargo Equivalencia</field>
+            <field name="name">4% Recargo Equivalencia Ventas</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475001"/>
-            <field name="account_paid_id" ref="pgc_475001"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_16"/>
             <field name="tax_code_id" ref="iva_dev_18"/>
             <field name="ref_base_code_id" ref="iva_dev_16"/>
@@ -1511,10 +1985,118 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+        <record id="re_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">5.2% Recargo Equivalencia Ventas</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_16_52"/>
+            <field name="tax_code_id" ref="iva_dev_18_52"/>
+            <field name="ref_base_code_id" ref="iva_dev_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_dev_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_buy_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">0.50% Recargo Equivalencia Compras</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_10"/>
+            <field name="tax_code_id" ref="iva_ded_12"/>
+            <field name="ref_base_code_id" ref="iva_ded_10"/>
+            <field name="ref_tax_code_id" ref="iva_ded_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">1% Recargo Equivalencia Compras</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_13"/>
+            <field name="tax_code_id" ref="iva_ded_15"/>
+            <field name="ref_base_code_id" ref="iva_ded_13"/>
+            <field name="ref_tax_code_id" ref="iva_ded_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">1.4% Recargo Equivalencia Compras</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_13_14"/>
+            <field name="tax_code_id" ref="iva_ded_15_14"/>
+            <field name="ref_base_code_id" ref="iva_ded_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_ded_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">4% Recargo Equivalencia Compras</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_16"/>
+            <field name="tax_code_id" ref="iva_ded_18"/>
+            <field name="ref_base_code_id" ref="iva_ded_16"/>
+            <field name="ref_tax_code_id" ref="iva_ded_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_buy_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">5.2% Recargo Equivalencia Compras</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_16_52"/>
+            <field name="tax_code_id" ref="iva_ded_18_52"/>
+            <field name="ref_base_code_id" ref="iva_ded_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_ded_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
 <!-- OPERACIONES INTRACOMUNITARIAS -->
-        
+
         <!-- VENTAS -->
         <record id="iva_IO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
@@ -1528,366 +2110,11 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+
         <!-- COMPRAS -->
-        <record id="iva_IC_compras_16_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472016"/>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="base_code_id" ref="iva_ded_30_16"/>
-            <field name="tax_code_id" ref="iva_ded_31_16"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_16"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477016"/>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_IC_compras_18_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472018"/>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="base_code_id" ref="iva_ded_30_18"/>
-            <field name="tax_code_id" ref="iva_ded_31_18"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_18"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477018"/>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="vat_IO_buy_21b"/>
-            <field name="name">Biens Déductibles 21% (3)</field>
-            <field eval="0.00" name="amount"/>
-            <field name="type">percent</field>
-            <field name="ref_base_code_id" ref="vat_code_a86"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record-->
-<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
 
-        <record id="iva_IC_compras_16_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472016"/>
-            <field name="account_collected_id" ref="pgc_472016"/>
-            <field name="base_code_id" ref="iva_ded_32_16"/>
-            <field name="tax_code_id" ref="iva_ded_33_16"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_16"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_16_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477016"/>
-            <field name="account_collected_id" ref="pgc_477016"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472018"/>
-            <field name="account_collected_id" ref="pgc_472018"/>
-            <field name="base_code_id" ref="iva_ded_32_18"/>
-            <field name="tax_code_id" ref="iva_ded_33_18"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_18"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_18_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477018"/>
-            <field name="account_collected_id" ref="pgc_477018"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_7_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472007"/>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="base_code_id" ref="iva_ded_30_7"/>
-            <field name="tax_code_id" ref="iva_ded_31_7"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477007"/>
-            <field name="account_collected_id" ref="pgc_477007"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_7_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472007"/>
-            <field name="account_collected_id" ref="pgc_472007"/>
-            <field name="base_code_id" ref="iva_ded_32_7"/>
-            <field name="tax_code_id" ref="iva_ded_33_7"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_7_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477007"/>
-            <field name="account_collected_id" ref="pgc_477007"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_IC_compras_8_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472008"/>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="base_code_id" ref="iva_ded_30_8"/>
-            <field name="tax_code_id" ref="iva_ded_31_8"/>
-            <field name="ref_base_code_id" ref="iva_ded_30_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_31_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477008"/>
-            <field name="account_collected_id" ref="pgc_477008"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_8_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472008"/>
-            <field name="account_collected_id" ref="pgc_472008"/>
-            <field name="base_code_id" ref="iva_ded_32_8"/>
-            <field name="tax_code_id" ref="iva_ded_33_8"/>
-            <field name="ref_base_code_id" ref="iva_ded_32_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_ded_33_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_IC_compras_8_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template"/>
-            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477008"/>
-            <field name="account_collected_id" ref="pgc_477008"/>
-            <field name="base_code_id" ref="iva_dev_19"/>
-            <field name="tax_code_id" ref="iva_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_IC_compras_4_bc" model="account.tax.template">
+		<record id="iva_IC_compras_4_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes</field>
             <field name="description">IVA 4% Intracomunitario. Bienes corrientes</field>
@@ -1902,8 +2129,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472004"/>
-            <field name="account_collected_id" ref="pgc_472004"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_30_4"/>
             <field name="tax_code_id" ref="iva_ded_31_4"/>
             <field name="ref_base_code_id" ref="iva_ded_30_4"/>
@@ -1918,8 +2145,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477004"/>
-            <field name="account_collected_id" ref="pgc_477004"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_19"/>
             <field name="tax_code_id" ref="iva_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1945,8 +2172,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_472004"/>
-            <field name="account_collected_id" ref="pgc_472004"/>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
             <field name="base_code_id" ref="iva_ded_32_4"/>
             <field name="tax_code_id" ref="iva_ded_33_4"/>
             <field name="ref_base_code_id" ref="iva_ded_32_4"/>
@@ -1961,8 +2188,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_477004"/>
-            <field name="account_collected_id" ref="pgc_477004"/>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
             <field name="base_code_id" ref="iva_dev_19"/>
             <field name="tax_code_id" ref="iva_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1972,7 +2199,538 @@
             <field eval="1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+         <record id="iva_IC_compras_7_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_7"/>
+            <field name="tax_code_id" ref="iva_ded_31_7"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_7_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_7"/>
+            <field name="tax_code_id" ref="iva_ded_33_7"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_7_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_8_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_8"/>
+            <field name="tax_code_id" ref="iva_ded_31_8"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_8_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_8"/>
+            <field name="tax_code_id" ref="iva_ded_33_8"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_8_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_10_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_10"/>
+            <field name="tax_code_id" ref="iva_ded_31_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_10_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_10"/>
+            <field name="tax_code_id" ref="iva_ded_33_10"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_10_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_16_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_16"/>
+            <field name="tax_code_id" ref="iva_ded_31_16"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_16"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_16_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_16"/>
+            <field name="tax_code_id" ref="iva_ded_33_16"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_16"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_16_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_IC_compras_18_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_18"/>
+            <field name="tax_code_id" ref="iva_ded_31_18"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_18"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="vat_IO_buy_21b"/>
+            <field name="name">Biens Déductibles 21% (3)</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="ref_base_code_id" ref="vat_code_a86"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record-->
+<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
+
+         <record id="iva_IC_compras_18_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_18"/>
+            <field name="tax_code_id" ref="iva_ded_33_18"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_18"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_18_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_21_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_30_21"/>
+            <field name="tax_code_id" ref="iva_ded_31_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_30_21"/>
+            <field name="ref_tax_code_id" ref="iva_ded_31_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_IC_compras_21_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_472000"/>
+            <field name="account_collected_id" ref="pgc_472000"/>
+            <field name="base_code_id" ref="iva_ded_32_21"/>
+            <field name="tax_code_id" ref="iva_ded_33_21"/>
+            <field name="ref_base_code_id" ref="iva_ded_32_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_ded_33_21"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_IC_compras_21_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="parent_id" ref="iva_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_477000"/>
+            <field name="account_collected_id" ref="pgc_477000"/>
+            <field name="base_code_id" ref="iva_dev_19"/>
+            <field name="tax_code_id" ref="iva_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <!-- RETENCIONES DE IRPF -->
         <!--
         - Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
@@ -1980,9 +2738,9 @@
         - Rendimientos de actividades profesionales: 15% (tipo general) y 7% (tipo especial reducido por inicio de actividad)
         - Rendimientos de actividades agrícolas, ganaderas, forestales: 2%
         - Retención del 1% a aplicar en el pago de rendimientos a empresarios en módulos.-->
-        
+
         <!-- RETENCIONES DE IRPF: Hacienda pública, acreedora por retenciones practicadas a proveedores -->
-        
+
         <!--Base imponible-->
         <record id="irpf_base" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible</field>
@@ -1990,56 +2748,70 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-        
+
         <record id="irpf_base_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 1%</field>
             <field name="code">B.IRPF1</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 2%</field>
             <field name="code">B.IRPF2</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 7%</field>
             <field name="code">B.IRPF7</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_base_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 9%</field>
+            <field name="code">B.IRPF9</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_base_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 15%</field>
             <field name="code">B.IRPF15</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 18%</field>
             <field name="code">B.IRPF18</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 19%</field>
             <field name="code">B.IRPF19</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_base_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 20%</field>
+            <field name="code">B.IRPF20</field>
+            <field name="parent_id" ref="irpf_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_base_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 21%</field>
             <field name="code">B.IRPF21</field>
             <field name="parent_id" ref="irpf_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuotas-->
         <record id="irpf_cuota_total" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Total Cuota</field>
@@ -2047,128 +2819,78 @@
             <field name="parent_id" ref="vat_code_chart_root"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 1%</field>
             <field name="code">IRPF1</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 2%</field>
             <field name="code">IRPF2</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 7%</field>
             <field name="code">IRPF7</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_cuota_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 9%</field>
+            <field name="code">IRPF9</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_cuota_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 15%</field>
             <field name="code">IRPF15</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 18%</field>
             <field name="code">IRPF18</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 19%</field>
             <field name="code">IRPF19</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_cuota_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 20%</field>
+            <field name="code">IRPF20</field>
+            <field name="parent_id" ref="irpf_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_cuota_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 21%</field>
             <field name="code">IRPF21</field>
             <field name="parent_id" ref="irpf_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <!--Cuentas para Retenciones-->
-        <record id="pgc_475101" model="account.account.template">
-            <field name="code">475101</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones empresarios módulos 1%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475102" model="account.account.template">
-            <field name="code">475102</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475107" model="account.account.template">
-            <field name="code">475107</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones act. profesionales 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475115" model="account.account.template">
-            <field name="code">475115</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones act. profesionales 15%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475118" model="account.account.template">
-            <field name="code">475118</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475119" model="account.account.template">
-            <field name="code">475119</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_475121" model="account.account.template">
-            <field name="code">475121</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_4751"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
+
         <!-- Plantillas de retenciones-->
         <record id="irpf_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 1%</field>
             <field eval="-0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475101"/>
-            <field name="account_paid_id" ref="pgc_475101"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_1"/>
             <field name="tax_code_id" ref="irpf_cuota_1"/>
             <field name="ref_base_code_id" ref="irpf_base_1"/>
@@ -2179,14 +2901,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 2%</field>
             <field eval="-0.02" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475102"/>
-            <field name="account_paid_id" ref="pgc_475102"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_2"/>
             <field name="tax_code_id" ref="irpf_cuota_2"/>
             <field name="ref_base_code_id" ref="irpf_base_2"/>
@@ -2197,14 +2919,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 7%</field>
             <field eval="-0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475107"/>
-            <field name="account_paid_id" ref="pgc_475107"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_7"/>
             <field name="tax_code_id" ref="irpf_cuota_7"/>
             <field name="ref_base_code_id" ref="irpf_base_7"/>
@@ -2215,14 +2937,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="irpf_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
+            <field name="base_code_id" ref="irpf_base_9"/>
+            <field name="tax_code_id" ref="irpf_cuota_9"/>
+            <field name="ref_base_code_id" ref="irpf_base_9"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 15%</field>
             <field eval="-0.15" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475115"/>
-            <field name="account_paid_id" ref="pgc_475115"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_15"/>
             <field name="tax_code_id" ref="irpf_cuota_15"/>
             <field name="ref_base_code_id" ref="irpf_base_15"/>
@@ -2233,14 +2973,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 18%</field>
             <field eval="-0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475118"/>
-            <field name="account_paid_id" ref="pgc_475118"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_18"/>
             <field name="tax_code_id" ref="irpf_cuota_18"/>
             <field name="ref_base_code_id" ref="irpf_base_18"/>
@@ -2251,14 +2991,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 19%</field>
             <field eval="-0.19" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475119"/>
-            <field name="account_paid_id" ref="pgc_475119"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_19"/>
             <field name="tax_code_id" ref="irpf_cuota_19"/>
             <field name="ref_base_code_id" ref="irpf_base_19"/>
@@ -2269,14 +3009,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="irpf_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
+            <field name="base_code_id" ref="irpf_base_20"/>
+            <field name="tax_code_id" ref="irpf_cuota_20"/>
+            <field name="ref_base_code_id" ref="irpf_base_20"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones IRPF 21%</field>
             <field eval="-0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_475121"/>
-            <field name="account_paid_id" ref="pgc_475121"/>
+            <field name="account_collected_id" ref="pgc_475100"/>
+            <field name="account_paid_id" ref="pgc_475100"/>
             <field name="base_code_id" ref="irpf_base_21"/>
             <field name="tax_code_id" ref="irpf_cuota_21"/>
             <field name="ref_base_code_id" ref="irpf_base_21"/>
@@ -2287,9 +3045,9 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <!-- RETENCIONES DE IRPF: Hacienda pública, retenciones a cuenta como clientes -->
-        
+
         <!--Base imponible-->
         <record id="irpf_base_sale" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible</field>
@@ -2297,56 +3055,70 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-        
+
         <record id="irpf_base_sale_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 1%</field>
             <field name="code">B.IRPF1 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_sale_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 2%</field>
             <field name="code">B.IRPF2 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_sale_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 7%</field>
             <field name="code">B.IRPF7 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_base_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 9%</field>
+            <field name="code">B.IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_base_sale_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 15%</field>
             <field name="code">B.IRPF15 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_sale_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 18%</field>
             <field name="code">B.IRPF18 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_base_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 19%</field>
             <field name="code">B.IRPF19 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_base_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 20%</field>
+            <field name="code">B.IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_base_sale_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 21%</field>
             <field name="code">B.IRPF21 AC</field>
             <field name="parent_id" ref="irpf_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuotas-->
         <record id="irpf_cuota_sale_total" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Total Cuota</field>
@@ -2354,128 +3126,78 @@
             <field name="parent_id" ref="vat_code_chart_root"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_sale_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 1%</field>
             <field name="code">IRPF1 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_sale_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 2%</field>
             <field name="code">IRPF2 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_sale_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 7%</field>
             <field name="code">IRPF7 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_cuota_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 9%</field>
+            <field name="code">IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_cuota_sale_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 15%</field>
             <field name="code">IRPF15 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_sale_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 18%</field>
             <field name="code">IRPF18 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_cuota_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 19%</field>
             <field name="code">IRPF19 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_cuota_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 20%</field>
+            <field name="code">IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_cuota_sale_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 21%</field>
             <field name="code">IRPF21 AC</field>
             <field name="parent_id" ref="irpf_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <!--Cuentas para Retenciones-->
-        <record id="pgc_473001" model="account.account.template">
-            <field name="code">473001</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta empresarios módulos 1%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473002" model="account.account.template">
-            <field name="code">473002</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
 
-        <record id="pgc_473007" model="account.account.template">
-            <field name="code">473007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473015" model="account.account.template">
-            <field name="code">473015</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 15%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473018" model="account.account.template">
-            <field name="code">473018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473019" model="account.account.template">
-            <field name="code">473019</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_473021" model="account.account.template">
-            <field name="code">473021</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_473"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
         <!-- Plantillas de retenciones-->
         <record id="irpf_sale_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 1%</field>
             <field eval="-0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473001"/>
-            <field name="account_paid_id" ref="pgc_473001"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_1"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_1"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_1"/>
@@ -2486,14 +3208,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 2%</field>
             <field eval="-0.02" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473002"/>
-            <field name="account_paid_id" ref="pgc_473002"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_2"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_2"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_2"/>
@@ -2504,14 +3226,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 7%</field>
             <field eval="-0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473007"/>
-            <field name="account_paid_id" ref="pgc_473007"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_7"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_7"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_7"/>
@@ -2522,14 +3244,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_sale_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones a cuenta IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
+            <field name="base_code_id" ref="irpf_base_sale_9"/>
+            <field name="tax_code_id" ref="irpf_cuota_sale_9"/>
+            <field name="ref_base_code_id" ref="irpf_base_sale_9"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_sale_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_sale_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 15%</field>
             <field eval="-0.15" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473015"/>
-            <field name="account_paid_id" ref="pgc_473015"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_15"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_15"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_15"/>
@@ -2540,14 +3280,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 18%</field>
             <field eval="-0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473018"/>
-            <field name="account_paid_id" ref="pgc_473018"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_18"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_18"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_18"/>
@@ -2558,14 +3298,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_sale_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 19%</field>
             <field eval="-0.19" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473019"/>
-            <field name="account_paid_id" ref="pgc_473019"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_19"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_19"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_19"/>
@@ -2576,14 +3316,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_sale_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template"/>
+            <field name="name">Retenciones a cuenta IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
+            <field name="base_code_id" ref="irpf_base_sale_20"/>
+            <field name="tax_code_id" ref="irpf_cuota_sale_20"/>
+            <field name="ref_base_code_id" ref="irpf_base_sale_20"/>
+            <field name="ref_tax_code_id" ref="irpf_cuota_sale_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_sale_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template"/>
             <field name="name">Retenciones a cuenta IRPF 21%</field>
             <field eval="-0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_473021"/>
-            <field name="account_paid_id" ref="pgc_473021"/>
+            <field name="account_collected_id" ref="pgc_473000"/>
+            <field name="account_paid_id" ref="pgc_473000"/>
             <field name="base_code_id" ref="irpf_base_sale_21"/>
             <field name="tax_code_id" ref="irpf_cuota_sale_21"/>
             <field name="ref_base_code_id" ref="irpf_base_sale_21"/>
diff --git a/addons/l10n_es/taxes_data_assoc.xml b/addons/l10n_es/taxes_data_assoc.xml
new file mode 100644
index 00000000000..e2ebb47fb59
--- /dev/null
+++ b/addons/l10n_es/taxes_data_assoc.xml
@@ -0,0 +1,3540 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+      <!--
+      Plantillas de impuestos para el Plan General Contable Asociaciones 2008.
+
+      Basado en taxes_data.xml, con los siguientes cambios:
+
+      - Se sustituyen los códigos:
+            vat_code_chart_root => vat_code_chart_assoc_root
+            l10nES_chart_template => l10nES_chart_template_assoc
+            pgc_* => pgc_assoc_*
+            iva_* => iva_assoc_*
+            re_* => re_assoc_*
+            irpf_* => irpf_assoc_*
+            base_* => base_assoc_*
+
+       Corrección: Códigos 42 "Entregas Intracomunitarias" y 43 "Exportaciones y operaciones asimiladas"
+       Impuestos IRPF se les ha asignado el grupo others (Otros) en lugar del grupo vat (IVA) por defecto
+       Añdido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
+       Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
+      -->
+
+<!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
+
+
+<!-- Configuracion de codigos de impuesto-->
+
+
+    <!-- *********************************************** -->
+    <!--IVA DEVENGADO -->
+    <!-- *********************************************** -->
+
+    <!--Base imponible-->
+    <!-- *********************************************** -->
+        <record id="iva_assoc_dev_base" model="account.tax.code.template">
+            <field name="name">IVA Devengado Base Imponible</field>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+        </record>
+
+    <!-- Exentas IVA -->
+        <record id="base_assoc_sop_ex" model="account.tax.code.template">
+            <field name="name">Base adquisiciones exentas</field>
+            <field name="company_id" model="res.company"  search="[]"/>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_assoc_rep_ex" model="account.tax.code.template">
+            <field name="name">Base ventas exentas</field>
+            <field name="code">--</field>
+            <field name="company_id" model="res.company"  search="[]"/>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>             
+
+        <!-- IVA Soportado -->
+        <record id="iva_assoc_sop_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA Soportado exento (operaciones corrientes)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field name="base_code_id" ref="base_assoc_sop_ex"/>
+            <field name="ref_base_code_id" ref="base_assoc_sop_ex"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_assoc_rep_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA Exento</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_rep_ex"/>
+            <field name="ref_base_code_id" ref="base_assoc_rep_ex"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+
+
+    <!--Régimen general-->
+
+        <record id="iva_assoc_dev_01" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 4%</field>
+            <field name="code">[01]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_04" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 7%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_dev_04_8" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 8%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_04_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 10%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_07" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 16%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_dev_07_18" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 18%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_07_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 21%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- RECARGO DE EQUIVALENCIA -->
+        <!--record id="re_assoc_base" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible</field>
+            <field name="code">_</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+        </record-->
+
+        <record id="iva_assoc_dev_10" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 0.5%</field>
+            <field name="code">[10]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_13" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 1%</field>
+            <field name="code">[13]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_13_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 1.4%</field>
+            <field name="code">[13]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_16" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 4%</field>
+            <field name="code">[16]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_16_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 5.2%</field>
+            <field name="code">[16]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+
+        <record id="iva_assoc_dev_19" model="account.tax.code.template">
+            <field name="name">Adquisiciones intracomunitarias. Base Imponible</field>
+            <field name="code">[19]</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+    <!--IVA devengado cuota-->
+    <!-- *********************************************** -->
+
+
+    <!--Régimen general-->
+
+
+        <record id="iva_assoc_dev_21" model="account.tax.code.template">
+            <field name="name">IVA Cuota total devengada</field>
+            <field name="code">[21]</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+        </record>
+
+        <record id="iva_assoc_dev_03" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 4%</field>
+            <field name="code">[03]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_06" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 7%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_06_8" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 8%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_06_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 10%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_09" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 16%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_09_18" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 18%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_09_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 21%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- RECARGO DE EQUIVALENCIA -->
+        <!--record id="re_base" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible</field>
+            <field name="code">_</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="iva_assoc_dev_base"/>
+        </record-->
+
+        <record id="iva_assoc_dev_12" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 0.5%</field>
+            <field name="code">[12]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_15_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_18" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 4%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_dev_18_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS -->
+
+        <record id="iva_assoc_dev_20" model="account.tax.code.template">
+            <field name="name">Adquisiciones intracomunitarias. Cuota</field>
+            <field name="code">[20]</field>
+            <field name="parent_id" ref="iva_assoc_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+
+
+
+    <!-- *********************************************** -->
+    <!--IVA DEDUCIBLE -->
+    <!-- *********************************************** -->
+
+
+    <!--IVA Soportado (Deducible) Base Imponible-->
+    <!-- *********************************************** -->
+        <record id="iva_assoc_ded_base_total" model="account.tax.code.template">
+            <field name="name">IVA Deducible Base Imponible</field>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+        </record>
+
+        <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="iva_assoc_ded_22" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes</field>
+            <field name="code">[22]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_22_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_22_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_22_7" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_22_8" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_22_4" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_22_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_22_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_ded_24" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión</field>
+            <field name="code">[24]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_24_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_7" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_8" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_4" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_24_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+        <!-- Base EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_26" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes</field>
+            <field name="code">[26]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_26_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_26_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_26_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Base EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_ded_28" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión</field>
+            <field name="code">[28]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_28_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_28_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_30" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes</field>
+            <field name="code">[30]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_30_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_30_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_ded_32" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión</field>
+            <field name="code">[32]</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_32_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_32_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- BASE RECARGO DE EQUIVALENCIA-->
+        <record id="iva_assoc_ded_10" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 0.5%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_13" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_13_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1.4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_16" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_16_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 5.2%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
+    <!-- IVA DEDUCIBLE Cuotas-->
+    <!-- *********************************************** -->
+
+        <record id="iva_assoc_ded_cuota_total" model="account.tax.code.template">
+            <field name="name">IVA deducible (Cuota)- Total a deducir [Mod.303]</field>
+            <field name="code">[37]</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas en OPERACIONES INTERIORES CORRIENTES-->
+        <record id="iva_assoc_ded_23" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes</field>
+            <field name="code">[23]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_23_7" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_8" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_23_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_ded_25" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión</field>
+            <field name="code">[25]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_25_7" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_8" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_25_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_27" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes</field>
+            <field name="code">[27]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_27_7" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_8" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_27_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_ded_29" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión</field>
+            <field name="code">[29]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_29_7" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_8" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_29_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
+        <record id="iva_assoc_ded_31" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes</field>
+            <field name="code">[31]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_31_7" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_8" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_31_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
+        <record id="iva_assoc_ded_33" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión</field>
+            <field name="code">[33]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_33_7" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_8" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_assoc_ded_33_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_assoc_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Otros Códigos de Impuestos-->
+        <record id="base_assoc_intra_42" model="account.tax.code.template">
+            <field name="name">Entregas Intracomunitarias</field>
+            <field name="code">[42]</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_assoc_extra_43" model="account.tax.code.template">
+            <field name="name">Exportaciones y operaciones asimiladas</field>
+            <field name="code">[43]</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_assoc_extra_44" model="account.tax.code.template">
+            <field name="name">Inversión del sujeto pasivo</field>
+            <field name="code">[44]</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuota Recargo de Equivalencia-->
+        <record id="iva_assoc_ded_12" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 0.5%</field>
+            <field name="code">[12]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_15_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_18" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 4%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_assoc_ded_18_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_assoc_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+<!-- ********************************* -->
+<!-- Plantillas de Impuestos IVA       -->
+<!-- ********************************* -->
+
+<!-- IVA Soportado -->
+
+        <record id="iva_assoc_sop_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_4_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">7% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_7_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">7% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_8" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">8% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_8_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">8% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">10% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_10_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">10% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_16" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">16% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_16_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">16% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">18% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_18_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">18% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_sop_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">21% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+        <record id="iva_assoc_sop_21_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">21% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_24_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_25_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_24_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_25_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- Plantillas para Extracomunitario-->
+        <!-- IVA compras -->
+        <record id="iva_assoc_X0_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Importaciones bienes corrientes</field>
+            <field name="description">IVA 0% Importaciones bienes corrientes</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="iva_assoc_ded_26"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X0_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Importaciones bienes de inversión</field>
+            <field name="description">IVA 0% Importaciones bienes de inversión</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="iva_assoc_ded_28"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X4_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Importaciones bienes corrientes</field>
+            <field name="description">IVA 4% Importaciones bienes corrientes</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X4_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Importaciones bienes de inversión</field>
+            <field name="description">IVA 4% Importaciones bienes de inversión</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_4"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_4"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X7_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Importaciones bienes corrientes</field>
+            <field name="description">IVA 7% Importaciones bienes corrientes</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X7_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Importaciones bienes de inversión</field>
+            <field name="description">IVA 7% Importaciones bienes de inversión</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_7"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X8_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Importaciones bienes corrientes</field>
+            <field name="description">IVA 8% Importaciones bienes corrientes</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X8_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Importaciones bienes de inversión</field>
+            <field name="description">IVA 8% Importaciones bienes de inversión</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X10_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Importaciones bienes corrientes</field>
+            <field name="description">IVA 10% Importaciones bienes corrientes</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X10_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Importaciones bienes de inversión</field>
+            <field name="description">IVA 10% Importaciones bienes de inversión</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X16_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Importaciones bienes corrientes</field>
+            <field name="description">IVA 16% Importaciones bienes corrientes</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X16_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Importaciones bienes de inversión</field>
+            <field name="description">IVA 16% Importaciones bienes de inversión</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_16"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X18_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Importaciones bienes corrientes</field>
+            <field name="description">IVA 18% Importaciones bienes corrientes</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X18_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Importaciones bienes de inversión</field>
+            <field name="description">IVA 18% Importaciones bienes de inversión</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_X21_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Importaciones bienes corrientes</field>
+            <field name="description">IVA 21% Importaciones bienes corrientes</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_26_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_27_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_26_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_27_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_X21_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Importaciones bienes de inversión</field>
+            <field name="description">IVA 21% Importaciones bienes de inversión</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_28_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_29_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_28_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_29_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
+        <!-- IVA EXPORTACIONES (VENTAS )-->
+        <record id="iva_assoc_X0" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Exportaciones</field>
+            <field name="description">IVA 0% Exportaciones</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_43"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_43"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+         <!-- Inversión del sujeto pasivo -->
+        <record id="iva_assoc_ISP_compras_16" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 16% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_16_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_16"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_44"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_16_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_16"/>
+            <field name="amount" eval="-0.16"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_16_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_16"/>
+            <field name="amount" eval="0.16"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_16"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_ISP_compras_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 18% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_18_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_18"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_44"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_18_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_18"/>
+            <field name="amount" eval="-0.18"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_18_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_18"/>
+            <field name="amount" eval="0.18"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_18"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+<record id="iva_assoc_ISP_compras_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_21_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_21"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_extra_44"/>
+            <field name="ref_base_code_id" ref="base_assoc_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_21_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_21"/>
+            <field name="amount" eval="-0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_ISP_compras_21_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_assoc_ISP_compras_21"/>
+            <field name="amount" eval="0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_23_21"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_assoc_rep_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4%</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_01"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_03"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_01"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_03"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7%</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_04"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_06"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_04"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_06"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_8" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8%</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_04_8"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_06_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_04_8"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_06_8"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10%</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_04_10"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_06_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_04_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_06_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_16" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16%</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18%</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="iva_assoc_rep_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21%</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_09_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+
+        <!-- Plantillas para recargo de equivalencia-->
+        <record id="re_assoc_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">0.50% Recargo Equivalencia</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475000"/>
+            <field name="account_paid_id" ref="pgc_assoc_475000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_10"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_12"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1% Recargo Equivalencia</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475000"/>
+            <field name="account_paid_id" ref="pgc_assoc_475000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_13"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_15"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_13"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1.4% Recargo Equivalencia</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_13_14"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_15_14"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% Recargo Equivalencia</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475000"/>
+            <field name="account_paid_id" ref="pgc_assoc_475000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_16"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">5.2% Recargo Equivalencia</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_16_52"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_18_52"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="re_assoc_buy_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">0.50% Recargo Equivalencia Compras</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_12"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_10"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1% Recargo Equivalencia Compras</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_13"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_15"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_13"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">1.4% Recargo Equivalencia Compras</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_13_14"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_15_14"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">4% Recargo Equivalencia Compras</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_assoc_buy_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">5.2% Recargo Equivalencia Compras</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_16_52"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_18_52"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
+<!-- OPERACIONES INTRACOMUNITARIAS -->
+
+        <!-- VENTAS -->
+        <record id="iva_assoc_IO" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 0% Intracomunitario</field>
+            <field name="description">IVA 0% Intracomunitario 0</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_assoc_intra_42"/>
+            <field name="ref_base_code_id" ref="base_assoc_intra_42"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+
+        <!-- COMPRAS -->
+        <record id="iva_assoc_IC_compras_16_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_16"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_18_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_18"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="vat_IO_buy_21b"/>
+            <field name="name">Biens Déductibles 21% (3)</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="ref_base_code_id" ref="vat_code_a86"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record-->
+<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
+
+        <record id="iva_assoc_IC_compras_16_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_16"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_16"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_16"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_16_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_18_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_18"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_18"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_18"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_18_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_7_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_7_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_7"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_7"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_7_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_8_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_8_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_8"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_8"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_8_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_4_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 4% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_4"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_4"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_4_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 4% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bi"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_4"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_4"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_4"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_4"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_4_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_4_bi"/>
+            <field name="name">IVA 4% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+         <record id="iva_assoc_IC_compras_10_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_10_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_10"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_10"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_10_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_21_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_30_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_31_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_30_21"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_31_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_assoc_IC_compras_21_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_472000"/>
+            <field name="account_collected_id" ref="pgc_assoc_472000"/>
+            <field name="base_code_id" ref="iva_assoc_ded_32_21"/>
+            <field name="tax_code_id" ref="iva_assoc_ded_33_21"/>
+            <field name="ref_base_code_id" ref="iva_assoc_ded_32_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_ded_33_21"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_assoc_IC_compras_21_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="parent_id" ref="iva_assoc_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_assoc_477000"/>
+            <field name="account_collected_id" ref="pgc_assoc_477000"/>
+            <field name="base_code_id" ref="iva_assoc_dev_19"/>
+            <field name="tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_assoc_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_assoc_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- RETENCIONES DE IRPF -->
+        <!--
+        - Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
+        - Tipo general de retención IRPF al 18%. Se aplica a rendimientos por arrendamientos de inmuebles urbanos y ganancias patrimoniales sometidas a retención.
+        - Rendimientos de actividades profesionales: 15% (tipo general) y 7% (tipo especial reducido por inicio de actividad)
+        - Rendimientos de actividades agrícolas, ganaderas, forestales: 2%
+        - Retención del 1% a aplicar en el pago de rendimientos a empresarios en módulos.-->
+
+        <!-- RETENCIONES DE IRPF: Hacienda pública, acreedora por retenciones practicadas a proveedores -->
+
+        <!--Base imponible-->
+        <record id="irpf_assoc_base" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible</field>
+            <field name="code">B.IRPF</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+        </record>
+
+        <record id="irpf_assoc_base_1" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 1%</field>
+            <field name="code">B.IRPF1</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_2" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 2%</field>
+            <field name="code">B.IRPF2</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_7" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 7%</field>
+            <field name="code">B.IRPF7</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 9%</field>
+            <field name="code">B.IRPF9</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_15" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 15%</field>
+            <field name="code">B.IRPF15</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 18%</field>
+            <field name="code">B.IRPF18</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 19%</field>
+            <field name="code">B.IRPF19</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 20%</field>
+            <field name="code">B.IRPF20</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_21" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 21%</field>
+            <field name="code">B.IRPF21</field>
+            <field name="parent_id" ref="irpf_assoc_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuotas-->
+        <record id="irpf_assoc_cuota_total" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Total Cuota</field>
+            <field name="code">IRPF</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_1" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 1%</field>
+            <field name="code">IRPF1</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_2" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 2%</field>
+            <field name="code">IRPF2</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_7" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 7%</field>
+            <field name="code">IRPF7</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 9%</field>
+            <field name="code">IRPF9</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_15" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 15%</field>
+            <field name="code">IRPF15</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 18%</field>
+            <field name="code">IRPF18</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 19%</field>
+            <field name="code">IRPF19</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 20%</field>
+            <field name="code">IRPF20</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_21" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 21%</field>
+            <field name="code">IRPF21</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuentas para Retenciones-->
+        <record id="pgc_assoc_475101" model="account.account.template">
+            <field name="code">475101</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones empresarios módulos 1%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475102" model="account.account.template">
+            <field name="code">475102</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475107" model="account.account.template">
+            <field name="code">475107</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 7%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475109" model="account.account.template">
+            <field name="code">475109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475115" model="account.account.template">
+            <field name="code">475115</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 15%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475118" model="account.account.template">
+            <field name="code">475118</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475119" model="account.account.template">
+            <field name="code">475119</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475120" model="account.account.template">
+            <field name="code">475120</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_475121" model="account.account.template">
+            <field name="code">475121</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <!-- Plantillas de retenciones-->
+        <record id="irpf_assoc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 1%</field>
+            <field eval="-0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475101"/>
+            <field name="account_paid_id" ref="pgc_assoc_475101"/>
+            <field name="base_code_id" ref="irpf_assoc_base_1"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_1"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_1"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_1"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 2%</field>
+            <field eval="-0.02" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475102"/>
+            <field name="account_paid_id" ref="pgc_assoc_475102"/>
+            <field name="base_code_id" ref="irpf_assoc_base_2"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_2"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_2"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_2"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 7%</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475107"/>
+            <field name="account_paid_id" ref="pgc_assoc_475107"/>
+            <field name="base_code_id" ref="irpf_assoc_base_7"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_7"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_7"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475109"/>
+            <field name="account_paid_id" ref="pgc_assoc_475109"/>
+            <field name="base_code_id" ref="irpf_assoc_base_9"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_9"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_9"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_15" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 15%</field>
+            <field eval="-0.15" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475115"/>
+            <field name="account_paid_id" ref="pgc_assoc_475115"/>
+            <field name="base_code_id" ref="irpf_assoc_base_15"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_15"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_15"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 18%</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475118"/>
+            <field name="account_paid_id" ref="pgc_assoc_475118"/>
+            <field name="base_code_id" ref="irpf_assoc_base_18"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_18"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_18"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_19" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 19%</field>
+            <field eval="-0.19" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475119"/>
+            <field name="account_paid_id" ref="pgc_assoc_475119"/>
+            <field name="base_code_id" ref="irpf_assoc_base_19"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_19"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_19"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_19"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475120"/>
+            <field name="account_paid_id" ref="pgc_assoc_475120"/>
+            <field name="base_code_id" ref="irpf_assoc_base_20"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_20"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_20"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="irpf_assoc_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones IRPF 21%</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_475121"/>
+            <field name="account_paid_id" ref="pgc_assoc_475121"/>
+            <field name="base_code_id" ref="irpf_assoc_base_21"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_21"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_21"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- RETENCIONES DE IRPF: Hacienda pública, retenciones a cuenta como clientes -->
+
+        <!--Base imponible-->
+        <record id="irpf_assoc_base_sale" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible</field>
+            <field name="code">B.IRPF AC</field>
+            <field name="sign">1.0</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+        </record>
+
+        <record id="irpf_assoc_base_sale_1" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 1%</field>
+            <field name="code">B.IRPF1 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_2" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 2%</field>
+            <field name="code">B.IRPF2 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_7" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 7%</field>
+            <field name="code">B.IRPF7 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 9%</field>
+            <field name="code">B.IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_15" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 15%</field>
+            <field name="code">B.IRPF15 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 18%</field>
+            <field name="code">B.IRPF18 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 19%</field>
+            <field name="code">B.IRPF19 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 20%</field>
+            <field name="code">B.IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_base_sale_21" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 21%</field>
+            <field name="code">B.IRPF21 AC</field>
+            <field name="parent_id" ref="irpf_assoc_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuotas-->
+        <record id="irpf_assoc_cuota_sale_total" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Total Cuota</field>
+            <field name="code">IRPF AC</field>
+            <field name="parent_id" ref="vat_code_chart_assoc_root"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_1" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 1%</field>
+            <field name="code">IRPF1 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_2" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 2%</field>
+            <field name="code">IRPF2 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_7" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 7%</field>
+            <field name="code">IRPF7 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 9%</field>
+            <field name="code">IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_15" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 15%</field>
+            <field name="code">IRPF15 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_18" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 18%</field>
+            <field name="code">IRPF18 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_19" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 19%</field>
+            <field name="code">IRPF19 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 20%</field>
+            <field name="code">IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="irpf_assoc_cuota_sale_21" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 21%</field>
+            <field name="code">IRPF21 AC</field>
+            <field name="parent_id" ref="irpf_assoc_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <!--Cuentas para Retenciones-->
+        <record id="pgc_assoc_473001" model="account.account.template">
+            <field name="code">473001</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta empresarios módulos 1%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473002" model="account.account.template">
+            <field name="code">473002</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473007" model="account.account.template">
+            <field name="code">473007</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 7%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473009" model="account.account.template">
+            <field name="code">473009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473015" model="account.account.template">
+            <field name="code">473015</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 15%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473018" model="account.account.template">
+            <field name="code">473018</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473019" model="account.account.template">
+            <field name="code">473019</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473020" model="account.account.template">
+            <field name="code">473020</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <record id="pgc_assoc_473021" model="account.account.template">
+            <field name="code">473021</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_assoc_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
+        <!-- Plantillas de retenciones-->
+        <record id="irpf_assoc_sale_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 1%</field>
+            <field eval="-0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473001"/>
+            <field name="account_paid_id" ref="pgc_assoc_473001"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_1"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_1"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_1"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_1"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 2%</field>
+            <field eval="-0.02" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473002"/>
+            <field name="account_paid_id" ref="pgc_assoc_473002"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_2"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_2"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_2"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_2"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_7" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 7%</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473007"/>
+            <field name="account_paid_id" ref="pgc_assoc_473007"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_7"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_7"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_7"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_7"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473009"/>
+            <field name="account_paid_id" ref="pgc_assoc_473009"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_9"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_9"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_9"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_15" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 15%</field>
+            <field eval="-0.15" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473015"/>
+            <field name="account_paid_id" ref="pgc_assoc_473015"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_15"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_15"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_15"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_18" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 18%</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473018"/>
+            <field name="account_paid_id" ref="pgc_assoc_473018"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_18"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_18"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_18"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_19" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 19%</field>
+            <field eval="-0.19" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473019"/>
+            <field name="account_paid_id" ref="pgc_assoc_473019"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_19"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_19"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_19"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_19"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473020"/>
+            <field name="account_paid_id" ref="pgc_assoc_473020"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_20"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_20"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_20"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
+        <record id="irpf_assoc_sale_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_assoc"/>
+            <field name="name">Retenciones a cuenta IRPF 21%</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_assoc_473021"/>
+            <field name="account_paid_id" ref="pgc_assoc_473021"/>
+            <field name="base_code_id" ref="irpf_assoc_base_sale_21"/>
+            <field name="tax_code_id" ref="irpf_assoc_cuota_sale_21"/>
+            <field name="ref_base_code_id" ref="irpf_assoc_base_sale_21"/>
+            <field name="ref_tax_code_id" ref="irpf_assoc_cuota_sale_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_es/taxes_data_pymes.xml b/addons/l10n_es/taxes_data_pymes.xml
index 7467dbb9596..f48d46d951a 100644
--- a/addons/l10n_es/taxes_data_pymes.xml
+++ b/addons/l10n_es/taxes_data_pymes.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data noupdate="0">
 
-      <!--
-      Plantillas de impuestos para el Plan General Contable PYMES 2008.
+    <!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
+
+    <!-- Plantillas de impuestos para el Plan General Contable PYMES 2008.
 
       Basado en taxes_data.xml, con los siguientes cambios:
 
@@ -26,20 +27,25 @@
         Impuestos IRPF se les ha asignado el grupo others (Otros) en lugar del grupo vat (IVA) por defecto
 
       Jordi Esteve (Zikzakmedia) - jesteve@zikzakmedia.com (2010-02-18)
-           Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
+        Añadido IRPF 2% (act. agrícolas, ganaderas, forestales), 19% y 21% (antiguo 18%)
         Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
-      -->
 
-        <!-- Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales -->
-        
-        
+      Ignacio Ibeas (Acysos) - ignacio@acysos.com (2011-05-06)
+        Añadido Recargos de equivalencia para venta y compra
+
+      Pedro M. Baeza (Serv. Tecnol. Avanzados) - pedro.baeza@serviciosbaeza.com (2013-01-30)
+        Limpieza de subcuentas de impuestos y corrección de inversión de sujeto pasivo
+
+    -->
+
+
 <!-- Configuracion de codigos de impuesto-->
-        
-    
+
+
     <!-- *********************************************** -->
     <!--IVA DEVENGADO -->
     <!-- *********************************************** -->
-    
+
     <!--Base imponible-->
     <!-- *********************************************** -->
         <record id="iva_pymes_dev_base" model="account.tax.code.template">
@@ -48,44 +54,103 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
-        
-    
+
+    <!-- Exentas IVA -->
+        <record id="base_pymes_sop_ex" model="account.tax.code.template">
+            <field name="name">Base adquisiciones exentas</field>
+            <field name="parent_id" ref="vat_code_chart_pymes_root"/>
+            <field name="code">--</field>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="base_pymes_rep_ex" model="account.tax.code.template">
+            <field name="name">Base ventas exentas</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="vat_code_chart_pymes_root"/>
+            <field name="sign">1.0</field>
+        </record>         	
+
+        <!-- IVA Soportado -->
+        <record id="iva_pymes_sop_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA Soportado exento (operaciones corrientes)</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field name="base_code_id" ref="base_pymes_sop_ex"/>
+            <field name="ref_base_code_id" ref="base_pymes_sop_ex"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <!-- IVA REPERCUTIDO-->
+        <record id="iva_pymes_rep_ex" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA Exento</field>
+            <field eval="0.0" name="amount"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_pymes_rep_ex"/>
+            <field name="ref_base_code_id" ref="base_pymes_rep_ex"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
     <!--Régimen general-->
-         
+
         <record id="iva_pymes_dev_01" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 4%</field>
             <field name="code">[01]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_04" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 7%</field>
             <field name="code">[04]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
+
         <record id="iva_pymes_dev_04_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 8%</field>
             <field name="code">[04]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+		 <record id="iva_pymes_dev_04_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 10%</field>
+            <field name="code">[04]</field>
+            <field name="parent_id" ref="iva_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_07" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 16%</field>
             <field name="code">[07]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
+
         <record id="iva_pymes_dev_07_18" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Base Imponible 18%</field>
             <field name="code">[07]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-    
+
+        <record id="iva_pymes_dev_07_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Base Imponible 21%</field>
+            <field name="code">[07]</field>
+            <field name="parent_id" ref="iva_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_pymes_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -93,73 +158,93 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
         </record-->
-        
+
         <record id="iva_pymes_dev_10" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 0.5%</field>
             <field name="code">[10]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_13" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 1%</field>
             <field name="code">[13]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_pymes_dev_13_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 1.4%</field>
+            <field name="code">[13]</field>
+            <field name="parent_id" ref="iva_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_16" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible 4%</field>
             <field name="code">[16]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+
+        <record id="iva_pymes_dev_16_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Base Imponible 5.2%</field>
+            <field name="code">[16]</field>
+            <field name="parent_id" ref="iva_pymes_dev_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS -->
-        
+
         <record id="iva_pymes_dev_19" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias. Base Imponible</field>
             <field name="code">[19]</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
     <!--IVA devengado cuota-->
     <!-- *********************************************** -->
-    
-    
+
+
     <!--Régimen general-->
-         
-         
+
+
         <record id="iva_pymes_dev_21" model="account.tax.code.template">
             <field name="name">IVA Cuota total devengada</field>
             <field name="code">[21]</field>
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-         
+
         <record id="iva_pymes_dev_03" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 4%</field>
             <field name="code">[03]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_06" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 7%</field>
             <field name="code">[06]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_06_8" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 8%</field>
             <field name="code">[06]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+ 	<record id="iva_pymes_dev_06_10" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 10%</field>
+            <field name="code">[06]</field>
+            <field name="parent_id" ref="iva_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_09" model="account.tax.code.template">
             <field name="name">Régimen general IVA Devengado. Cuota 16%</field>
             <field name="code">[09]</field>
@@ -173,7 +258,14 @@
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-    
+
+         <record id="iva_pymes_dev_09_21" model="account.tax.code.template">
+            <field name="name">Régimen general IVA Devengado. Cuota 21%</field>
+            <field name="code">[09]</field>
+            <field name="parent_id" ref="iva_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- RECARGO DE EQUIVALENCIA -->
         <!--record id="re_base" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia Base Imponible</field>
@@ -181,47 +273,61 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="iva_pymes_dev_base"/>
         </record-->
-        
+
         <record id="iva_pymes_dev_12" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 0.5%</field>
             <field name="code">[12]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="iva_pymes_dev_15" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 1%</field>
             <field name="code">[15]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="iva_pymes_dev_15_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="iva_pymes_dev_18" model="account.tax.code.template">
             <field name="name">Recargo Equivalencia. Cuota 4%</field>
             <field name="code">[18]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+
+        <record id="iva_pymes_dev_18_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_pymes_dev_21"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
         <!-- ADQUISICIONES INTRACOMUNITARIAS -->
-        
+
         <record id="iva_pymes_dev_20" model="account.tax.code.template">
             <field name="name">Adquisiciones intracomunitarias. Cuota</field>
             <field name="code">[20]</field>
             <field name="parent_id" ref="iva_pymes_dev_21"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
-        
-        
-            
+
+
+
+
+
     <!-- *********************************************** -->
     <!--IVA DEDUCIBLE -->
     <!-- *********************************************** -->
-        
-        
+
+
     <!--IVA Soportado (Deducible) Base Imponible-->
     <!-- *********************************************** -->
         <record id="iva_pymes_ded_base_total" model="account.tax.code.template">
@@ -230,7 +336,7 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
+
         <!-- Base en OPERACIONES INTERIORES CORRIENTES-->
         <record id="iva_pymes_ded_22" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes</field>
@@ -238,19 +344,12 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_22_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (16%)</field>
+         <record id="iva_pymes_ded_22_4" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_22_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_22"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_22_7" model="account.tax.code.template">
             <field name="name">Base operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -263,13 +362,31 @@
             <field name="parent_id" ref="iva_pymes_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_22_4" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores corrientes (4%)</field>
+       <record id="iva_pymes_ded_22_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (10%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_22"/>
             <field name="sign">1.0</field>
         </record>
-        
+		<record id="iva_pymes_ded_22_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_22_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_22_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores corrientes (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_22"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Base en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_24" model="account.tax.code.template">
             <field name="name">Base operaciones interiores bienes inversión</field>
@@ -277,48 +394,79 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_24_16" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-
-        <record id="iva_pymes_ded_24_18" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-        
-        <record id="iva_pymes_ded_24_7" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (7%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-
-        <record id="iva_pymes_ded_24_8" model="account.tax.code.template">
-            <field name="name">Base operaciones interiores bienes inversión (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_24"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_24_4" model="account.tax.code.template">
             <field name="name">Base operaciones interiores bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_24"/>
             <field name="sign">1.0</field>
         </record>
-        
-        
+        <record id="iva_pymes_ded_24_7" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_24_8" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_24_10" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_24_16" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_24_18" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+         <record id="iva_pymes_ded_24_21" model="account.tax.code.template">
+            <field name="name">Base operaciones interiores bienes inversión (21%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_24"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <!-- Base EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_26" model="account.tax.code.template">
             <field name="name">Base importaciones bienes corrientes</field>
             <field name="code">[26]</field>
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
+        </record>
+         <record id="iva_pymes_ded_26_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_26_7" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_26_8" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
+        </record>
+       <record id="iva_pymes_ded_26_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_26"/>
+            <field name="sign">1.0</field>
         </record>
         <record id="iva_pymes_ded_26_16" model="account.tax.code.template">
             <field name="name">Base importaciones bienes corrientes (16%)</field>
@@ -332,26 +480,13 @@
             <field name="parent_id" ref="iva_pymes_ded_26"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_pymes_ded_26_7" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (7%)</field>
+        <record id="iva_pymes_ded_26_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_26"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_26_8" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_26"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_pymes_ded_26_4" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes corrientes (4%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_26"/>
-            <field name="sign">1.0</field>
-        </record>
-        
+
         <!-- Base EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_28" model="account.tax.code.template">
             <field name="name">Base importaciones bienes inversión</field>
@@ -359,19 +494,12 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_28_16" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (16%)</field>
+        <record id="iva_pymes_ded_28_4" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_28_18" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_28"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_28_7" model="account.tax.code.template">
             <field name="name">Base importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -384,13 +512,30 @@
             <field name="parent_id" ref="iva_pymes_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_28_4" model="account.tax.code.template">
-            <field name="name">Base importaciones bienes inversión (4%)</field>
+        <record id="iva_pymes_ded_28_10" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_28_16" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_28_18" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_28"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_28_21" model="account.tax.code.template">
+            <field name="name">Base importaciones bienes inversión (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_28"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_30" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes corrientes</field>
@@ -398,19 +543,12 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_30_16" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
+         <record id="iva_pymes_ded_30_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_30_18" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_30"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_30_7" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -423,13 +561,30 @@
             <field name="parent_id" ref="iva_pymes_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_30_4" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (4%)</field>
+        <record id="iva_pymes_ded_30_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_30_16" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_30_18" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_30"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_30_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_30"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_32" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes inversión</field>
@@ -437,6 +592,30 @@
             <field name="parent_id" ref="iva_pymes_ded_base_total"/>
             <field name="sign">1.0</field>
         </record>
+        <record id="iva_pymes_ded_32_4" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (4%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_32_7" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_32_8" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (8%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_32_10" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_32"/>
+            <field name="sign">1.0</field>
+        </record>
         <record id="iva_pymes_ded_32_16" model="account.tax.code.template">
             <field name="name">Base adquisiciones intracomunitarias bienes inversión (16%)</field>
             <field name="code">--</field>
@@ -449,31 +628,53 @@
             <field name="parent_id" ref="iva_pymes_ded_32"/>
             <field name="sign">1.0</field>
         </record>
-        
-        <record id="iva_pymes_ded_32_7" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (7%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_32"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_pymes_ded_32_8" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (8%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_32"/>
-            <field name="sign">1.0</field>
-        </record>
-        <record id="iva_pymes_ded_32_4" model="account.tax.code.template">
-            <field name="name">Base adquisiciones intracomunitarias bienes inversión (4%)</field>
+        <record id="iva_pymes_ded_32_21" model="account.tax.code.template">
+            <field name="name">Base adquisiciones intracomunitarias bienes inversión (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_32"/>
             <field name="sign">1.0</field>
         </record>
 
-        
-        
+        <!-- BASE RECARGO DE EQUIVALENCIA-->
+        <record id="iva_pymes_ded_10" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 0.5%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_ded_13" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_ded_13_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 1.4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_ded_16" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 4%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+        <record id="iva_pymes_ded_16_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Base Imponible 5.2%</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_base_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
+
     <!-- IVA DEDUCIBLE Cuotas-->
     <!-- *********************************************** -->
-    
+
         <record id="iva_pymes_ded_cuota_total" model="account.tax.code.template">
             <field name="name">IVA deducible (Cuota)- Total a deducir [Mod.303]</field>
             <field name="code">[37]</field>
@@ -488,19 +689,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_23_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+        <record id="iva_pymes_ded_23_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_23_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_23"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_23_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores corrientes (7%)</field>
             <field name="code">--</field>
@@ -513,13 +707,30 @@
             <field name="parent_id" ref="iva_pymes_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_23_4" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores corrientes (4%)</field>
+        <record id="iva_pymes_ded_23_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_23_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_23_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_23"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_23_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_23"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- Cuotas en OPERACIONES INTERIORES CON BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_25" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores bienes inversión</field>
@@ -527,19 +738,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_25_16" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+        <record id="iva_pymes_ded_25_4" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_25_18" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_25"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_25_7" model="account.tax.code.template">
             <field name="name">Cuotas soportadas operaciones interiores bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -552,13 +756,30 @@
             <field name="parent_id" ref="iva_pymes_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_25_4" model="account.tax.code.template">
-            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (4%)</field>
+        <record id="iva_pymes_ded_25_10" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_25_16" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_25_18" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_25"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_25_21" model="account.tax.code.template">
+            <field name="name">Cuotas soportadas operaciones interiores bienes inversión (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_25"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_27" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes corrientes</field>
@@ -566,19 +787,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_27_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+        <record id="iva_pymes_ded_27_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_27_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_27"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_27_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -591,13 +805,30 @@
             <field name="parent_id" ref="iva_pymes_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_27_4" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes corrientes (4%)</field>
+        <record id="iva_pymes_ded_27_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_27_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_27_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_27"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_27_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_27"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- Cuotas devengadas EN LAS IMPORTACIONES DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_29" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes inversión</field>
@@ -605,19 +836,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_29_16" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+        <record id="iva_pymes_ded_29_4" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_29_18" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_29"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_29_7" model="account.tax.code.template">
             <field name="name">Cuotas devengadas importaciones bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -630,13 +854,30 @@
             <field name="parent_id" ref="iva_pymes_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_29_4" model="account.tax.code.template">
-            <field name="name">Cuotas devengadas importaciones bienes inversión (4%)</field>
+        <record id="iva_pymes_ded_29_10" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_29_16" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_29_18" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_29"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_29_21" model="account.tax.code.template">
+            <field name="name">Cuotas devengadas importaciones bienes inversión (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_29"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES CORRIENTES-->
         <record id="iva_pymes_ded_31" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes corrientes</field>
@@ -644,19 +885,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_31_16" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
+        <record id="iva_pymes_ded_31_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_31_18" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_31"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_31_7" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes corrientes (7%)</field>
             <field name="code">--</field>
@@ -669,13 +903,30 @@
             <field name="parent_id" ref="iva_pymes_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_31_4" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes corrientes (4%)</field>
+        <record id="iva_pymes_ded_31_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_31_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_31_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_31"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_31_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes corrientes (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_31"/>
             <field name="sign">1.0</field>
         </record>
-        
         <!-- ADQUISICIONES INTRACOMUNITARIAS DE BIENES DE INVERSIÓN-->
         <record id="iva_pymes_ded_33" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes inversión</field>
@@ -683,19 +934,12 @@
             <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_33_16" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+        <record id="iva_pymes_ded_33_4" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (4%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_33_18" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
-            <field name="code">--</field>
-            <field name="parent_id" ref="iva_pymes_ded_33"/>
-            <field name="sign">1.0</field>
-        </record>
-        
         <record id="iva_pymes_ded_33_7" model="account.tax.code.template">
             <field name="name">En adquisiciones intracomunitarias bienes inversión (7%)</field>
             <field name="code">--</field>
@@ -708,13 +952,30 @@
             <field name="parent_id" ref="iva_pymes_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-        <record id="iva_pymes_ded_33_4" model="account.tax.code.template">
-            <field name="name">En adquisiciones intracomunitarias bienes inversión (4%)</field>
+        <record id="iva_pymes_ded_33_10" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (10%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+		<record id="iva_pymes_ded_33_16" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (16%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_33_18" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (18%)</field>
+            <field name="code">--</field>
+            <field name="parent_id" ref="iva_pymes_ded_33"/>
+            <field name="sign">1.0</field>
+        </record>
+        <record id="iva_pymes_ded_33_21" model="account.tax.code.template">
+            <field name="name">En adquisiciones intracomunitarias bienes inversión (21%)</field>
             <field name="code">--</field>
             <field name="parent_id" ref="iva_pymes_ded_33"/>
             <field name="sign">1.0</field>
         </record>
-
         <!--Otros Códigos de Impuestos-->
         <record id="base_pymes_intra_42" model="account.tax.code.template">
             <field name="name">Entregas Intracomunitarias</field>
@@ -737,109 +998,42 @@
             <field name="sign">1.0</field>
         </record>
 
-<!-- ********************************* -->
-<!--Cuentas para IVA-->
-<!-- ********************************* -->
+        <!--Cuota Recargo de Equivalencia-->
+        <record id="iva_pymes_ded_12" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 0.5%</field>
+            <field name="code">[12]</field>
+            <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
 
-        <record id="pgc_pymes_472004" model="account.account.template">
-            <field name="code">472004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 4%</field>
-            <field name="user_type" ref="tax"/>
+        <record id="iva_pymes_ded_15" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472007" model="account.account.template">
-            <field name="code">472007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 7%</field>
-            <field name="user_type" ref="tax"/>
+
+        <record id="iva_pymes_ded_15_14" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 1.4%</field>
+            <field name="code">[15]</field>
+            <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472008" model="account.account.template">
-            <field name="code">472008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 8%</field>
-            <field name="user_type" ref="tax"/>
+
+        <record id="iva_pymes_ded_18" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 4%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472016" model="account.account.template">
-            <field name="code">472016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 16%</field>
-            <field name="user_type" ref="tax"/>
+
+        <record id="iva_pymes_ded_18_52" model="account.tax.code.template">
+            <field name="name">Recargo Equivalencia Ded. Cuota 5.2%</field>
+            <field name="code">[18]</field>
+            <field name="parent_id" ref="iva_pymes_ded_cuota_total"/>
+            <field name="sign">1.0</field>
         </record>
-        
-        <record id="pgc_pymes_472018" model="account.account.template">
-            <field name="code">472018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_472"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA soportado 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477004" model="account.account.template">
-            <field name="code">477004</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 4%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477007" model="account.account.template">
-            <field name="code">477007</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 7%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        <record id="pgc_pymes_477008" model="account.account.template">
-            <field name="code">477008</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 8%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477016" model="account.account.template">
-            <field name="code">477016</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 16%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_477018" model="account.account.template">
-            <field name="code">477018</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_477"/>
-            <field name="type">other</field>
-            <field name="name">Hacienda Pública. IVA repercutido 18%</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        <record id="pgc_pymes_475001" model="account.account.template">
-            <field name="code">475001</field>
-            <field name="reconcile" eval="True"/>
-            <field name="parent_id" ref="pgc_pymes_4750"/>
-            <field name="type">payable</field>
-            <field name="name">Hacienda acreedora IVA</field>
-            <field name="user_type" ref="tax"/>
-        </record>
-        
-        
+
 <!-- ********************************* -->
 <!-- Plantillas de Impuestos IVA       -->
 <!-- ********************************* -->
@@ -851,8 +1045,8 @@
             <field name="name">4% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_4"/>
@@ -863,14 +1057,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_4_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">4% IVA Soportado (bienes de inversión)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_4"/>
@@ -881,14 +1075,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">7% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_7"/>
@@ -899,14 +1093,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_7_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">7% IVA Soportado (bienes de inversión)</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_7"/>
@@ -917,14 +1111,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">8% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_8"/>
@@ -935,14 +1129,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_8_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">8% IVA Soportado (bienes de inversión)</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_8"/>
@@ -953,14 +1147,50 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+		<record id="iva_pymes_sop_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">10% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_22_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_23_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_22_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_23_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_sop_10_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">10% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_24_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_25_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_24_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_25_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="iva_pymes_sop_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">16% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_16"/>
@@ -971,14 +1201,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_16_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">16% IVA Soportado (bienes de inversión)</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_16"/>
@@ -989,14 +1219,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_sop_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">18% IVA Soportado (operaciones corrientes)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_18"/>
@@ -1006,15 +1236,16 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
+            <field eval="0" name="sequence"/>
         </record>
-        
+
         <record id="iva_pymes_sop_18_inv" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">18% IVA Soportado (bienes de inversión)</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_24_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_25_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_24_18"/>
@@ -1025,7 +1256,44 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+ 		<record id="iva_pymes_sop_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">21% IVA Soportado (operaciones corrientes)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
+        <record id="iva_pymes_sop_21_inv" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">21% IVA Soportado (bienes de inversión)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_24_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_25_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_24_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_25_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- Plantillas para Extracomunitario-->
         <!-- IVA compras -->
         <record id="iva_pymes_X0_compras_bc" model="account.tax.template">
@@ -1056,15 +1324,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_X4_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 4% Importaciones bienes corrientes</field>
             <field name="description">IVA 4% Importaciones bienes corrientes</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_4"/>
@@ -1081,8 +1349,8 @@
             <field name="description">IVA 4% Importaciones bienes de inversión</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_4"/>
@@ -1093,15 +1361,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-         
+
         <record id="iva_pymes_X7_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 7% Importaciones bienes corrientes</field>
             <field name="description">IVA 7% Importaciones bienes corrientes</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_7"/>
@@ -1118,8 +1386,8 @@
             <field name="description">IVA 7% Importaciones bienes de inversión</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_7"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_7"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_7"/>
@@ -1130,15 +1398,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_X8_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 8% Importaciones bienes corrientes</field>
             <field name="description">IVA 8% Importaciones bienes corrientes</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_8"/>
@@ -1155,8 +1423,8 @@
             <field name="description">IVA 8% Importaciones bienes de inversión</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_8"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_8"/>
@@ -1167,15 +1435,52 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="iva_pymes_X10_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Importaciones bienes corrientes</field>
+            <field name="description">IVA 10% Importaciones bienes corrientes</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_26_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_27_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_26_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_27_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_X10_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Importaciones bienes de inversión</field>
+            <field name="description">IVA 10% Importaciones bienes de inversión</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_28_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_29_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_28_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_29_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="iva_pymes_X16_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 16% Importaciones bienes corrientes</field>
             <field name="description">IVA 16% Importaciones bienes corrientes</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_16"/>
@@ -1192,8 +1497,8 @@
             <field name="description">IVA 16% Importaciones bienes de inversión</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_16"/>
@@ -1204,15 +1509,15 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_X18_compras_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 18% Importaciones bienes corrientes</field>
             <field name="description">IVA 18% Importaciones bienes corrientes</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_26_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_27_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_26_18"/>
@@ -1229,8 +1534,8 @@
             <field name="description">IVA 18% Importaciones bienes de inversión</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_28_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_29_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_28_18"/>
@@ -1241,7 +1546,42 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+        <record id="iva_pymes_X21_compras_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Importaciones bienes corrientes</field>
+            <field name="description">IVA 21% Importaciones bienes corrientes</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_26_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_27_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_26_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_27_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_X21_compras_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Importaciones bienes de inversión</field>
+            <field name="description">IVA 21% Importaciones bienes de inversión</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_28_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_29_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_28_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_29_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
 
         <!-- IVA EXPORTACIONES (VENTAS )-->
         <record id="iva_pymes_X0" model="account.tax.template">
@@ -1255,7 +1595,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
          <!-- Inversión del sujeto pasivo -->
         <record id="iva_pymes_ISP_compras_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -1290,16 +1630,16 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_16"/>
             <field name="amount" eval="-0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07"/>
             <field name="ref_tax_code_id" ref="iva_pymes_dev_09"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_pymes_ISP_compras_16_3" model="account.tax.template">
@@ -1308,8 +1648,8 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_16"/>
             <field name="amount" eval="0.16"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_16"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_16"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_16"/>
@@ -1320,7 +1660,7 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="iva_pymes_ISP_compras_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 18% Inversión del sujeto pasivo</field>
@@ -1354,16 +1694,16 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_18"/>
             <field name="amount" eval="-0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07_18"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07_18"/>
             <field name="ref_tax_code_id" ref="iva_pymes_dev_09_18"/>
             <field name="tax_sign" eval="-1.0"/>
-            <field name="base_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
             <field name="ref_tax_sign" eval="1.0"/>
-            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="iva_pymes_ISP_compras_18_3" model="account.tax.template">
@@ -1372,8 +1712,8 @@
             <field name="parent_id" ref="iva_pymes_ISP_compras_18"/>
             <field name="amount" eval="0.18"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_22_18"/>
             <field name="tax_code_id" ref="iva_pymes_ded_23_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_22_18"/>
@@ -1384,15 +1724,79 @@
             <field name="ref_base_sign" eval="-1.0"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+<record id="iva_pymes_ISP_compras_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="description">IVA 21% Inversión del sujeto pasivo</field>
+            <field name="amount" eval="1.00"/>
+            <field name="type">percent</field>
+            <field name="child_depend" eval="1"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_ISP_compras_21_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (1)</field>
+            <field name="parent_id" ref="iva_pymes_ISP_compras_21"/>
+            <field name="amount" eval="0.00"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="base_pymes_extra_44"/>
+            <field name="ref_base_code_id" ref="base_pymes_extra_44"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_ISP_compras_21_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (2)</field>
+            <field name="parent_id" ref="iva_pymes_ISP_compras_21"/>
+            <field name="amount" eval="-0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_ISP_compras_21_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Inversión del sujeto pasivo (3)</field>
+            <field name="parent_id" ref="iva_pymes_ISP_compras_21"/>
+            <field name="amount" eval="0.21"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_22_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_23_21"/>
+            <field name="tax_sign" eval="1.0"/>
+            <field name="base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="-1.0"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
         <!-- IVA REPERCUTIDO-->
         <record id="iva_pymes_rep_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 4%</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477004"/>
-            <field name="account_paid_id" ref="pgc_pymes_477004"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_01"/>
             <field name="tax_code_id" ref="iva_pymes_dev_03"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_01"/>
@@ -1403,14 +1807,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_pymes_rep_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 7%</field>
             <field eval="0.07" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477007"/>
-            <field name="account_paid_id" ref="pgc_pymes_477007"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_04"/>
             <field name="tax_code_id" ref="iva_pymes_dev_06"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_04"/>
@@ -1421,14 +1825,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_pymes_rep_8" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 8%</field>
             <field eval="0.08" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477008"/>
-            <field name="account_paid_id" ref="pgc_pymes_477008"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_04_8"/>
             <field name="tax_code_id" ref="iva_pymes_dev_06_8"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_04_8"/>
@@ -1439,14 +1843,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="iva_pymes_rep_10" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10%</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_04_10"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_06_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_04_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_06_10"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="iva_pymes_rep_16" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 16%</field>
             <field eval="0.16" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07"/>
@@ -1457,14 +1879,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="iva_pymes_rep_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">IVA 18%</field>
             <field eval="0.18" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_07_18"/>
             <field name="tax_code_id" ref="iva_pymes_dev_09_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_07_18"/>
@@ -1474,17 +1896,36 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
         </record>
-        
-        
+
+		<record id="iva_pymes_rep_21" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21%</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_07_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_09_21"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+            <field eval="0" name="sequence"/>
+        </record>
+
         <!-- Plantillas para recargo de equivalencia-->
         <record id="re_pymes_05" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">0.50% Recargo Equivalencia</field>
+            <field name="name">0.50% Recargo Equivalencia Ventas</field>
             <field eval="0.005" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_475001"/>
-            <field name="account_paid_id" ref="pgc_pymes_475001"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_10"/>
             <field name="tax_code_id" ref="iva_pymes_dev_12"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_10"/>
@@ -1495,14 +1936,14 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="re_pymes_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">1% Recargo Equivalencia</field>
+            <field name="name">1% Recargo Equivalencia Ventas</field>
             <field eval="0.01" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_475001"/>
-            <field name="account_paid_id" ref="pgc_pymes_475001"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_13"/>
             <field name="tax_code_id" ref="iva_pymes_dev_15"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_13"/>
@@ -1513,14 +1954,32 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="re_pymes_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">1.4% Recargo Equivalencia Ventas</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_13_14"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_15_14"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="re_pymes_4" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">4% Recargo Equivalencia</field>
+            <field name="name">4% Recargo Equivalencia Ventas</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="pgc_pymes_475001"/>
-            <field name="account_paid_id" ref="pgc_pymes_475001"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_16"/>
             <field name="tax_code_id" ref="iva_pymes_dev_18"/>
             <field name="ref_base_code_id" ref="iva_pymes_dev_16"/>
@@ -1531,10 +1990,117 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+        <record id="re_pymes_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">5.2% Recargo Equivalencia Ventas</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_16_52"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_18_52"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+        <record id="re_pymes_buy_05" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">0.50% Recargo Equivalencia Compras</field>
+            <field eval="0.005" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_12"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_10"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_12"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">1% Recargo Equivalencia Compras</field>
+            <field eval="0.01" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_13"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_15"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_13"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_15"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_14" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">1.4% Recargo Equivalencia Compras</field>
+            <field eval="0.014" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_13_14"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_15_14"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_13_14"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_15_14"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_4" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">4% Recargo Equivalencia Compras</field>
+            <field eval="0.04" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_16"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_18"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_16"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_18"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="re_pymes_buy_52" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">5.2% Recargo Equivalencia Compras</field>
+            <field eval="0.052" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_16_52"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_18_52"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_16_52"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_18_52"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
 <!-- OPERACIONES INTRACOMUNITARIAS -->
-        
+
         <!-- VENTAS -->
         <record id="iva_pymes_IO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -1548,365 +2114,9 @@
             <field eval="-1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
-        
+
+
         <!-- COMPRAS -->
-        <record id="iva_pymes_IC_compras_16_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_16"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_16"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_16"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_pymes_IC_compras_18_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_18"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_18"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_18"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="vat_IO_buy_21b"/>
-            <field name="name">Biens Déductibles 21% (3)</field>
-            <field eval="0.00" name="amount"/>
-            <field name="type">percent</field>
-            <field name="ref_base_code_id" ref="vat_code_a86"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record-->
-<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
-
-        <record id="iva_pymes_IC_compras_16_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472016"/>
-            <field name="account_collected_id" ref="pgc_pymes_472016"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_16"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_16"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_16"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_16"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_16_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
-            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.16" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477016"/>
-            <field name="account_collected_id" ref="pgc_pymes_477016"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_pymes_IC_compras_18_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472018"/>
-            <field name="account_collected_id" ref="pgc_pymes_472018"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_18"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_18"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_18"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_18"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_18_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
-            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.18" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477018"/>
-            <field name="account_collected_id" ref="pgc_pymes_477018"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_pymes_IC_compras_7_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_7"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_7"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477007"/>
-            <field name="account_collected_id" ref="pgc_pymes_477007"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_pymes_IC_compras_7_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472007"/>
-            <field name="account_collected_id" ref="pgc_pymes_472007"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_7"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_7"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_7"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_7"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_7_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
-            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.07" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477007"/>
-            <field name="account_collected_id" ref="pgc_pymes_477007"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        
-        <record id="iva_pymes_IC_compras_8_bc" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bc_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="base_code_id" ref="iva_pymes_ded_30_8"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_31_8"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_30_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bc_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477008"/>
-            <field name="account_collected_id" ref="pgc_pymes_477008"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-
-        <record id="iva_pymes_IC_compras_8_bi" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="1" name="child_depend"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bi_1" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
-            <field eval="0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472008"/>
-            <field name="account_collected_id" ref="pgc_pymes_472008"/>
-            <field name="base_code_id" ref="iva_pymes_ded_32_8"/>
-            <field name="tax_code_id" ref="iva_pymes_ded_33_8"/>
-            <field name="ref_base_code_id" ref="iva_pymes_ded_32_8"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_8"/>
-            <field eval="-1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="iva_pymes_IC_compras_8_bi_2" model="account.tax.template">
-            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
-            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
-            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
-            <field eval="-0.08" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477008"/>
-            <field name="account_collected_id" ref="pgc_pymes_477008"/>
-            <field name="base_code_id" ref="iva_pymes_dev_19"/>
-            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="-1.0" name="tax_sign"/>
-            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
-            <field eval="-1.0" name="ref_base_sign"/>
-            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
-            <field eval="1.0" name="ref_tax_sign"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
 
         <record id="iva_pymes_IC_compras_4_bc" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -1923,8 +2133,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_30_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_31_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_30_4"/>
@@ -1939,8 +2149,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes corrientes (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477004"/>
-            <field name="account_collected_id" ref="pgc_pymes_477004"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_19"/>
             <field name="tax_code_id" ref="iva_pymes_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1966,8 +2176,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (1)</field>
             <field eval="0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_472004"/>
-            <field name="account_collected_id" ref="pgc_pymes_472004"/>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
             <field name="base_code_id" ref="iva_pymes_ded_32_4"/>
             <field name="tax_code_id" ref="iva_pymes_ded_33_4"/>
             <field name="ref_base_code_id" ref="iva_pymes_ded_32_4"/>
@@ -1982,8 +2192,8 @@
             <field name="name">IVA 4% Intracomunitario. Bienes de inversión (2)</field>
             <field eval="-0.04" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_paid_id" ref="pgc_pymes_477004"/>
-            <field name="account_collected_id" ref="pgc_pymes_477004"/>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
             <field name="base_code_id" ref="iva_pymes_dev_19"/>
             <field name="tax_code_id" ref="iva_pymes_dev_20"/>
             <field eval="-1.0" name="tax_sign"/>
@@ -1993,7 +2203,539 @@
             <field eval="1.0" name="ref_tax_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+        <record id="iva_pymes_IC_compras_7_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_7_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_7"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_7"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_7_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bc"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_7_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 7% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_7_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_7"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_7"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_7"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_7"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_7_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_7_bi"/>
+            <field name="name">IVA 7% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.07" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_8_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_8"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_8"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bc"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_8_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 8% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_8"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_8"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_8"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_8_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_8_bi"/>
+            <field name="name">IVA 8% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.08" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_10_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_8"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bc"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_10_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 10% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_10"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_10"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_10"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_10"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_10_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_10_bi"/>
+            <field name="name">IVA 10% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.10" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_16_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_16"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_16"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_16"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bc"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_16_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 16% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_16"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_16"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_16"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_16"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_16_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_16_bi"/>
+            <field name="name">IVA 16% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.16" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+        <record id="iva_pymes_IC_compras_18_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_18"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_18"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_18"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bc"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <!--record id="vat_IO_buy_21b_3" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="vat_IO_buy_21b"/>
+            <field name="name">Biens Déductibles 21% (3)</field>
+            <field eval="0.00" name="amount"/>
+            <field name="type">percent</field>
+            <field name="ref_base_code_id" ref="vat_code_a86"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record-->
+<!-- ES NECESARIO ESTE ÚLTIMO REGISTRO????-->
+
+		<record id="iva_pymes_IC_compras_18_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 18% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_18"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_18"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_18"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_18"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_18_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_18_bi"/>
+            <field name="name">IVA 18% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.18" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+
+		<record id="iva_pymes_IC_compras_21_bc" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes corrientes</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bc_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_30_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_31_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_30_21"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_31_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bc_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bc"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes corrientes (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <!--ATENCIÓN AQUÍ CON LOS SIGNOS. PENDIENTE DE PRUEBA EN PROFUNDIDAD-->
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
+		<record id="iva_pymes_IC_compras_21_bi" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field name="description">IVA 21% Intracomunitario. Bienes de inversión</field>
+            <field eval="1.00" name="amount"/>
+            <field name="type">percent</field>
+            <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bi_1" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (1)</field>
+            <field eval="0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_472000"/>
+            <field name="account_collected_id" ref="pgc_pymes_472000"/>
+            <field name="base_code_id" ref="iva_pymes_ded_32_21"/>
+            <field name="tax_code_id" ref="iva_pymes_ded_33_21"/>
+            <field name="ref_base_code_id" ref="iva_pymes_ded_32_21"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_ded_33_21"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+        <record id="iva_pymes_IC_compras_21_bi_2" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="parent_id" ref="iva_pymes_IC_compras_21_bi"/>
+            <field name="name">IVA 21% Intracomunitario. Bienes de inversión (2)</field>
+            <field eval="-0.21" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_paid_id" ref="pgc_pymes_477000"/>
+            <field name="account_collected_id" ref="pgc_pymes_477000"/>
+            <field name="base_code_id" ref="iva_pymes_dev_19"/>
+            <field name="tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="-1.0" name="tax_sign"/>
+            <field name="ref_base_code_id" ref="iva_pymes_dev_19"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="ref_tax_code_id" ref="iva_pymes_dev_20"/>
+            <field eval="1.0" name="ref_tax_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <!-- RETENCIONES DE IRPF -->
         <!--
         - Novedad 2010: Los rendimientos derivados de rentas de capital mobiliario o inmobiliario, el tipo base de retención pasa del 18% al 19% para los primeros 6000 EUR y al 21% a partir de los 6000 EUR.
@@ -2001,9 +2743,9 @@
         - Rendimientos de actividades profesionales: 15% (tipo general) y 7% (tipo especial reducido por inicio de actividad)
         - Rendimientos de actividades agrícolas, ganaderas, forestales: 2%
         - Retención del 1% a aplicar en el pago de rendimientos a empresarios en módulos.-->
-        
+
         <!-- RETENCIONES DE IRPF: Hacienda pública, acreedora por retenciones practicadas a proveedores -->
-        
+
         <!--Base imponible-->
         <record id="irpf_pymes_base" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible</field>
@@ -2011,56 +2753,70 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
+
         <record id="irpf_pymes_base_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 1%</field>
             <field name="code">B.IRPF1</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 2%</field>
             <field name="code">B.IRPF2</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 7%</field>
             <field name="code">B.IRPF7</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_base_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 9%</field>
+            <field name="code">B.IRPF9</field>
+            <field name="parent_id" ref="irpf_pymes_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_base_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 15%</field>
             <field name="code">B.IRPF15</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 18%</field>
             <field name="code">B.IRPF18</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 19%</field>
             <field name="code">B.IRPF19</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_base_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Base Imponible 20%</field>
+            <field name="code">B.IRPF20</field>
+            <field name="parent_id" ref="irpf_pymes_base"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_base_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Base Imponible 21%</field>
             <field name="code">B.IRPF21</field>
             <field name="parent_id" ref="irpf_pymes_base"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuotas-->
         <record id="irpf_pymes_cuota_total" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Total Cuota</field>
@@ -2068,56 +2824,70 @@
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 1%</field>
             <field name="code">IRPF1</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 2%</field>
             <field name="code">IRPF2</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 7%</field>
             <field name="code">IRPF7</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_cuota_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 9%</field>
+            <field name="code">IRPF9</field>
+            <field name="parent_id" ref="irpf_pymes_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_cuota_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 15%</field>
             <field name="code">IRPF15</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 18%</field>
             <field name="code">IRPF18</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 19%</field>
             <field name="code">IRPF19</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_cuota_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones practicadas Cuota 20%</field>
+            <field name="code">IRPF20</field>
+            <field name="parent_id" ref="irpf_pymes_cuota_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_cuota_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones practicadas Cuota 21%</field>
             <field name="code">IRPF21</field>
             <field name="parent_id" ref="irpf_pymes_cuota_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuentas para Retenciones-->
         <record id="pgc_pymes_475101" model="account.account.template">
             <field name="code">475101</field>
@@ -2127,7 +2897,7 @@
             <field name="name">Hacienda Pública. Retenciones empresarios módulos 1%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475102" model="account.account.template">
             <field name="code">475102</field>
             <field name="reconcile" eval="True"/>
@@ -2136,7 +2906,7 @@
             <field name="name">Hacienda Pública. Retenciones act. agrícolas, ganaderas, forestales 2%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475107" model="account.account.template">
             <field name="code">475107</field>
             <field name="reconcile" eval="True"/>
@@ -2145,7 +2915,16 @@
             <field name="name">Hacienda Pública. Retenciones act. profesionales 7%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_475109" model="account.account.template">
+            <field name="code">475109</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_475115" model="account.account.template">
             <field name="code">475115</field>
             <field name="reconcile" eval="True"/>
@@ -2154,7 +2933,7 @@
             <field name="name">Hacienda Pública. Retenciones act. profesionales 15%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475118" model="account.account.template">
             <field name="code">475118</field>
             <field name="reconcile" eval="True"/>
@@ -2163,7 +2942,7 @@
             <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 18%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_475119" model="account.account.template">
             <field name="code">475119</field>
             <field name="reconcile" eval="True"/>
@@ -2172,7 +2951,16 @@
             <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 19%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_475120" model="account.account.template">
+            <field name="code">475120</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_4751"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_475121" model="account.account.template">
             <field name="code">475121</field>
             <field name="reconcile" eval="True"/>
@@ -2181,7 +2969,7 @@
             <field name="name">Hacienda Pública. Retenciones arrendamientos, cap. mobiliario 21%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <!-- Plantillas de retenciones-->
         <record id="irpf_pymes_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -2200,7 +2988,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_pymes_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 2%</field>
@@ -2218,7 +3006,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_pymes_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 7%</field>
@@ -2236,7 +3024,25 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
+        <record id="irpf_pymes_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_475109"/>
+            <field name="account_paid_id" ref="pgc_pymes_475109"/>
+            <field name="base_code_id" ref="irpf_pymes_base_9"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_9"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_9"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_pymes_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 15%</field>
@@ -2254,7 +3060,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="irpf_pymes_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 18%</field>
@@ -2272,7 +3078,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-                
+
         <record id="irpf_pymes_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 19%</field>
@@ -2291,6 +3097,24 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
+        <record id="irpf_pymes_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_475120"/>
+            <field name="account_paid_id" ref="pgc_pymes_475120"/>
+            <field name="base_code_id" ref="irpf_pymes_base_20"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_20"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_20"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
+        </record>
+
         <record id="irpf_pymes_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones IRPF 21%</field>
@@ -2308,9 +3132,9 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <!-- RETENCIONES DE IRPF: Hacienda pública, retenciones a cuenta como clientes -->
-        
+
         <!--Base imponible-->
         <record id="irpf_pymes_base_sale" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible</field>
@@ -2318,56 +3142,70 @@
             <field name="sign">1.0</field>
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
         </record>
-        
+
         <record id="irpf_pymes_base_sale_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 1%</field>
             <field name="code">B.IRPF1 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_sale_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 2%</field>
             <field name="code">B.IRPF2 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_sale_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 7%</field>
             <field name="code">B.IRPF7 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_base_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 9%</field>
+            <field name="code">B.IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_pymes_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_base_sale_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 15%</field>
             <field name="code">B.IRPF15 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_sale_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 18%</field>
             <field name="code">B.IRPF18 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_base_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 19%</field>
             <field name="code">B.IRPF19 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_base_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Base Imponible 20%</field>
+            <field name="code">B.IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_pymes_base_sale"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_base_sale_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Base Imponible 21%</field>
             <field name="code">B.IRPF21 AC</field>
             <field name="parent_id" ref="irpf_pymes_base_sale"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuotas-->
         <record id="irpf_pymes_cuota_sale_total" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Total Cuota</field>
@@ -2375,56 +3213,70 @@
             <field name="parent_id" ref="vat_code_chart_pymes_root"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_sale_1" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 1%</field>
             <field name="code">IRPF1 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_sale_2" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 2%</field>
             <field name="code">IRPF2 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_sale_7" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 7%</field>
             <field name="code">IRPF7 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_cuota_sale_9" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 9%</field>
+            <field name="code">IRPF9 AC</field>
+            <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_cuota_sale_15" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 15%</field>
             <field name="code">IRPF15 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_sale_18" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 18%</field>
             <field name="code">IRPF18 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <record id="irpf_pymes_cuota_sale_19" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 19%</field>
             <field name="code">IRPF19 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
+        <record id="irpf_pymes_cuota_sale_20" model="account.tax.code.template">
+            <field name="name">IRPF Retenciones a cuenta Cuota 20%</field>
+            <field name="code">IRPF20 AC</field>
+            <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
+            <field name="sign">1.0</field>
+        </record>
+
         <record id="irpf_pymes_cuota_sale_21" model="account.tax.code.template">
             <field name="name">IRPF Retenciones a cuenta Cuota 21%</field>
             <field name="code">IRPF21 AC</field>
             <field name="parent_id" ref="irpf_pymes_cuota_sale_total"/>
             <field name="sign">1.0</field>
         </record>
-        
+
         <!--Cuentas para Retenciones-->
         <record id="pgc_pymes_473001" model="account.account.template">
             <field name="code">473001</field>
@@ -2434,7 +3286,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta empresarios módulos 1%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473002" model="account.account.template">
             <field name="code">473002</field>
             <field name="reconcile" eval="True"/>
@@ -2443,7 +3295,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta act. agrícolas, ganaderas, forestales 2%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473007" model="account.account.template">
             <field name="code">473007</field>
             <field name="reconcile" eval="True"/>
@@ -2452,7 +3304,16 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 7%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_473009" model="account.account.template">
+            <field name="code">473009</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 9%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_473015" model="account.account.template">
             <field name="code">473015</field>
             <field name="reconcile" eval="True"/>
@@ -2461,7 +3322,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta act. profesionales 15%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473018" model="account.account.template">
             <field name="code">473018</field>
             <field name="reconcile" eval="True"/>
@@ -2470,7 +3331,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 18%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <record id="pgc_pymes_473019" model="account.account.template">
             <field name="code">473019</field>
             <field name="reconcile" eval="True"/>
@@ -2479,7 +3340,16 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 19%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
+        <record id="pgc_pymes_473020" model="account.account.template">
+            <field name="code">473020</field>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="pgc_pymes_473"/>
+            <field name="type">other</field>
+            <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 20%</field>
+            <field name="user_type" ref="tax"/>
+        </record>
+
         <record id="pgc_pymes_473021" model="account.account.template">
             <field name="code">473021</field>
             <field name="reconcile" eval="True"/>
@@ -2488,7 +3358,7 @@
             <field name="name">Hacienda Pública. Retenciones a cuenta arrendamientos, cap. mobiliario 21%</field>
             <field name="user_type" ref="tax"/>
         </record>
-        
+
         <!-- Plantillas de retenciones-->
         <record id="irpf_pymes_sale_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
@@ -2507,7 +3377,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 2%</field>
@@ -2525,7 +3395,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_7" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 7%</field>
@@ -2543,7 +3413,25 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_pymes_sale_9" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones a cuenta IRPF 9%</field>
+            <field eval="-0.09" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_473009"/>
+            <field name="account_paid_id" ref="pgc_pymes_473009"/>
+            <field name="base_code_id" ref="irpf_pymes_base_sale_9"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_sale_9"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_sale_9"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_sale_9"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_pymes_sale_15" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 15%</field>
@@ -2561,7 +3449,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_18" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 18%</field>
@@ -2579,7 +3467,7 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="irpf_pymes_sale_19" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 19%</field>
@@ -2597,7 +3485,25 @@
             <field eval="-1.0" name="ref_base_sign"/>
             <field name="type_tax_use">sale</field>
         </record>
-        
+
+        <record id="irpf_pymes_sale_20" model="account.tax.template">
+            <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
+            <field name="name">Retenciones a cuenta IRPF 20%</field>
+            <field eval="-0.20" name="amount"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="pgc_pymes_473020"/>
+            <field name="account_paid_id" ref="pgc_pymes_473020"/>
+            <field name="base_code_id" ref="irpf_pymes_base_sale_20"/>
+            <field name="tax_code_id" ref="irpf_pymes_cuota_sale_20"/>
+            <field name="ref_base_code_id" ref="irpf_pymes_base_sale_20"/>
+            <field name="ref_tax_code_id" ref="irpf_pymes_cuota_sale_20"/>
+            <field eval="1.0" name="tax_sign"/>
+            <field eval="1.0" name="base_sign"/>
+            <field eval="-1.0" name="ref_tax_sign"/>
+            <field eval="-1.0" name="ref_base_sign"/>
+            <field name="type_tax_use">sale</field>
+        </record>
+
         <record id="irpf_pymes_sale_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nES_chart_template_pymes"/>
             <field name="name">Retenciones a cuenta IRPF 21%</field>
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index 8d5728e334e..592068eedda 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index e1d4b9ac334..9a563eeb197 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 {
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index c995b44a614..676121b4292 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -33,7 +33,6 @@ class l10n_fr_report(osv.osv):
         ('code_uniq', 'unique (code)','The code report must be unique !')
     ]
 
-l10n_fr_report()
 
 class l10n_fr_line(osv.osv):
     _name = 'l10n.fr.line'
@@ -48,7 +47,6 @@ class l10n_fr_line(osv.osv):
         ('code_uniq', 'unique (code)', 'The variable name must be unique !')
     ]
 
-l10n_fr_line()
 
 class res_company(osv.osv):
     _inherit = 'res.company'
@@ -58,6 +56,5 @@ class res_company(osv.osv):
         'ape': fields.char('APE', size=64),
     }
 
-res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/l10n_fr_view.xml b/addons/l10n_fr/l10n_fr_view.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr/report/__init__.py b/addons/l10n_fr/report/__init__.py
index 9907a2f5765..c73179a9023 100644
--- a/addons/l10n_fr/report/__init__.py
+++ b/addons/l10n_fr/report/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 39a18bc7ca4..bc2cd308bf8 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py
index a7947434da0..2ffbd24cc4f 100644
--- a/addons/l10n_fr/report/bilan_report.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py
index 9a1809fd7cc..5eb62d7e82d 100644
--- a/addons/l10n_fr/report/compute_resultant_report.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/wizard/__init__.py b/addons/l10n_fr/wizard/__init__.py
index 6e29471a975..1bbaf351ea4 100644
--- a/addons/l10n_fr/wizard/__init__.py
+++ b/addons/l10n_fr/wizard/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index 90e97389eed..e7ae542fa3f 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
@@ -52,6 +52,5 @@ class account_bilan_report(osv.osv_memory):
         data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data}
 
-account_bilan_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index eff52189bc9..c83f7494d4a 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
@@ -52,6 +52,5 @@ class account_cdr_report(osv.osv_memory):
         data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.compute_resultant', 'datas': data}
 
-account_cdr_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_hr_payroll/__init__.py b/addons/l10n_fr_hr_payroll/__init__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
index 0519fd86a47..ec17792dacd 100644
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
@@ -34,7 +34,6 @@ class res_company(osv.osv):
         'conv_coll': fields.char('Convention collective', size=64),
     }
 
-res_company()
 
 class hr_contract(osv.osv):
     _inherit = 'hr.contract'
@@ -44,7 +43,6 @@ class hr_contract(osv.osv):
         'niveau': fields.char('Niveau', size=64),
         'coef': fields.char('Coefficient', size=64),
     }
-hr_contract()
 
 class hr_payslip(osv.osv):
     _inherit = 'hr.payslip'
@@ -52,6 +50,5 @@ class hr_payslip(osv.osv):
     _columns = {
         'payment_mode': fields.char('Mode de paiement', size=64),
     }
-hr_payslip()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_fr_hr_payroll/report/__init__.py b/addons/l10n_fr_hr_payroll/report/__init__.py
index 40d2ccc3c05..d6c9481579e 100644
--- a/addons/l10n_fr_hr_payroll/report/__init__.py
+++ b/addons/l10n_fr_hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/l10n_fr_rib/bank.py b/addons/l10n_fr_rib/bank.py
index 26e10053141..1f5264ef5ac 100644
--- a/addons/l10n_fr_rib/bank.py
+++ b/addons/l10n_fr_rib/bank.py
@@ -80,7 +80,6 @@ class res_partner_bank(osv.osv):
 
     _constraints = [(_check_key, 'The RIB and/or IBAN is not valid', ['rib_acc_number', 'bank_code', 'office', 'key'])]
 
-res_partner_bank()
 
 class res_bank(osv.osv):
     """Add the bank code to make it easier to enter RIB data"""
@@ -102,6 +101,5 @@ class res_bank(osv.osv):
     _columns = {
         'rib_code': fields.char('RIB Bank Code', size=64),
     }
-res_bank()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/l10n_hr/l10n_hr_chart_template.xml b/addons/l10n_hr/l10n_hr_chart_template.xml
old mode 100755
new mode 100644
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index 6a7638d919a..fc715ece5b8 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -48,7 +48,6 @@ class hr_contract(osv.osv):
         'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
     }
 
-hr_contract()
 
 class payroll_advice(osv.osv):
     '''
@@ -104,7 +103,7 @@ class payroll_advice(osv.osv):
             slip_ids = payslip_pool.search(cr, uid, [('date_from', '<=', advice.date), ('date_to', '>=', advice.date), ('state', '=', 'done')], context=context)
             for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
                 if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
-                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                    raise osv.except_osv(_('Error!'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
                 line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
                 if line_ids:
                     line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
@@ -130,7 +129,7 @@ class payroll_advice(osv.osv):
         seq_obj = self.pool.get('ir.sequence')
         for advice in self.browse(cr, uid, ids, context=context):
             if not advice.line_ids:
-                raise osv.except_osv(_('Error !'), _('You can not confirm Payment advice without advice lines.'))
+                raise osv.except_osv(_('Error!'), _('You can not confirm Payment advice without advice lines.'))
             advice_date = datetime.strptime(advice.date, DATETIME_FORMAT)
             advice_year = advice_date.strftime('%m') + '-' + advice_date.strftime('%Y')
             number = seq_obj.get(cr, uid, 'payment.advice')
@@ -157,7 +156,6 @@ class payroll_advice(osv.osv):
         return {
             'value':res
         }
-payroll_advice()
 
 class hr_payslip_run(osv.osv):
 
@@ -185,7 +183,7 @@ class hr_payslip_run(osv.osv):
         users = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
         for run in self.browse(cr, uid, ids, context=context):
             if run.available_advice:
-                raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
+                raise osv.except_osv(_('Error!'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
             advice_data = {
                         'batch_id': run.id,
                         'company_id': users[0].company_id.id,
@@ -203,7 +201,7 @@ class hr_payslip_run(osv.osv):
 
             for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
                 if not slip.employee_id.bank_account_id or not slip.employee_id.bank_account_id.acc_number:
-                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                    raise osv.except_osv(_('Error!'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
                 line_ids = payslip_line_pool.search(cr, uid, [('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
                 if line_ids:
                     line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
@@ -216,7 +214,6 @@ class hr_payslip_run(osv.osv):
                     advice_line_pool.create(cr, uid, advice_line, context=context)
         return self.write(cr, uid, ids, {'available_advice' : True})
 
-hr_payslip_run()
 
 class payroll_advice_line(osv.osv):
     '''
@@ -247,7 +244,6 @@ class payroll_advice_line(osv.osv):
         'debit_credit': 'C',
     }
 
-payroll_advice_line()
 
 class hr_payslip(osv.osv):
     '''
@@ -265,7 +261,6 @@ class hr_payslip(osv.osv):
         default.update({'advice_id' : False})
         return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
 
-hr_payslip()
 
 class res_company(osv.osv):
 
@@ -277,6 +272,5 @@ class res_company(osv.osv):
         'dearness_allowance': True,
     }
 
-res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
index 8a20170c384..e76f45b69c0 100644
--- a/addons/l10n_in_hr_payroll/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
 ##############################################################################
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
index 59456b13b55..32c589d2a90 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -82,6 +82,5 @@ class payment_advice_report(osv.osv):
                     l.employee_id,l.advice_id,l.bysal,l.ifsc_code, l.name
             )
         """)
-payment_advice_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py
index b44f123547b..2e1a543a80a 100644
--- a/addons/l10n_in_hr_payroll/report/payslip_report.py
+++ b/addons/l10n_in_hr_payroll/report/payslip_report.py
@@ -83,6 +83,5 @@ class payslip_report(osv.osv):
                     l.employee_id,p.struct_id,l.category_id
             )
         """)
-payslip_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index 62d332ea5b8..93594e1dff8 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -66,6 +66,5 @@ class hr_salary_employee_bymonth(osv.osv_memory):
             'datas': datas,
        }
 
-hr_salary_employee_bymonth()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
index ed2a02e8d42..de3680f2dd3 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
@@ -61,6 +61,5 @@ class yearly_salary_detail(osv.osv_memory):
             'datas': datas,
        }
 
-yearly_salary_detail()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 00ba19e9c42..686fb5ff0d4 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -29,7 +29,7 @@
 
 {
     'name': 'Italy - Accounting',
-    'version': '0.1',
+    'version': '0.2',
     'depends': ['base_vat','account_chart','base_iban'],
     'author': 'OpenERP Italian Community',
     'description': """
diff --git a/addons/l10n_it/data/account.tax.code.template.csv b/addons/l10n_it/data/account.tax.code.template.csv
index d6d6667f43b..e5435945556 100644
--- a/addons/l10n_it/data/account.tax.code.template.csv
+++ b/addons/l10n_it/data/account.tax.code.template.csv
@@ -1,28 +1,37 @@
 code,id,name,parent_id:id
 ,vat_code_chart_root,Tassazione,
 IVC,template_ivacode_pagata,IVA a credito,vat_code_chart_root
-IVC0,template_ivacode_pagata_0,Esente IVA (credito),template_ivacode_pagata
+IVCN,template_ivacode_pagata_ind,IVA a credito indetraibile,vat_code_chart_root
+IVC0,template_ivacode_pagata_0,Fuori Campo IVA (credito),template_ivacode_pagata
 IVCI,template_impcode_pagata,IVA a credito (imponibile),vat_code_chart_root
-IVC0I,template_impcode_pagata_0,Esente IVA a credito (imponibile),template_impcode_pagata
+IVC0I,template_impcode_pagata_0,Fuori Campo IVA (credito) (imponibile),template_impcode_pagata
+IVCart15,template_ivacode_pagata_art15,Escluso Art.15 (credito),template_ivacode_pagata
+IVCart15I,template_impcode_pagata_art15,Escluso Art.15. (credito) (imponibile),template_impcode_pagata
 IVC10,template_ivacode_pagata_10,IVA a credito 10%,template_ivacode_pagata
 IVC10I,template_impcode_pagata_10,IVA a credito 10% (imponibile),template_impcode_pagata
-IVC10ind,template_ivacode_pagata_10ind,IVA a credito 10% indetraibile,template_ivacode_pagata
+IVC10ind,template_ivacode_pagata_10ind,IVA a credito 10% indetraibile,template_ivacode_pagata_ind
 IVC10Iind,template_impcode_pagata_10ind,IVA a credito 10% indetraibile (imponibile),template_impcode_pagata
-IVC20ind,template_ivacode_pagata_20ind,IVA a credito 20% indetraibile,template_ivacode_pagata
+IVC20ind,template_ivacode_pagata_20ind,IVA a credito 20% indetraibile,template_ivacode_pagata_ind
 IVC20Iind,template_impcode_pagata_20ind,IVA a credito 20% indetraibile (imponibile),template_impcode_pagata
-IVC4ind,template_ivacode_pagata_4ind,IVA a credito 4% indetraibile,template_ivacode_pagata
+IVC4ind,template_ivacode_pagata_4ind,IVA a credito 4% indetraibile,template_ivacode_pagata_ind
 IVC4Iind,template_impcode_pagata_4ind,IVA a credito 4% indetraibile (imponibile),template_impcode_pagata
 IVC20det10,template_ivacode_pagata_20det10,IVA a credito 20% detraibile 10%,template_ivacode_pagata
+IVC20Ndet10,template_ivacode_pagata_20det10ind,IVA a credito 20% detraibile 10% (indetraibile),template_ivacode_pagata_ind
 IVC20Idet10,template_impcode_pagata_20det10,IVA a credito 20% detraibile 10% (imponibile),template_impcode_pagata
 IVC20det15,template_ivacode_pagata_20det15,IVA a credito 20% detraibile 15%,template_ivacode_pagata
+IVC20Ndet15,template_ivacode_pagata_20det15ind,IVA a credito 20% detraibile 15% (indetraibile),template_ivacode_pagata_ind
 IVC20Idet15,template_impcode_pagata_20det15,IVA a credito 20% detraibile 15% (imponibile),template_impcode_pagata
 IVC20det40,template_ivacode_pagata_20det40,IVA a credito 20% detraibile 40%,template_ivacode_pagata
+IVC20Ndet40,template_ivacode_pagata_20det40ind,IVA a credito 20% detraibile 40% (indetraibile),template_ivacode_pagata_ind
 IVC20Idet40,template_impcode_pagata_20det40,IVA a credito 20% detraibile 40% (imponibile),template_impcode_pagata
 IVC20det50,template_ivacode_pagata_20det50,IVA a credito 20% detraibile 50%,template_ivacode_pagata
+IVC20Ndet50,template_ivacode_pagata_20det50ind,IVA a credito 20% detraibile 50% (indetraibile),template_ivacode_pagata_ind
 IVC20Idet50,template_impcode_pagata_20det50,IVA a credito 20% detraibile 50% (imponibile),template_impcode_pagata
 IVC10det50,template_ivacode_pagata_10det50,IVA a credito 10% detraibile 50%,template_ivacode_pagata
+IVC10Ndet50,template_ivacode_pagata_10det50ind,IVA a credito 10% detraibile 50% (indetraibile),template_ivacode_pagata_ind
 IVC10Idet50,template_impcode_pagata_10det50,IVA a credito 10% detraibile 50% (imponibile),template_impcode_pagata
 IVC4det50,template_ivacode_pagata_4det50,IVA a credito 4% detraibile 50%,template_ivacode_pagata
+IVC4Ndet50,template_ivacode_pagata_4det50ind,IVA a credito 4% detraibile 50% (indetraibile),template_ivacode_pagata_ind
 IVC4Idet50,template_impcode_pagata_4det50,IVA a credito 4% detraibile 50% (imponibile),template_impcode_pagata
 IVC20,template_ivacode_pagata_20,IVA a credito 20%,template_ivacode_pagata
 IVC20I,template_impcode_pagata_20,IVA a credito 20% (imponibile),template_impcode_pagata
@@ -35,9 +44,11 @@ IVC12I,template_impcode_pagata_12,IVA  a credito 12% (imponibile),template_impco
 IVC2,template_ivacode_pagata_2,IVA  a credito 2%,template_ivacode_pagata
 IVC2I,template_impcode_pagata_2,IVA  a credito 2% (imponibile),template_impcode_pagata
 IVD,template_ivacode_riscossa,IVA a debito,vat_code_chart_root
-IVD0,template_ivacode_riscossa_0,Esente IVA (debito),template_ivacode_riscossa
+IVD0,template_ivacode_riscossa_0,Fuori Campo IVA (debito),template_ivacode_riscossa
 IVDI,template_impcode_riscossa,IVA a debito (imponibile),vat_code_chart_root
-IVD0I,template_impcode_riscossa_0,Esente IVA a debito (imponibile),template_impcode_riscossa
+IVD0I,template_impcode_riscossa_0,Fuori Campo IVA (debito) (imponibile),template_impcode_riscossa
+IVDart15,template_ivacode_riscossa_art15,Escluso Art.15 (debito),template_ivacode_riscossa
+IVDart15I,template_impcode_riscossa_art15,Escluso Art.15 (debito) (imponibile),template_impcode_riscossa
 IVD10,template_ivacode_riscossa_10,IVA a debito 10%,template_ivacode_riscossa
 IVD10I,template_impcode_riscossa_10,IVA a debito 10% (imponibile),template_impcode_riscossa
 IVD20,template_ivacode_riscossa_20,IVA a debito 20%,template_ivacode_riscossa
@@ -50,13 +61,17 @@ IVD12,template_ivacode_riscossa_12,IVA  a debito 12%,template_ivacode_riscossa
 IVD12I,template_impcode_riscossa_12,IVA  a debito 12% (imponibile),template_impcode_riscossa
 IVD2,template_ivacode_riscossa_2,IVA  a debito 2%,template_ivacode_riscossa
 IVD2I,template_impcode_riscossa_2,IVA  a debito 2% (imponibile),template_impcode_riscossa
-IVC21ind,template_ivacode_pagata_21ind,IVA a credito 21% indetraibile,template_ivacode_pagata
+IVC21ind,template_ivacode_pagata_21ind,IVA a credito 21% indetraibile,template_ivacode_pagata_ind
 IVC21Iind,template_impcode_pagata_21ind,IVA a credito 21% indetraibile (imponibile),template_impcode_pagata
 IVC21det10,template_ivacode_pagata_21det10,IVA a credito 21% detraibile 10%,template_ivacode_pagata
+IVC21Ndet10,template_ivacode_pagata_21det10ind,IVA a credito 21% detraibile 10% (indetraibile),template_ivacode_pagata_ind
 IVC21Idet10,template_impcode_pagata_21det10,IVA a credito 21% detraibile 10% (imponibile),template_impcode_pagata
 IVC21det15,template_ivacode_pagata_21det15,IVA a credito 21% detraibile 15%,template_ivacode_pagata
+IVC21Ndet15,template_ivacode_pagata_21det15ind,IVA a credito 21% detraibile 15% (indetraibile),template_ivacode_pagata_ind
 IVC21Idet15,template_impcode_pagata_21det15,IVA a credito 21% detraibile 15% (imponibile),template_impcode_pagata
 IVC21det40,template_ivacode_pagata_21det40,IVA a credito 21% detraibile 40%,template_ivacode_pagata
+IVC21Ndet40,template_ivacode_pagata_21det40ind,IVA a credito 21% detraibile 40% (indetraibile),template_ivacode_pagata_ind
 IVC21Idet40,template_impcode_pagata_21det40,IVA a credito 21% detraibile 40% (imponibile),template_impcode_pagata
 IVC21det50,template_ivacode_pagata_21det50,IVA a credito 21% detraibile 50%,template_ivacode_pagata
+IVC21Ndet50,template_ivacode_pagata_21det50ind,IVA a credito 21% detraibile 50% (indetraibile),template_ivacode_pagata_ind
 IVC21Idet50,template_impcode_pagata_21det50,IVA a credito 21% detraibile 50% (imponibile),template_impcode_pagata
diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv
index e003afd1a23..5654b32e5e9 100644
--- a/addons/l10n_it/data/account.tax.template.csv
+++ b/addons/l10n_it/data/account.tax.template.csv
@@ -1,71 +1,66 @@
 id,description,chart_template_id:id,name,sequence,amount,parent_id:id,child_depend,type,account_collected_id:id,account_paid_id:id,type_tax_use,base_code_id:id,tax_code_id:id,ref_base_code_id:id,ref_tax_code_id:id,ref_base_sign,ref_tax_sign,price_include,base_sign,tax_sign
-21a,21a,l10n_it_chart_template_generic,Iva al 21% (debito),,0.21,,False,percent,2601,2601,sale,template_impcode_riscossa_21,template_ivacode_riscossa_21,template_impcode_riscossa_21,template_ivacode_riscossa_21,-1,-1,False,,
-21b,21b,l10n_it_chart_template_generic,Iva al 21% (credito),,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,,,False,-1,-1
-20a,20a,l10n_it_chart_template_generic,Iva al 20% (debito),,0.2,,False,percent,2601,2601,sale,template_impcode_riscossa_20,template_ivacode_riscossa_20,template_impcode_riscossa_20,template_ivacode_riscossa_20,-1,-1,False,,
-20b,20b,l10n_it_chart_template_generic,Iva al 20% (credito),,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,,,False,-1,-1
-10a,10a,l10n_it_chart_template_generic,Iva al 10% (debito),,0.1,,False,percent,2601,2601,sale,template_impcode_riscossa_10,template_ivacode_riscossa_10,template_impcode_riscossa_10,template_ivacode_riscossa_10,-1,-1,False,,
-10b,10b,l10n_it_chart_template_generic,Iva al 10% (credito),,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,,,False,-1,-1
-10AO,10AO,l10n_it_chart_template_generic,Iva al 10% indetraibile,,0.1,,True,percent,,,purchase,template_impcode_pagata_10ind,,template_impcode_pagata_10ind,,,,False,-1,-1
-10AOa,10AOa,l10n_it_chart_template_generic,Iva al 10% indetraibile (D),2,0,10AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_10ind,,template_ivacode_pagata_10ind,,,False,,
-10AOb,10AOb,l10n_it_chart_template_generic,Iva al 10% indetraibile (I),1,1,10AO,False,percent,,,purchase,,,,,,,False,,
-12a,12a,l10n_it_chart_template_generic,Iva 12% (debito),,0.12,,False,percent,2601,2601,sale,template_impcode_riscossa_12,template_ivacode_riscossa_12,template_impcode_riscossa_12,template_ivacode_riscossa_12,-1,-1,False,,
-12b,12b,l10n_it_chart_template_generic,Iva 12% (credito),,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,,,False,-1,-1
-2010,2010,l10n_it_chart_template_generic,Iva al 20% detraibile 10%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det10,,template_impcode_pagata_20det10,,,,False,-1,-1
-2010a,2010a,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (D),2,0,2010,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det10,,template_ivacode_pagata_20det10,,,False,,
-2010b,2010b,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (I),1,0.9,2010,False,percent,,,purchase,,,,,,,False,,
-2015,2015,l10n_it_chart_template_generic,Iva al 20% detraibile 15%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det15,,template_impcode_pagata_20det15,,,,False,-1,-1
-2015a,2015a,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (D),2,0,2015,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det15,,template_ivacode_pagata_20det15,,,False,,
-2015b,2015b,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (I),1,0.85,2015,False,percent,,,purchase,,,,,,,False,,
-2040,2040,l10n_it_chart_template_generic,Iva al 20% detraibile 40%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det40,,template_impcode_pagata_20det40,,,,False,-1,-1
-2040a,2040a,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (D),2,0,2040,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det40,,template_ivacode_pagata_20det40,,,False,,
-2040b,2040b,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (I),1,0.6,2040,False,percent,,,purchase,,,,,,,False,,
-20AO,20AO,l10n_it_chart_template_generic,Iva al 20% indetraibile,,0.2,,True,percent,,,purchase,template_impcode_pagata_20ind,,template_impcode_pagata_20ind,,,,False,-1,-1
-20AOa,20AOa,l10n_it_chart_template_generic,Iva al 20% indetraibile (D),2,0,20AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_20ind,,template_ivacode_pagata_20ind,,,False,,
-20AOb,20AOb,l10n_it_chart_template_generic,Iva al 20% indetraibile (I),1,1,20AO,False,percent,,,purchase,,,,,,,False,,
-20I5,20I5,l10n_it_chart_template_generic,IVA al 20% detraibile al 50%,,0.2,,True,percent,,,purchase,template_impcode_pagata_20det50,,template_impcode_pagata_20det50,,,,False,-1,-1
-20I5b,20I5b,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (I),1,0.5,20I5,False,percent,,,purchase,,,,,,,False,,
-20I5a,20I5a,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (D),2,0,20I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det50,,template_ivacode_pagata_20det50,,,False,,
-22a,22a,l10n_it_chart_template_generic,Iva 2% (debito),,0.02,,False,percent,2601,2601,sale,template_impcode_riscossa_2,template_ivacode_riscossa_2,template_impcode_riscossa_2,template_ivacode_riscossa_2,-1,-1,False,,
-22b,22b,l10n_it_chart_template_generic,Iva 2% (credito),,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,False,-1,-1
-4a,4a,l10n_it_chart_template_generic,Iva 4% (debito),,0.04,,False,percent,2601,2601,sale,template_impcode_riscossa_4,template_ivacode_riscossa_4,template_impcode_riscossa_4,template_ivacode_riscossa_4,-1,-1,False,,
-4b,4b,l10n_it_chart_template_generic,Iva 4% (credito),,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,,,False,-1,-1
-4AO,4AO,l10n_it_chart_template_generic,Iva al 4% indetraibile,,0.04,,True,percent,,,purchase,template_impcode_pagata_4ind,,template_impcode_pagata_4ind,,,,False,-1,-1
-4AOa,4AOa,l10n_it_chart_template_generic,Iva al 4% indetraibile (D),2,0,4AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_4ind,,template_ivacode_pagata_4ind,,,False,,
-4AOb,4AOb,l10n_it_chart_template_generic,Iva al 4% indetraibile (I),1,1,4AO,False,percent,,,purchase,,,,,,,False,,
-10I5,10I5,l10n_it_chart_template_generic,IVA al 10% detraibile al 50%,,0.1,,True,percent,,,purchase,template_impcode_pagata_10det50,,template_impcode_pagata_10det50,,,,False,-1,-1
-10I5a,10I5a,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (D),2,0,10I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_10det50,,template_ivacode_pagata_10det50,,,False,,
-10I5b,10I5b,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (I),1,0.5,10I5,False,percent,,,purchase,,,,,,,False,,
-4I5,4I5,l10n_it_chart_template_generic,IVA al 4% detraibile al 50%,,0.04,,True,percent,,,purchase,template_impcode_pagata_4det50,,template_impcode_pagata_4det50,,,,False,-1,-1
-4I5a,4I5a,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (D),2,0,4I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_4det50,,template_ivacode_pagata_4det50,,,False,,
-4I5b,4I5b,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (I),1,0.5,4I5,False,percent,,,purchase,,,,,,,False,,
-00a,00a,l10n_it_chart_template_generic,Esente IVA (debito),,0,,False,percent,2601,2601,sale,template_impcode_riscossa_0,template_ivacode_riscossa_0,template_impcode_riscossa_0,template_ivacode_riscossa_0,-1,-1,False,,
-00b,00b,l10n_it_chart_template_generic,Esente IVA (credito),,0,,False,percent,1601,1601,purchase,template_impcode_pagata_0,template_ivacode_pagata_0,template_impcode_pagata_0,template_ivacode_pagata_0,,,False,-1,-1
-21a INC,21a INC,l10n_it_chart_template_generic,Iva al 21% (debito) INC,,0.21,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,-1,-1,True,,
-21b INC,21b INC,l10n_it_chart_template_generic,Iva al 21% (credito) INC,,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,,,True,-1,-1
-20a INC,20a INC,l10n_it_chart_template_generic,Iva al 20% (debito) INC,,0.2,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,-1,-1,True,,
-20b INC,20b INC,l10n_it_chart_template_generic,Iva al 20% (credito) INC,,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,,,True,-1,-1
-10a INC,10a INC,l10n_it_chart_template_generic,Iva al 10% (debito) INC,,0.1,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,-1,-1,True,,
-10b INC,10b INC,l10n_it_chart_template_generic,Iva al 10% (credito) INC,,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,,,True,-1,-1
-12a INC,12a INC,l10n_it_chart_template_generic,Iva 12% (debito) INC,,0.12,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,-1,-1,True,,
-12b INC,12b INC,l10n_it_chart_template_generic,Iva 12% (credito) INC,,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,,,True,-1,-1
-22a INC,22a INC,l10n_it_chart_template_generic,Iva 2% (debito) INC,,0.02,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,-1,-1,True,,
-22b INC,22b INC,l10n_it_chart_template_generic,Iva 2% (credito) INC,,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,,,True,-1,-1
-4a INC,4a INC,l10n_it_chart_template_generic,Iva 4% (debito) INC,,0.04,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,-1,-1,True,,
-4b INC,4b INC,l10n_it_chart_template_generic,Iva 4% (credito) INC,,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,,,True,-1,-1
-00a INC,00a INC,l10n_it_chart_template_generic,Esente IVA (debito) INC,,0,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,-1,-1,True,,
-2110,2110,l10n_it_chart_template_generic,Iva al 21% detraibile 10%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det10,,template_impcode_pagata_21det10,,,,False,-1,-1
-2110a,2110a,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (D),2,0,2110,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det10,,template_ivacode_pagata_21det10,,,False,,
-2110b,2110b,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (I),1,0.9,2110,False,percent,,,purchase,,,,,,,False,,
-2115,2115,l10n_it_chart_template_generic,Iva al 21% detraibile 15%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det15,,template_impcode_pagata_21det15,,,,False,-1,-1
-2115a,2115a,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (D),2,0,2115,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det15,,template_ivacode_pagata_21det15,,,False,,
-2115b,2115b,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (I),1,0.85,2115,False,percent,,,purchase,,,,,,,False,,
-2140,2140,l10n_it_chart_template_generic,Iva al 21% detraibile 40%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det40,,template_impcode_pagata_21det40,,,,False,-1,-1
-2140a,2140a,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (D),2,0,2140,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det40,,template_ivacode_pagata_21det40,,,False,,
-2140b,2140b,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (I),1,0.6,2140,False,percent,,,purchase,,,,,,,False,,
-21AO,21AO,l10n_it_chart_template_generic,Iva al 21% indetraibile,,0.21,,True,percent,,,purchase,template_impcode_pagata_21ind,,template_impcode_pagata_21ind,,,,False,-1,-1
-21AOa,21AOa,l10n_it_chart_template_generic,Iva al 21% indetraibile (D),2,0,21AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_21ind,,template_ivacode_pagata_21ind,,,False,,
-21AOb,21AOb,l10n_it_chart_template_generic,Iva al 21% indetraibile (I),1,1,21AO,False,percent,,,purchase,,,,,,,False,,
-21I5,21I5,l10n_it_chart_template_generic,IVA al 21% detraibile al 50%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det50,,template_impcode_pagata_21det50,,,,False,-1,-1
-21I5b,21I5b,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (I),1,0.5,21I5,False,percent,,,purchase,,,,,,,False,,
-21I5a,21I5a,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (D),2,0,21I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det50,,template_ivacode_pagata_21det50,,,False,,
-
+21v,21v,l10n_it_chart_template_generic,Iva al 21% (debito),1,0.21,,False,percent,2601,2601,sale,template_impcode_riscossa_21,template_ivacode_riscossa_21,template_impcode_riscossa_21,template_ivacode_riscossa_21,-1,-1,False,1,1
+21a,21a,l10n_it_chart_template_generic,Iva al 21% (credito),2,0.21,,False,percent,1601,1601,purchase,template_impcode_pagata_21,template_ivacode_pagata_21,template_impcode_pagata_21,template_ivacode_pagata_21,1,1,False,-1,-1
+20v,20v,l10n_it_chart_template_generic,Iva al 20% (debito),3,0.2,,False,percent,2601,2601,sale,template_impcode_riscossa_20,template_ivacode_riscossa_20,template_impcode_riscossa_20,template_ivacode_riscossa_20,-1,-1,False,1,1
+20a,20a,l10n_it_chart_template_generic,Iva al 20% (credito),4,0.2,,False,percent,1601,1601,purchase,template_impcode_pagata_20,template_ivacode_pagata_20,template_impcode_pagata_20,template_ivacode_pagata_20,1,1,False,-1,-1
+10v,10v,l10n_it_chart_template_generic,Iva al 10% (debito),5,0.1,,False,percent,2601,2601,sale,template_impcode_riscossa_10,template_ivacode_riscossa_10,template_impcode_riscossa_10,template_ivacode_riscossa_10,-1,-1,False,1,1
+10a,10a,l10n_it_chart_template_generic,Iva al 10% (credito),6,0.1,,False,percent,1601,1601,purchase,template_impcode_pagata_10,template_ivacode_pagata_10,template_impcode_pagata_10,template_ivacode_pagata_10,1,1,False,-1,-1
+10AO,10AO,l10n_it_chart_template_generic,Iva al 10% indetraibile,7,0.1,,True,percent,,,purchase,template_impcode_pagata_10ind,,template_impcode_pagata_10ind,,1,1,False,-1,-1
+10AOb,10AOb,l10n_it_chart_template_generic,Iva al 10% indetraibile (D),200,0,10AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_10,,template_ivacode_pagata_10,1,1,False,-1,-1
+10AOa,10AOa,l10n_it_chart_template_generic,Iva al 10% indetraibile (I),100,1,10AO,False,percent,,,purchase,,template_ivacode_pagata_10ind,,template_ivacode_pagata_10ind,1,1,False,-1,-1
+12v,12v,l10n_it_chart_template_generic,Iva 12% (debito),8,0.12,,False,percent,2601,2601,sale,template_impcode_riscossa_12,template_ivacode_riscossa_12,template_impcode_riscossa_12,template_ivacode_riscossa_12,-1,-1,False,1,1
+12a,12a,l10n_it_chart_template_generic,Iva 12% (credito),9,0.12,,False,percent,1601,1601,purchase,template_impcode_pagata_12,template_ivacode_pagata_12,template_impcode_pagata_12,template_ivacode_pagata_12,1,1,False,-1,-1
+2010,2010,l10n_it_chart_template_generic,Iva al 20% detraibile 10%,10,0.2,,True,percent,,,purchase,template_impcode_pagata_20det10,,template_impcode_pagata_20det10,,1,1,False,-1,-1
+2010b,2010b,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (D),200,0,2010,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det10,,template_ivacode_pagata_20det10,1,1,False,-1,-1
+2010a,2010a,l10n_it_chart_template_generic,Iva al 20% detraibile 10% (I),100,0.9,2010,False,percent,,,purchase,,template_ivacode_pagata_20det10ind,,template_ivacode_pagata_20det10ind,1,1,False,-1,-1
+2015,2015,l10n_it_chart_template_generic,Iva al 20% detraibile 15%,11,0.2,,True,percent,,,purchase,template_impcode_pagata_20det15,,template_impcode_pagata_20det15,,1,1,False,-1,-1
+2015b,2015b,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (D),200,0,2015,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det15,,template_ivacode_pagata_20det15,1,1,False,-1,-1
+2015a,2015a,l10n_it_chart_template_generic,Iva al 20% detraibile 15% (I),100,0.85,2015,False,percent,,,purchase,,template_ivacode_pagata_20det15ind,,template_ivacode_pagata_20det15ind,1,1,False,-1,-1
+2040,2040,l10n_it_chart_template_generic,Iva al 20% detraibile 40%,12,0.2,,True,percent,,,purchase,template_impcode_pagata_20det40,,template_impcode_pagata_20det40,,1,1,False,-1,-1
+2040b,2040b,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (D),200,0,2040,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det40,,template_ivacode_pagata_20det40,1,1,False,-1,-1
+2040a,2040a,l10n_it_chart_template_generic,Iva al 20% detraibile 40% (I),100,0.6,2040,False,percent,,,purchase,,template_ivacode_pagata_20det40ind,,template_ivacode_pagata_20det40ind,1,1,False,-1,-1
+20AO,20AO,l10n_it_chart_template_generic,Iva al 20% indetraibile,13,0.2,,True,percent,,,purchase,template_impcode_pagata_20ind,,template_impcode_pagata_20ind,,1,1,False,-1,-1
+20AOb,20AOb,l10n_it_chart_template_generic,Iva al 20% indetraibile (D),200,0,20AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_20ind,,template_ivacode_pagata_20ind,1,1,False,-1,-1
+20AOa,20AOa,l10n_it_chart_template_generic,Iva al 20% indetraibile (I),100,1,20AO,False,percent,,,purchase,,template_ivacode_pagata_20ind,,template_ivacode_pagata_20ind,1,1,False,-1,-1
+20I5,20I5,l10n_it_chart_template_generic,IVA al 20% detraibile al 50%,14,0.2,,True,percent,,,purchase,template_impcode_pagata_20det50,,template_impcode_pagata_20det50,,1,1,False,-1,-1
+20I5b,20I5b,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (D),200,0,20I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_20det50,,template_ivacode_pagata_20det50,1,1,False,-1,-1
+20I5a,20I5a,l10n_it_chart_template_generic,IVA al 20% detraibile al 50% (I),100,0.5,20I5,False,percent,,,purchase,,template_ivacode_pagata_20det50ind,,template_ivacode_pagata_20det50ind,1,1,False,-1,-1
+22v,22v,l10n_it_chart_template_generic,Iva 2% (debito),15,0.02,,False,percent,2601,2601,sale,template_impcode_riscossa_2,template_ivacode_riscossa_2,template_impcode_riscossa_2,template_ivacode_riscossa_2,-1,-1,False,1,1
+22a,22a,l10n_it_chart_template_generic,Iva 2% (credito),16,0.02,,False,percent,1601,1601,purchase,template_impcode_pagata_2,template_ivacode_pagata_2,template_impcode_pagata_2,template_ivacode_pagata_2,1,1,False,-1,-1
+4v,4v,l10n_it_chart_template_generic,Iva 4% (debito),17,0.04,,False,percent,2601,2601,sale,template_impcode_riscossa_4,template_ivacode_riscossa_4,template_impcode_riscossa_4,template_ivacode_riscossa_4,-1,-1,False,1,1
+4a,4a,l10n_it_chart_template_generic,Iva 4% (credito),18,0.04,,False,percent,1601,1601,purchase,template_impcode_pagata_4,template_ivacode_pagata_4,template_impcode_pagata_4,template_ivacode_pagata_4,1,1,False,-1,-1
+4AO,4AO,l10n_it_chart_template_generic,Iva al 4% indetraibile,19,0.04,,True,percent,,,purchase,template_impcode_pagata_4ind,,template_impcode_pagata_4ind,,1,1,False,-1,-1
+4AOb,4AOb,l10n_it_chart_template_generic,Iva al 4% indetraibile (D),200,0,4AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_4ind,,template_ivacode_pagata_4ind,1,1,False,-1,-1
+4AOa,4AOa,l10n_it_chart_template_generic,Iva al 4% indetraibile (I),100,1,4AO,False,percent,,,purchase,,template_ivacode_pagata_4ind,,template_ivacode_pagata_4ind,1,1,False,-1,-1
+10I5,10I5,l10n_it_chart_template_generic,IVA al 10% detraibile al 50%,20,0.1,,True,percent,,,purchase,template_impcode_pagata_10det50,,template_impcode_pagata_10det50,,1,1,False,-1,-1
+10I5b,10I5b,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (D),200,0,10I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_10det50,,template_ivacode_pagata_10det50,1,1,False,-1,-1
+10I5a,10I5a,l10n_it_chart_template_generic,IVA al 10% detraibile al 50% (I),100,0.5,10I5,False,percent,,,purchase,,template_ivacode_pagata_10det50ind,,template_ivacode_pagata_10det50ind,1,1,False,-1,-1
+4I5,4I5,l10n_it_chart_template_generic,IVA al 4% detraibile al 50%,21,0.04,,True,percent,,,purchase,template_impcode_pagata_4det50,,template_impcode_pagata_4det50,,1,1,False,-1,-1
+4I5b,4I5b,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (D),200,0,4I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_4det50,,template_ivacode_pagata_4det50,1,1,False,-1,-1
+4I5a,4I5a,l10n_it_chart_template_generic,IVA al 4% detraibile al 50% (I),100,0.5,4I5,False,percent,,,purchase,,template_ivacode_pagata_4det50ind,,template_ivacode_pagata_4det50ind,1,1,False,-1,-1
+00v,00v,l10n_it_chart_template_generic,Fuori Campo IVA (debito),22,0,,False,percent,2601,2601,sale,template_impcode_riscossa_0,template_ivacode_riscossa_0,template_impcode_riscossa_0,template_ivacode_riscossa_0,-1,-1,False,1,1
+00a,00a,l10n_it_chart_template_generic,Fuori Campo IVA (credito),23,0,,False,percent,1601,1601,purchase,template_impcode_pagata_0,template_ivacode_pagata_0,template_impcode_pagata_0,template_ivacode_pagata_0,1,1,False,-1,-1
+00art15v,00art15v,l10n_it_chart_template_generic,Imponibile Escluso Art.15 (debito),22,0,,False,percent,2601,2601,sale,template_impcode_riscossa_art15,template_ivacode_riscossa_art15,template_impcode_riscossa_art15,template_ivacode_riscossa_art15,-1,-1,False,1,1
+00art15a,00art15a,l10n_it_chart_template_generic,Imponibile Escluso Art.15 (credito),23,0,,False,percent,1601,1601,purchase,template_impcode_pagata_art15,template_ivacode_pagata_art15,template_impcode_pagata_art15,template_ivacode_pagata_art15,1,1,False,-1,-1
+21v INC,21v INC,l10n_it_chart_template_generic,Iva al 21% (debito) INC,24,0.21,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,l10n_it.template_impcode_riscossa_21,l10n_it.template_ivacode_riscossa_21,-1,-1,True,1,1
+20v INC,20v INC,l10n_it_chart_template_generic,Iva al 20% (debito) INC,25,0.2,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,l10n_it.template_impcode_riscossa_20,l10n_it.template_ivacode_riscossa_20,-1,-1,True,1,1
+10v INC,10v INC,l10n_it_chart_template_generic,Iva al 10% (debito) INC,26,0.1,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,l10n_it.template_impcode_riscossa_10,l10n_it.template_ivacode_riscossa_10,-1,-1,True,1,1
+12v INC,12v INC,l10n_it_chart_template_generic,Iva 12% (debito) INC,27,0.12,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,l10n_it.template_impcode_riscossa_12,l10n_it.template_ivacode_riscossa_12,-1,-1,True,1,1
+22v INC,22v INC,l10n_it_chart_template_generic,Iva 2% (debito) INC,28,0.02,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,l10n_it.template_impcode_riscossa_2,l10n_it.template_ivacode_riscossa_2,-1,-1,True,1,1
+4v INC,4v INC,l10n_it_chart_template_generic,Iva 4% (debito) INC,29,0.04,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,l10n_it.template_impcode_riscossa_4,l10n_it.template_ivacode_riscossa_4,-1,-1,True,1,1
+00v INC,00v INC,l10n_it_chart_template_generic,Fuori Campo IVA (debito) INC,30,0,,False,percent,l10n_it.2601,l10n_it.2601,sale,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,l10n_it.template_impcode_riscossa_0,l10n_it.template_ivacode_riscossa_0,-1,-1,True,1,1
+2110,2110,l10n_it_chart_template_generic,Iva al 21% detraibile 10%,31,0.21,,True,percent,,,purchase,template_impcode_pagata_21det10,,template_impcode_pagata_21det10,,1,1,False,-1,-1
+2110b,2110b,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (D),200,0,2110,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det10,,template_ivacode_pagata_21det10,1,1,False,-1,-1
+2110a,2110a,l10n_it_chart_template_generic,Iva al 21% detraibile 10% (I),100,0.9,2110,False,percent,,,purchase,,template_ivacode_pagata_21det10ind,,template_ivacode_pagata_21det10ind,1,1,False,-1,-1
+2115,2115,l10n_it_chart_template_generic,Iva al 21% detraibile 15%,32,0.21,,True,percent,,,purchase,template_impcode_pagata_21det15,,template_impcode_pagata_21det15,,1,1,False,-1,-1
+2115b,2115b,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (D),200,0,2115,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det15,,template_ivacode_pagata_21det15,1,1,False,-1,-1
+2115a,2115a,l10n_it_chart_template_generic,Iva al 21% detraibile 15% (I),100,0.85,2115,False,percent,,,purchase,,template_ivacode_pagata_21det15ind,,template_ivacode_pagata_21det15ind,1,1,False,-1,-1
+2140,2140,l10n_it_chart_template_generic,Iva al 21% detraibile 40%,33,0.21,,True,percent,,,purchase,template_impcode_pagata_21det40,,template_impcode_pagata_21det40,,1,1,False,-1,-1
+2140b,2140b,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (D),200,0,2140,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det40,,template_ivacode_pagata_21det40,1,1,False,-1,-1
+2140a,2140a,l10n_it_chart_template_generic,Iva al 21% detraibile 40% (I),100,0.6,2140,False,percent,,,purchase,,template_ivacode_pagata_21det40ind,,template_ivacode_pagata_21det40ind,1,1,False,-1,-1
+21AO,21AO,l10n_it_chart_template_generic,Iva al 21% indetraibile,34,0.21,,True,percent,,,purchase,template_impcode_pagata_21ind,,template_impcode_pagata_21ind,,1,1,False,-1,-1
+21AOb,21AOb,l10n_it_chart_template_generic,Iva al 21% indetraibile (D),200,0,21AO,False,balance,1601,1601,purchase,,template_ivacode_pagata_21ind,,template_ivacode_pagata_21ind,1,1,False,-1,-1
+21AOa,21AOa,l10n_it_chart_template_generic,Iva al 21% indetraibile (I),100,1,21AO,False,percent,,,purchase,,template_ivacode_pagata_21ind,,template_ivacode_pagata_21ind,1,1,False,-1,-1
+21I5,21I5,l10n_it_chart_template_generic,IVA al 21% detraibile al 50%,35,0.21,,True,percent,,,purchase,template_impcode_pagata_21det50,,template_impcode_pagata_21det50,,1,1,False,-1,-1
+21I5b,21I5b,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (D),200,0,21I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det50,,template_ivacode_pagata_21det50,1,1,False,-1,-1
+21I5a,21I5a,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (I),100,0.5,21I5,False,percent,,,purchase,,template_ivacode_pagata_21det50ind,,template_ivacode_pagata_21det50ind,1,1,False,-1,-1
diff --git a/addons/l10n_lu/account_financial_report.xml b/addons/l10n_lu/account_financial_report.xml
index b39b0ceb15f..62a7a8c8d7e 100644
--- a/addons/l10n_lu/account_financial_report.xml
+++ b/addons/l10n_lu/account_financial_report.xml
@@ -84,7 +84,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_23">
-            <field name="name">2. Concessions, brevets, licences, marques, ainsi que  droits et valeurs similaires s&#8217;ils ont &#233;t&#233;</field>
+            <field name="name">2. Concessions, brevets, licences, marques, ainsi que droits et valeurs similaires s&#8217;ils ont &#233;t&#233;</field>
             <field name="sequence">115</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">detail_flat</field>
@@ -256,7 +256,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_42">
-            <field name="name">I. Stocks </field>
+            <field name="name">I. Stocks</field>
             <field name="sequence">153</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">detail_flat</field>
@@ -292,7 +292,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_46">
-            <field name="name">4. Acomptes vers&#233;s </field>
+            <field name="name">4. Acomptes vers&#233;s</field>
             <field name="sequence">161</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">no_detail</field>
@@ -301,7 +301,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_47">
-            <field name="name">II. Cr&#233;ances </field>
+            <field name="name">II. Cr&#233;ances</field>
             <field name="sequence">163</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">detail_flat</field>
@@ -364,7 +364,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_54">
-            <field name="name">3. Cr&#233;ances sur des entreprises avec lesquelles la soci&#233;t&#233; a un</field>
+            <field name="name">3. Cr&#233;ances sur des entreprises avec lesquelles la soci&#233;t&#233; a un lien de participation</field>
             <field name="sequence">177</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">detail_flat</field>
@@ -436,7 +436,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_62">
-            <field name="name">2. Actions propres ou parts propres </field>
+            <field name="name">2. Actions propres ou parts propres</field>
             <field name="sequence">193</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">no_detail</field>
@@ -445,7 +445,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_63">
-            <field name="name">3. Autres valeurs mobili&#232;res </field>
+            <field name="name">3. Autres valeurs mobili&#232;res</field>
             <field name="sequence">195</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">no_detail</field>
@@ -963,7 +963,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_119">
-            <field name="name">CHARGES</field>
+            <field name="name">A. CHARGES</field>
             <field name="sequence">641</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">detail_flat</field>
@@ -972,7 +972,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_120">
-            <field name="name">1. Consommation de marchandises et de mati&#232;res   premi&#232;res et consommables</field>
+            <field name="name">1. Consommation de marchandises et de mati&#232;res premi&#232;res et consommables</field>
             <field name="sequence">601</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">no_detail</field>
@@ -1044,7 +1044,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_128">
-            <field name="name">a) sur frais d'&#233;tablissement et sur immobilisations corporelles</field>
+            <field name="name">a) sur frais d'&#233;tablissement et sur immobilisations corporelles et incorporelles</field>
             <field name="sequence">617</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">no_detail</field>
@@ -1071,7 +1071,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_131">
-            <field name="name">6. Corrections de valeur sur immobilisations financi&#232;res et aj</field>
+            <field name="name">6. Corrections de valeur sur immobilisations financi&#232;res et ajustement de juste valeur sur immobilisations financières</field>
             <field name="sequence">623</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">no_detail</field>
@@ -1080,7 +1080,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_132">
-            <field name="name">7. Corrections de valeur et ajustement de juste valeur sur &#233;l&#233;m</field>
+            <field name="name">7. Corrections de valeur et ajustement de juste valeur sur &#233;l&#233;ments financiers de l'actif circulant. Moins-values de cessions des valeurs mobilières</field>
             <field name="sequence">625</field>
             <field name="sign" eval="1"/>
             <field name="display_detail">no_detail</field>
@@ -1143,7 +1143,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_140">
-            <field name="name">PRODUITS</field>
+            <field name="name">B. PRODUITS</field>
             <field name="sequence">737</field>
             <field name="sign" eval="-1"/>
             <field name="display_detail">detail_flat</field>
@@ -1161,7 +1161,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_142">
-            <field name="name">2. Variation des stocks de produits finis, et de produits  et de commandes en cours</field>
+            <field name="name">2. Variation des stocks de produits finis, et de produits et de commandes en cours</field>
             <field name="sequence">703</field>
             <field name="sign" eval="-1"/>
             <field name="display_detail">no_detail</field>
@@ -1188,7 +1188,7 @@
         </record>
 
         <record model="account.financial.report" id="account_financial_report_145">
-            <field name="name">a) sur frais d'&#233;tablissement et sur immobilisations corporelles</field>
+            <field name="name">a) sur frais d'&#233;tablissement et sur immobilisations corporelles et incorporelles</field>
             <field name="sequence">709</field>
             <field name="sign" eval="-1"/>
             <field name="display_detail">no_detail</field>
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index abd5c7ce298..04d4fe9a3b7 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -9,10 +9,10 @@ from __future__ import with_statement
 import openerp
 from openerp.osv import fields, osv
 from openerp import tools
+from openerp.modules.module import get_module_resource
 from openerp.tools.translate import _
 from openerp.report.render import render
 from openerp.report.interface import report_int
-from openerp import addons
 import tempfile
 import os
 
@@ -53,7 +53,7 @@ class report_custom(report_int):
         try:
             tmp_file = tempfile.mkstemp(".pdf")[1]
             try:
-                tools.pdf_utils.fill_pdf(addons.get_module_resource('l10n_lu','wizard', '2008_DECL_F_M10.pdf'), tmp_file, result)
+                tools.pdf_utils.fill_pdf(get_module_resource('l10n_lu','wizard', '2008_DECL_F_M10.pdf'), tmp_file, result)
                 with open(tmp_file, "r") as ofile:
                     self.obj = external_pdf(ofile.read())
             finally:
@@ -64,7 +64,7 @@ class report_custom(report_int):
             self.obj.render()
             return (self.obj.pdf, 'pdf')
         except Exception:
-            raise osv.except_osv(_('pdf not created !'), _('Please check if package pdftk is installed!'))
+            raise osv.except_osv(_('PDF Not Created!'), _('Please check if package pdftk is installed!'))
 
 report_custom('report.l10n_lu.tax.report.print')
 
@@ -92,6 +92,5 @@ class vat_declaration_report(osv.osv_memory):
         data['form']['period_id'] = self.browse(cr, uid, ids)[0].period_id.id
         return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n_lu.tax.report.print', 'datas': data}
 
-vat_declaration_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/l10n_ma.py b/addons/l10n_ma/l10n_ma.py
index 6321516cf0f..a2a28a21f82 100644
--- a/addons/l10n_ma/l10n_ma.py
+++ b/addons/l10n_ma/l10n_ma.py
@@ -33,7 +33,6 @@ class l10n_ma_report(osv.osv):
     _sql_constraints = [
                 ('code_uniq', 'unique (code)','The code report must be unique !')
         ]
-l10n_ma_report()
 
 class l10n_ma_line(osv.osv):
     _name = 'l10n.ma.line'
@@ -47,6 +46,5 @@ class l10n_ma_line(osv.osv):
     _sql_constraints = [
             ('code_uniq', 'unique (code)', 'The variable name must be unique !')
     ]
-l10n_ma_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_multilang/account.py b/addons/l10n_multilang/account.py
index 4cb0e28b672..55770c5ec14 100644
--- a/addons/l10n_multilang/account.py
+++ b/addons/l10n_multilang/account.py
@@ -31,21 +31,18 @@ class account_account_template(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True, translate=True),
     }
-account_account_template()
 
 class account_account(osv.osv):
     _inherit = 'account.account'
     _columns = {
         'name': fields.char('Name', size=128, required=True, select=True, translate=True),
     }
-account_account()
 
 class account_tax(osv.osv):
     _inherit = 'account.tax'
     _columns = {
         'name': fields.char('Tax Name', size=128, required=True, select=True, translate=True),
     }
-account_tax()
 
 
 class account_tax_template(osv.osv):
@@ -53,7 +50,6 @@ class account_tax_template(osv.osv):
     _columns = {
         'name': fields.char('Tax Name', size=128, required=True, select=True, translate=True),
     }
-account_tax_template()
 
 
 class account_tax_code_template(osv.osv):
@@ -61,7 +57,6 @@ class account_tax_code_template(osv.osv):
     _columns = {
         'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
     }
-account_tax_code_template()
 
 
 class account_chart_template(osv.osv):
@@ -71,7 +66,6 @@ class account_chart_template(osv.osv):
         'spoken_languages': fields.char('Spoken Languages', size=64, help="State here the languages for which the translations of templates could be loaded at the time of installation of this localization module and copied in the final object when generating them from templates. You must provide the language codes separated by ';'"),
     }
     _order = 'name'
-account_chart_template()
 
 
 class account_fiscal_position(osv.osv):
@@ -79,7 +73,6 @@ class account_fiscal_position(osv.osv):
     _columns = {
         'name': fields.char('Fiscal Position', size=64, required=True, translate=True),
     }
-account_fiscal_position()
 
 
 class account_fiscal_position_template(osv.osv):
@@ -87,7 +80,6 @@ class account_fiscal_position_template(osv.osv):
     _columns = {
         'name': fields.char('Fiscal Position Template', size=64, required=True, translate=True),
     }
-account_fiscal_position_template()
 
 
 class account_journal(osv.osv):
@@ -95,7 +87,6 @@ class account_journal(osv.osv):
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True, translate=True),
     }
-account_journal()
 
 
 class account_analytic_account(osv.osv):
@@ -103,7 +94,6 @@ class account_analytic_account(osv.osv):
     _columns = {
         'name': fields.char('Account Name', size=128, required=True, translate=True),
     }
-account_analytic_account()
 
 
 class account_analytic_journal(osv.osv):
@@ -111,4 +101,3 @@ class account_analytic_journal(osv.osv):
     _columns = {
         'name': fields.char('Journal Name', size=64, required=True, translate=True),
     }
-account_analytic_journal()
diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
index 9596b292ff3..b7564a9960a 100644
--- a/addons/l10n_multilang/l10n_multilang.py
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -78,7 +78,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     else:
                         #replace the value in the destination object only if it's the user lang
                         if context.get('lang') == lang:
-                            self.pool.get(out_obj._name).write(cr, uid, out_ids[j], {in_field: value[in_id]})
+                            self.pool[out_obj._name].write(cr, uid, out_ids[j], {in_field: value[in_id]})
                 else:
                     _logger.info('Language: %s. Translation from template: there is no translation available for %s!' %(lang,  src[in_id]))#out_obj._name))
         return True
@@ -150,6 +150,5 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         out_ids = obj_fiscal_position.search(cr, uid, [('company_id', '=', company_id)], order='id')
         return self.process_translations(cr, uid, langs, obj_fiscal_position_template, field, in_ids, obj_fiscal_position, out_ids, force_write=False, context=context)
 
-wizard_multi_charts_accounts()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py
index 57a3bb10df3..ee9f0292f12 100644
--- a/addons/l10n_nl/__init__.py
+++ b/addons/l10n_nl/__init__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 5e811511c01..aec85016ea5 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -22,7 +22,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 #
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index 516c88bdcf9..c7eefb42cde 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -3940,7 +3940,7 @@
         <record id="btw_code_2a" model="account.tax.code.template">
             <field name="code">2a</field>
             <field name="parent_id" ref="btw_code_verlegging"/>
-            <field name="name">Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (BTW)</field>
+            <field name="name">Heffing van omzetbelasting is naar u verlegd (BTW)</field>
         </record>
 <!-- Voor rubriek 3 hoeft geen omzetbelasting aangegeven te worden, wel het omzet bedrag, zie hiervoor verderop
      3. Leveringen naar het buitenland -->
@@ -4052,7 +4052,7 @@
         <record id="omz_code_2a" model="account.tax.code.template">
             <field name="code">2a</field>
             <field name="parent_id" ref="omz_code_verlegging"/>
-            <field name="name">Leveringen/diensten waarbij de heffing van omzetbelasting naar u is verlegd (omzet)</field>
+            <field name="name">Heffing van omzetbelasting is naar u verlegd (omzet)</field>
         </record>
 <!-- 3. Leveringen naar het buitenland -->
         <record id="omz_code_naar_buitenland" model="account.tax.code.template">
@@ -4260,7 +4260,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="omz_code_1e" name="ref_base_code_id"/>
             <field name="ref_base_sign" eval="-1"/>
             <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="btw_ink_0" model="account.tax.template">
             <field name="sequence">15</field>
@@ -4279,9 +4279,9 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field eval="True" name="child_depend"/>
         </record>
         <record id="btw_ink_0_1" model="account.tax.template">
-            <field name="sequence">99</field>
+            <field name="sequence">98</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW af te dragen verlegd (inkopen1)</field>
+            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
             <field eval="1.00" name="amount"/>
             <field name="type">percent</field>
             <field eval="btw_ink_0" name="parent_id"/>
@@ -4304,54 +4304,8 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="account_paid_id" ref="vat_payable_verlegd"/>
             <field eval="btw_code_5b" name="tax_code_id"/>
             <field eval="btw_code_5b" name="ref_tax_code_id"/>
+            <field name="tax_sign" eval="-1"/>
             <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="btw_ink2_0" model="account.tax.template">
-            <field name="sequence">15</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen)</field>
-            <field name="description">21% BTW verlegd</field>
-            <field eval="0.21" name="amount"/>
-            <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="omz_code_2a" name="base_code_id"/>
-            <field eval="omz_code_2a" name="ref_base_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-            <field eval="True" name="child_depend"/>
-        </record>
-        <record id="btw_ink2_0_1" model="account.tax.template">
-            <field name="sequence">99</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
-            <field eval="1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="btw_ink2_0" name="parent_id"/>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="btw_code_2a" name="tax_code_id"/>
-            <field eval="btw_code_2a" name="ref_tax_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
-            <field name="type_tax_use">purchase</field>
-        </record>
-        <record id="btw_ink2_0_2" model="account.tax.template">
-            <field name="sequence">99</field>
-            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-            <field name="name">BTW te vorderen verlegd (inkopen2)</field>
-            <field eval="-1.00" name="amount"/>
-            <field name="type">percent</field>
-            <field eval="btw_ink2_0" name="parent_id"/>
-            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-            <field eval="btw_code_5b" name="tax_code_id"/>
-            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-            <field name="ref_base_sign" eval="-1"/>
-            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
 <!-- Binnen de EU -->
@@ -4402,6 +4356,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
         </record>
         <record id="btw_I_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
+            <field name="sequence">20</field>
             <field name="name">Inkopen import binnen EU hoog</field>
             <field name="description">21% BTW import binnen EU</field>
             <field eval="0.21" name="amount"/>
diff --git a/addons/l10n_nl/account_fiscal_position_tax_template.xml b/addons/l10n_nl/account_fiscal_position_tax_template.xml
index 622ffafa67c..9fe9a3df786 100644
--- a/addons/l10n_nl/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_nl/account_fiscal_position_tax_template.xml
@@ -90,6 +90,13 @@
             <field name="tax_dest_id" ref="l10n_nl.btw_I_overig"/>
         </record>
         
+        <record id="position_tax_transferred" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_transferred"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_21_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_ink_0"/>
+        </record>
+
+
         <!-- Again, Belgian schema has 17 (!) more records. Missing VAT 0
              and separation of goods and services .. -->
 
diff --git a/addons/l10n_nl/account_fiscal_position_template.xml b/addons/l10n_nl/account_fiscal_position_template.xml
index fe658c6d4b7..1c69f2d1198 100644
--- a/addons/l10n_nl/account_fiscal_position_template.xml
+++ b/addons/l10n_nl/account_fiscal_position_template.xml
@@ -7,6 +7,10 @@
             <field name="name">Binnenland</field>
             <field name="chart_template_id" ref="l10nnl_chart_template" />
         </record>
+        <record id="fiscal_position_template_transferred" model="account.fiscal.position.template">
+            <field name="name">BTW verlegd</field>
+            <field name="chart_template_id" ref="l10nnl_chart_template" />
+        </record>
         <record id="fiscal_position_template_eu" model="account.fiscal.position.template">
             <field name="name">EU landen</field>
             <field name="chart_template_id" ref="l10nnl_chart_template" />
diff --git a/addons/l10n_pa/__init__.py b/addons/l10n_pa/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_pa/__init__.py
+++ b/addons/l10n_pa/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_pe/__init__.py b/addons/l10n_pe/__init__.py
index 92da5dbf966..25e7e337165 100644
--- a/addons/l10n_pe/__init__.py
+++ b/addons/l10n_pe/__init__.py
@@ -23,7 +23,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
index c03d5c9a1a6..102ba3d92f0 100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/partner_view.xml
@@ -7,7 +7,6 @@
 			<field name="model">res.partner</field>
 			<field name="arch" type="xml">
 				<xpath expr="//div[@name='vat_info']" position="after">
-					<label for="nrc"/>
 					<field name="nrc" placeholder="e.g. J12/1234/2012" class="oe_inline"/>
                 </xpath>
 			</field>
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
old mode 100755
new mode 100644
index 1cfe7390a77..79933dc468e
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -1,4 +1,3 @@
-
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
@@ -28,10 +27,32 @@ class res_partner(osv.osv):
     _columns = {
         'nrc' : fields.char('NRC', size=16, help='Registration number at the Registry of Commerce'),
     }
+
+    # The SQL constraints are no-ops but present only to display the right error message to the
+    # user when the partial unique indexes defined below raise errors/  
+    # The real constraints need to be implemented with PARTIAL UNIQUE INDEXES (see auto_init),
+    # due to the way accounting data is delegated by contacts to their companies in OpenERP 7.0.
     _sql_constraints = [
-       ('vat_uniq', 'unique (vat)', 'The vat of the partner must be unique !'),
-       ('nrc_uniq', 'unique (nrc)', 'The code of the partner must be unique !')
+       ('vat_uniq', 'unique (id)', 'The vat of the partner must be unique !'),
+       ('nrc_uniq', 'unique (id)', 'The code of the partner must be unique !')
     ]
-res_partner()
+
+    def _auto_init(self, cr, context=None):
+        result = super(res_partner, self)._auto_init(cr, context=context)
+        # Real implementation of the vat/nrc constraints: only "commercial entities" need to have
+        # unique numbers, and the condition for being a commercial entity is "is_company or parent_id IS NULL".
+        # Contacts inside a company automatically have a copy of the company's commercial fields
+        # (see _commercial_fields()), so they are automatically consistent.
+        cr.execute("""
+            DROP INDEX IF EXISTS res_partner_vat_uniq_for_companies;
+            DROP INDEX IF EXISTS res_partner_nrc_uniq_for_companies;
+            CREATE UNIQUE INDEX res_partner_vat_uniq_for_companies ON res_partner (vat) WHERE is_company OR parent_id IS NULL;
+            CREATE UNIQUE INDEX res_partner_nrc_uniq_for_companies ON res_partner (nrc) WHERE is_company OR parent_id IS NULL;
+        """)
+        return result
+
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['nrc']
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_vn/__init__.py b/addons/l10n_vn/__init__.py
new file mode 100644
index 00000000000..4b18956216e
--- /dev/null
+++ b/addons/l10n_vn/__init__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py
new file mode 100644
index 00000000000..19b81654523
--- /dev/null
+++ b/addons/l10n_vn/__openerp__.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module is Copyright (c) 2009-2013 General Solutions (http://gscom.vn) All Rights Reserved.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    "name" : "Vietnam Chart of Accounts",
+    "version" : "1.0",
+    "author" : "General Solutions",
+    'website': 'http://gscom.vn',
+    "category" : "Localization/Account Charts",
+    "description": """
+This is the module to manage the accounting chart for Vietnam in OpenERP.
+========================================================================
+
+This module applies to companies based in Vietnamese Accounting Standard (VAS).
+
+**Credits:** General Solutions.
+""",
+    "depends" : ["account","base_vat","base_iban"],
+    "data" : ["account_tax_code.xml","account_chart.xml","account_tax.xml","l10n_vn_wizard.xml"],
+    "demo" : [],
+    'auto_install': False,
+    "installable": True,
+}
+
diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/account_chart.xml
new file mode 100755
index 00000000000..c7d3f6a9ee3
--- /dev/null
+++ b/addons/l10n_vn/account_chart.xml
@@ -0,0 +1,2022 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="True">
+
+    <!-- Account types -->
+
+    <record id="account_type_current_asset" model="account.account.type">
+        <field name="name">1. TÀI SẢN NGẮN HẠN</field>
+        <field name="code">current_asset</field>
+        <field name="close_method">balance</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_current_asset_rec" model="account.account.type">
+        <field name="name">1. TÀI SẢN NGẮN HẠN - REC</field>
+        <field name="code">current_asset</field>
+        <field name="close_method">unreconciled</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_long_term_asset" model="account.account.type">
+        <field name="name">2. TÀI SẢN DÀI HẠN</field>
+        <field name="code">long_term_asset</field>
+        <field name="close_method">balance</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_liability" model="account.account.type">
+        <field name="name">3. NỢ PHẢI TRẢ</field>
+        <field name="code">liability</field>
+        <field name="close_method">unreconciled</field>
+        <field name="report_type">liability</field>
+    </record>
+
+    <record id="account_type_cash_equity" model="account.account.type">
+        <field name="name">4. VỐN CHỦ SỞ HỮU</field>
+        <field name="code">equity</field>
+        <field name="close_method">balance</field>
+        <field name="report_type">asset</field>
+    </record>
+
+    <record id="account_type_income" model="account.account.type">
+        <field name="name">5. DOANH THU</field>
+        <field name="code">income</field>
+        <field name="close_method">none</field>
+        <field name="report_type">income</field>
+    </record>
+
+    <record id="account_type_expense" model="account.account.type">
+        <field name="name">6. CHI PHÍ SẢN XUẤT, KINH DOANH</field>
+        <field name="code">expense</field>
+        <field name="close_method">none</field>
+        <field name="report_type">expense</field>
+    </record>
+
+    <record id="account_type_other_income" model="account.account.type">
+        <field name="name">7. THU NHẬP KHÁC</field>
+        <field name="code">other_income</field>
+        <field name="close_method">none</field>
+        <field name="report_type">income</field>
+    </record>
+
+    <record id="account_type_other_expense" model="account.account.type">
+        <field name="name">8. CHI PHÍ KHÁC</field>
+        <field name="code">other_expense</field>
+        <field name="close_method">none</field>
+        <field name="report_type">expense</field>
+    </record>
+
+    <record id="account_type_evaluation" model="account.account.type">
+        <field name="name">9. XÁC ĐỊNH KẾT QUẢ KINH DOANH</field>
+        <field name="code">evaluation</field>
+        <field name="close_method">none</field>
+    </record>
+
+    <record id="account_type_other" model="account.account.type">
+        <field name="name">X. TÀI KHOẢN NGOÀI BẢNG</field>
+        <field name="code">other</field>
+        <field name="close_method">none</field>
+    </record>
+
+    <record id="account_type_root" model="account.account.type">
+        <field name="name">CHỈ XEM</field>
+        <field name="code">view</field>
+        <field name="close_method">none</field>
+    </record>
+</data>
+
+<data>
+    <!-- Account Templates -->
+
+    <record id="chart0" model="account.account.template">
+        <field name="code">0</field>
+        <field name="name">Hệ thống tài khoản kế toán Việt Nam</field>
+        <field name="type">view</field>
+        <field name="user_type" ref="account_type_root" />
+    </record>
+
+    <!-- Loại 1 -->
+    <record id="chart1" model="account.account.template">
+        <field name="code">1</field>
+        <field name="name">TÀI SẢN NGẮN HẠN</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_current_asset" />
+    </record>
+
+    <record id="chart111" model="account.account.template">
+        <field name="code">111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền mặt</field>
+    </record>
+    <record id="chart1111" model="account.account.template">
+        <field name="code">1111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">liquidity</field>
+        <field name="parent_id" ref="chart111" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền Việt Nam</field>
+    </record>
+    <record id="chart1112" model="account.account.template">
+        <field name="code">1112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart111" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Ngoại tệ</field>
+    </record>
+    <record id="chart1113" model="account.account.template">
+        <field name="code">1113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart111" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Vàng bạc, kim khí quý, đá quý</field>
+    </record>
+
+    <record id="chart112" model="account.account.template">
+        <field name="code">112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền gửi ngân hàng</field>
+    </record>
+    <record id="chart1121" model="account.account.template">
+        <field name="code">1121</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">liquidity</field>
+        <field name="parent_id" ref="chart112" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền Việt Nam</field>
+    </record>
+    <record id="chart1122" model="account.account.template">
+        <field name="code">1122</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart112" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Ngoại tệ</field>
+    </record>
+    <record id="chart1123" model="account.account.template">
+        <field name="code">1123</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart112" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Vàng bạc, kim khí quý, đá quý</field>
+    </record>
+
+    <record id="chart113" model="account.account.template">
+        <field name="code">113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền đang chuyển</field>
+    </record>
+    <record id="chart1131" model="account.account.template">
+        <field name="code">1131</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart113" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền Việt Nam</field>
+    </record>
+    <record id="chart1132" model="account.account.template">
+        <field name="code">1132</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart113" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Ngoại tệ</field>
+    </record>
+
+    <record id="chart121" model="account.account.template">
+        <field name="code">121</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Đầu tư tài chính ngắn hạn</field>
+    </record>
+    <record id="chart1211" model="account.account.template">
+        <field name="code">1211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart121" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Cổ phiếu</field>
+    </record>
+    <record id="chart1212" model="account.account.template">
+        <field name="code">1212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart121" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Trái phiếu, Tín phiếu, Kỳ phiếu</field>
+    </record>
+
+    <record id="chart128" model="account.account.template">
+        <field name="code">128</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Đầu tư ngắn hạn khác</field>
+    </record>
+    <record id="chart1281" model="account.account.template">
+        <field name="code">1281</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart128" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tiền gửi có kỳ hạn</field>
+    </record>
+    <record id="chart1282" model="account.account.template">
+        <field name="code">1282</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart128" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Đầu tư ngắn hạn khác</field>
+    </record>
+
+    <record id="chart129" model="account.account.template">
+        <field name="code">129</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Dự phòng giảm giá đầu tư ngắn hạn</field>
+    </record>
+
+    <record id="chart131" model="account.account.template">
+        <field name="code">131</field>
+        <field name="reconcile" eval="True" />
+        <field name="type">receivable</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset_rec" />
+        <field name="name">Phải thu của khách hàng</field>
+    </record>
+
+    <record id="chart133" model="account.account.template">
+        <field name="code">133</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thuế GTGT được khấu trừ</field>
+    </record>
+    <record id="chart1331" model="account.account.template">
+        <field name="code">1331</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart133" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thuế GTGT được khấu trừ của hàng hóa, dịch vụ
+        </field>
+    </record>
+    <record id="chart1332" model="account.account.template">
+        <field name="code">1332</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart133" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thuế GTGT được khấu trừ của TSCĐ</field>
+    </record>
+
+    <record id="chart136" model="account.account.template">
+        <field name="code">136</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu nội bộ</field>
+    </record>
+    <record id="chart1361" model="account.account.template">
+        <field name="code">1361</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart136" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Vốn kinh doanh ở đơn vị trực thuộc</field>
+    </record>
+    <record id="chart1368" model="account.account.template">
+        <field name="code">1368</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart136" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu nội bộ khác</field>
+    </record>
+
+    <record id="chart138" model="account.account.template">
+        <field name="code">138</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu khác</field>
+    </record>
+    <record id="chart1381" model="account.account.template">
+        <field name="code">1381</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart138" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tài sản thiếu chờ xử lý</field>
+    </record>
+    <record id="chart1385" model="account.account.template">
+        <field name="code">1385</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart138" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu về cổ phần hóa</field>
+    </record>
+    <record id="chart1388" model="account.account.template">
+        <field name="code">1388</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart138" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Phải thu khác</field>
+    </record>
+
+    <record id="chart139" model="account.account.template">
+        <field name="code">139</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Dự phòng phải thu khó đòi</field>
+    </record>
+
+    <record id="chart141" model="account.account.template">
+        <field name="code">141</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Tạm ứng</field>
+    </record>
+
+    <record id="chart142" model="account.account.template">
+        <field name="code">142</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi phí trả trước ngắn hạn</field>
+    </record>
+
+    <record id="chart144" model="account.account.template">
+        <field name="code">144</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Cầm cố, ký cược, ký quỹ ngắn hạn</field>
+    </record>
+
+    <record id="chart151" model="account.account.template">
+        <field name="code">151</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa mua đang đi trên đường</field>
+    </record>
+
+    <record id="chart152" model="account.account.template">
+        <field name="code">152</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Nguyên liệu, vật liệu</field>
+    </record>
+
+    <record id="chart153" model="account.account.template">
+        <field name="code">153</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Công cụ, dụng cụ</field>
+    </record>
+
+    <record id="chart154" model="account.account.template">
+        <field name="code">154</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi phí sản xuất kinh doanh dở dang</field>
+    </record>
+
+    <record id="chart155" model="account.account.template">
+        <field name="code">155</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Thành phẩm</field>
+    </record>
+
+    <record id="chart156" model="account.account.template">
+        <field name="code">156</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa</field>
+    </record>
+    <record id="chart1561" model="account.account.template">
+        <field name="code">1561</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart156" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Giá mua hàng hóa</field>
+    </record>
+    <record id="chart1562" model="account.account.template">
+        <field name="code">1562</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart156" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi phí thu mua hàng hóa</field>
+    </record>
+    <record id="chart1567" model="account.account.template">
+        <field name="code">1567</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart156" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa bất động sản</field>
+    </record>
+
+    <record id="chart157" model="account.account.template">
+        <field name="code">157</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng gửi đi bán</field>
+    </record>
+
+    <record id="chart158" model="account.account.template">
+        <field name="code">158</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Hàng hóa kho bảo thuế</field>
+    </record>
+
+    <record id="chart159" model="account.account.template">
+        <field name="code">159</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Dự phòng giảm giá hàng tồn kho</field>
+    </record>
+
+    <record id="chart161" model="account.account.template">
+        <field name="code">161</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart1" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi sự nghiệp</field>
+    </record>
+    <record id="chart1611" model="account.account.template">
+        <field name="code">1611</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart161" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi sự nghiệp năm trước</field>
+    </record>
+    <record id="chart1612" model="account.account.template">
+        <field name="code">1612</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart161" />
+        <field name="user_type" ref="account_type_current_asset" />
+        <field name="name">Chi sự nghiệp năm nay</field>
+    </record>
+
+    <!-- Loại 2 -->
+    <record id="chart2" model="account.account.template">
+        <field name="code">2</field>
+        <field name="name">TÀI SẢN DÀI HẠN</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+    </record>
+
+    <record id="chart211" model="account.account.template">
+        <field name="code">211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định hữu hình</field>
+    </record>
+    <record id="chart2111" model="account.account.template">
+        <field name="code">2111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Nhà cửa, vật kiến trúc</field>
+    </record>
+    <record id="chart2112" model="account.account.template">
+        <field name="code">2112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Máy móc, thiết bị</field>
+    </record>
+    <record id="chart2113" model="account.account.template">
+        <field name="code">2113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Phương tiện vận tải truyền dẫn</field>
+    </record>
+    <record id="chart2114" model="account.account.template">
+        <field name="code">2114</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Thiết bị, dụng cụ quản lý</field>
+    </record>
+    <record id="chart2115" model="account.account.template">
+        <field name="code">2115</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Cây lâu năm, súc vật làm việc và cho sản phẩm
+        </field>
+    </record>
+    <record id="chart2118" model="account.account.template">
+        <field name="code">2118</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart211" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định khác</field>
+    </record>
+
+    <record id="chart212" model="account.account.template">
+        <field name="code">212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định thuê tài chính</field>
+    </record>
+
+    <record id="chart213" model="account.account.template">
+        <field name="code">213</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định vô hình</field>
+    </record>
+    <record id="chart2131" model="account.account.template">
+        <field name="code">2131</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Quyền sử dụng đất</field>
+    </record>
+    <record id="chart2132" model="account.account.template">
+        <field name="code">2132</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Quyền phát hành</field>
+    </record>
+    <record id="chart2133" model="account.account.template">
+        <field name="code">2133</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Bản quyền, bằng sáng chế</field>
+    </record>
+    <record id="chart2134" model="account.account.template">
+        <field name="code">2134</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Nhãn hiệu hàng hóa</field>
+    </record>
+    <record id="chart2135" model="account.account.template">
+        <field name="code">2135</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Phần mềm máy tính</field>
+    </record>
+    <record id="chart2136" model="account.account.template">
+        <field name="code">2136</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Giấy phép và giấy phép nhượng quyền</field>
+    </record>
+    <record id="chart2138" model="account.account.template">
+        <field name="code">2138</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart213" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản cố định vô hình khác</field>
+    </record>
+
+    <record id="chart214" model="account.account.template">
+        <field name="code">214</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ</field>
+    </record>
+    <record id="chart2141" model="account.account.template">
+        <field name="code">2141</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ cố định hữu hình</field>
+    </record>
+    <record id="chart2142" model="account.account.template">
+        <field name="code">2142</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ thuê tài chính</field>
+    </record>
+    <record id="chart2143" model="account.account.template">
+        <field name="code">2143</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn TSCĐ vô hình</field>
+    </record>
+    <record id="chart2147" model="account.account.template">
+        <field name="code">2147</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart214" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Hao mòn bất động sản đầu tư</field>
+    </record>
+
+    <record id="chart217" model="account.account.template">
+        <field name="code">217</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Bất động sản đầu tư</field>
+    </record>
+
+    <record id="chart221" model="account.account.template">
+        <field name="code">221</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư vào công ty con</field>
+    </record>
+
+    <record id="chart222" model="account.account.template">
+        <field name="code">222</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Vốn góp liên doanh</field>
+    </record>
+
+    <record id="chart223" model="account.account.template">
+        <field name="code">223</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư vào công ty liên kết</field>
+    </record>
+
+    <record id="chart228" model="account.account.template">
+        <field name="code">228</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư dài hạn khác</field>
+    </record>
+    <record id="chart2281" model="account.account.template">
+        <field name="code">2281</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart228" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Cổ phiếu</field>
+    </record>
+    <record id="chart2282" model="account.account.template">
+        <field name="code">2282</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart228" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Trái phiếu</field>
+    </record>
+    <record id="chart2288" model="account.account.template">
+        <field name="code">2288</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart228" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Đầu tư dài hạn khác</field>
+    </record>
+
+    <record id="chart229" model="account.account.template">
+        <field name="code">229</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Dự phòng giảm giá đầu tư dài hạn</field>
+    </record>
+
+    <record id="chart241" model="account.account.template">
+        <field name="code">241</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Xây dựng cơ bản dở dang</field>
+    </record>
+    <record id="chart2411" model="account.account.template">
+        <field name="code">2411</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart241" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Mua sắm TSCĐ</field>
+    </record>
+    <record id="chart2412" model="account.account.template">
+        <field name="code">2412</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart241" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Xây dựng cơ bản</field>
+    </record>
+    <record id="chart2413" model="account.account.template">
+        <field name="code">2413</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart241" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Sửa chữa lớn TSCĐ</field>
+    </record>
+
+    <record id="chart242" model="account.account.template">
+        <field name="code">242</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Chi phí trả trước dài hạn</field>
+    </record>
+
+    <record id="chart243" model="account.account.template">
+        <field name="code">243</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Tài sản thuế thu nhập hoãn lại</field>
+    </record>
+
+    <record id="chart244" model="account.account.template">
+        <field name="code">244</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart2" />
+        <field name="user_type" ref="account_type_long_term_asset" />
+        <field name="name">Ký quỹ, ký cược dài hạn</field>
+    </record>
+
+    <!-- Loại 3 -->
+    <record id="chart3" model="account.account.template">
+        <field name="code">3</field>
+        <field name="name">NỢ PHẢI TRẢ</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_liability" />
+    </record>
+
+    <record id="chart311" model="account.account.template">
+        <field name="code">311</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Vay ngắn hạn</field>
+    </record>
+
+    <record id="chart315" model="account.account.template">
+        <field name="code">315</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nợ dài hạn đến hạn trả</field>
+    </record>
+
+    <record id="chart331" model="account.account.template">
+        <field name="code">331</field>
+        <field name="reconcile" eval="True" />
+        <field name="type">payable</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả người bán</field>
+    </record>
+
+    <record id="chart333" model="account.account.template">
+        <field name="code">333</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế và các khoản phải nộp Nhà nước</field>
+    </record>
+    <record id="chart3331" model="account.account.template">
+        <field name="code">3331</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế GTGT phải nộp</field>
+    </record>
+    <record id="chart33311" model="account.account.template">
+        <field name="code">33311</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3331" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế GTGT đầu ra</field>
+    </record>
+    <record id="chart33312" model="account.account.template">
+        <field name="code">33312</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3331" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế GTGT hàng nhập khẩu</field>
+    </record>
+    <record id="chart3332" model="account.account.template">
+        <field name="code">3332</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế tiêu thụ đặc biệt</field>
+    </record>
+    <record id="chart3333" model="account.account.template">
+        <field name="code">3333</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế xuất, nhập khẩu</field>
+    </record>
+    <record id="chart3334" model="account.account.template">
+        <field name="code">3334</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế thu nhập doanh nghiệp</field>
+    </record>
+    <record id="chart3335" model="account.account.template">
+        <field name="code">3335</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế thu nhập cá nhân</field>
+    </record>
+    <record id="chart3336" model="account.account.template">
+        <field name="code">3336</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế tài nguyên</field>
+    </record>
+    <record id="chart3337" model="account.account.template">
+        <field name="code">3337</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế nhà đất, tiền thuê đất</field>
+    </record>
+    <record id="chart3338" model="account.account.template">
+        <field name="code">3338</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Các loại thuế khác</field>
+    </record>
+    <record id="chart3339" model="account.account.template">
+        <field name="code">3339</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart333" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phí, lệ phí và các khoản phải nộp khác</field>
+    </record>
+
+    <record id="chart334" model="account.account.template">
+        <field name="code">334</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả người lao động</field>
+    </record>
+    <record id="chart3341" model="account.account.template">
+        <field name="code">3341</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart334" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả công nhân viên</field>
+    </record>
+    <record id="chart3342" model="account.account.template">
+        <field name="code">3342</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart334" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả người lao động khác</field>
+    </record>
+
+    <record id="chart335" model="account.account.template">
+        <field name="code">335</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Chi phí phải trả</field>
+    </record>
+
+    <record id="chart336" model="account.account.template">
+        <field name="code">336</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả nội bộ</field>
+    </record>
+
+    <record id="chart337" model="account.account.template">
+        <field name="code">337</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thanh toán theo tiến độ kế hoạch hợp đồng xây dựng
+        </field>
+    </record>
+
+    <record id="chart338" model="account.account.template">
+        <field name="code">338</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả, phải nộp khác</field>
+    </record>
+    <record id="chart3381" model="account.account.template">
+        <field name="code">3381</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Tài sản thừa chờ giải quyết</field>
+    </record>
+    <record id="chart3382" model="account.account.template">
+        <field name="code">3382</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Kinh phí công đoàn</field>
+    </record>
+    <record id="chart3383" model="account.account.template">
+        <field name="code">3383</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Bảo hiểm xã hội</field>
+    </record>
+    <record id="chart3384" model="account.account.template">
+        <field name="code">3384</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Bảo hiểm y tế</field>
+    </record>
+    <record id="chart3385" model="account.account.template">
+        <field name="code">3385</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả về cổ phần hóa</field>
+    </record>
+    <record id="chart3386" model="account.account.template">
+        <field name="code">3386</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nhận ký quỹ, ký cược ngắn hạn</field>
+    </record>
+    <record id="chart3387" model="account.account.template">
+        <field name="code">3387</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Doanh thu chưa thực hiện</field>
+    </record>
+    <record id="chart3388" model="account.account.template">
+        <field name="code">3388</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart338" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phải trả, phải nộp khác</field>
+    </record>
+
+    <record id="chart341" model="account.account.template">
+        <field name="code">341</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Vay dài hạn</field>
+    </record>
+
+    <record id="chart342" model="account.account.template">
+        <field name="code">342</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nợ dài hạn</field>
+    </record>
+
+    <record id="chart343" model="account.account.template">
+        <field name="code">343</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Trái phiếu phát hành</field>
+    </record>
+    <record id="chart3431" model="account.account.template">
+        <field name="code">3431</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart343" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Mệnh giá trái phiếu</field>
+    </record>
+    <record id="chart3432" model="account.account.template">
+        <field name="code">3432</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart343" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Chiết khấu trái phiếu</field>
+    </record>
+    <record id="chart3434" model="account.account.template">
+        <field name="code">3434</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart343" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Phụ trội trái phiếu</field>
+    </record>
+
+    <record id="chart344" model="account.account.template">
+        <field name="code">344</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Nhận ký quỹ, ký cược dài hạn</field>
+    </record>
+
+    <record id="chart347" model="account.account.template">
+        <field name="code">347</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Thuế thu nhập hoãn lại phải trả</field>
+    </record>
+
+    <record id="chart351" model="account.account.template">
+        <field name="code">351</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Quỹ dự phòng trợ cấp mất việc làm</field>
+    </record>
+
+    <record id="chart352" model="account.account.template">
+        <field name="code">352</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart3" />
+        <field name="user_type" ref="account_type_liability" />
+        <field name="name">Dự phòng phải trả</field>
+    </record>
+
+    <!-- Loại 4 -->
+    <record id="chart4" model="account.account.template">
+        <field name="code">4</field>
+        <field name="name">VỐN CHỦ SỞ HỮU</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_cash_equity" />
+    </record>
+
+    <record id="chart411" model="account.account.template">
+        <field name="code">411</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn vốn kinh doanh</field>
+    </record>
+    <record id="chart4111" model="account.account.template">
+        <field name="code">4111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart411" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Vốn đầu tư chủ sỡ hữu</field>
+    </record>
+    <record id="chart4112" model="account.account.template">
+        <field name="code">4112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart411" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Thặng dư vốn cổ phần</field>
+    </record>
+    <record id="chart4118" model="account.account.template">
+        <field name="code">4118</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart411" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Vốn khác</field>
+    </record>
+
+    <record id="chart412" model="account.account.template">
+        <field name="code">412</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệch đánh giá lại tài sản</field>
+    </record>
+
+    <record id="chart413" model="account.account.template">
+        <field name="code">413</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệnh tỉ giá hối đoái</field>
+    </record>
+    <record id="chart4131" model="account.account.template">
+        <field name="code">4131</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart413" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệnh tỉ giá hối đoái đánh giá lại cuối năm
+            tài chính</field>
+    </record>
+    <record id="chart4132" model="account.account.template">
+        <field name="code">4132</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart413" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Chênh lệnh tỉ giá hối đoái trong giai đoạn đầu tư
+            XDCB</field>
+    </record>
+
+    <record id="chart414" model="account.account.template">
+        <field name="code">414</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ đầu tư phát triển</field>
+    </record>
+
+    <record id="chart415" model="account.account.template">
+        <field name="code">415</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ dự phòng tài chính</field>
+    </record>
+
+    <record id="chart418" model="account.account.template">
+        <field name="code">418</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Các quỹ khác thuộc vốn chủ sở hữu</field>
+    </record>
+
+    <record id="chart419" model="account.account.template">
+        <field name="code">419</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Cổ phiếu quỹ</field>
+    </record>
+
+    <record id="chart421" model="account.account.template">
+        <field name="code">421</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Lợi nhuận chưa phân phối</field>
+    </record>
+    <record id="chart4211" model="account.account.template">
+        <field name="code">4211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart421" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Lợi nhuận chưa phân phối năm trước</field>
+    </record>
+    <record id="chart4212" model="account.account.template">
+        <field name="code">4212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart421" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Lợi nhuận chưa phân phối năm nay</field>
+    </record>
+
+    <record id="chart431" model="account.account.template">
+        <field name="code">431</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ khen thưởng phúc lợi</field>
+    </record>
+    <record id="chart4311" model="account.account.template">
+        <field name="code">4311</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart431" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ khen thưởng</field>
+    </record>
+    <record id="chart4312" model="account.account.template">
+        <field name="code">4312</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart431" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ phúc lợi</field>
+    </record>
+    <record id="chart4313" model="account.account.template">
+        <field name="code">4313</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart431" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Quỹ phúc lợi đã hình thành TSCĐ</field>
+    </record>
+
+    <record id="chart441" model="account.account.template">
+        <field name="code">441</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Ngồn vố đầu tư xây dựng cơ bản</field>
+    </record>
+
+    <record id="chart461" model="account.account.template">
+        <field name="code">461</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí sự nghiệp</field>
+    </record>
+    <record id="chart4611" model="account.account.template">
+        <field name="code">4611</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart461" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí sự nghiệp năm trước</field>
+    </record>
+    <record id="chart4612" model="account.account.template">
+        <field name="code">4612</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart461" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí sự nghiệp năm nay</field>
+    </record>
+
+    <record id="chart466" model="account.account.template">
+        <field name="code">466</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart4" />
+        <field name="user_type" ref="account_type_cash_equity" />
+        <field name="name">Nguồn kinh phí đã hình thành TSCĐ</field>
+    </record>
+
+    <!-- Loại 5 -->
+    <record id="chart5" model="account.account.template">
+        <field name="code">5</field>
+        <field name="name">DOANH THU</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_income" />
+    </record>
+
+    <record id="chart511" model="account.account.template">
+        <field name="code">511</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng và cung cấp dịch vụ</field>
+    </record>
+    <record id="chart5111" model="account.account.template">
+        <field name="code">5111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng hóa</field>
+    </record>
+    <record id="chart5112" model="account.account.template">
+        <field name="code">5112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán các thành phẩm</field>
+    </record>
+    <record id="chart5113" model="account.account.template">
+        <field name="code">5113</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu cung cấp dịch vụ</field>
+    </record>
+    <record id="chart5114" model="account.account.template">
+        <field name="code">5114</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu trợ cấp, trợ giá</field>
+    </record>
+    <record id="chart5117" model="account.account.template">
+        <field name="code">5117</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart511" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu kinh doanh bất động sản đầu tư</field>
+    </record>
+
+    <record id="chart512" model="account.account.template">
+        <field name="code">512</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng nội bộ</field>
+    </record>
+    <record id="chart5121" model="account.account.template">
+        <field name="code">5121</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart512" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán hàng hóa</field>
+    </record>
+    <record id="chart5122" model="account.account.template">
+        <field name="code">5122</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart512" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu bán các thành phẩm</field>
+    </record>
+    <record id="chart5123" model="account.account.template">
+        <field name="code">5123</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart512" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu cung cấp dịch vụ</field>
+    </record>
+
+    <record id="chart515" model="account.account.template">
+        <field name="code">515</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Doanh thu hoạt động tài chính khác</field>
+    </record>
+
+    <record id="chart521" model="account.account.template">
+        <field name="code">521</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Chiết khấu thương mại</field>
+    </record>
+
+    <record id="chart531" model="account.account.template">
+        <field name="code">531</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Hàng bán bị trả lại</field>
+    </record>
+
+    <record id="chart532" model="account.account.template">
+        <field name="code">532</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart5" />
+        <field name="user_type" ref="account_type_income" />
+        <field name="name">Giảm giá hàng bán</field>
+    </record>
+
+    <!-- Loại 6 -->
+    <record id="chart6" model="account.account.template">
+        <field name="code">6</field>
+        <field name="name">CHI PHÍ SẢN XUẤT, KINH DOANH</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_expense" />
+    </record>
+
+    <record id="chart611" model="account.account.template">
+        <field name="code">611</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Mua hàng</field>
+    </record>
+    <record id="chart6111" model="account.account.template">
+        <field name="code">6111</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart611" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Mua nguyên liệu, vật liệu</field>
+    </record>
+    <record id="chart6112" model="account.account.template">
+        <field name="code">6112</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart611" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Mua hàng hóa</field>
+    </record>
+
+    <record id="chart621" model="account.account.template">
+        <field name="code">621</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nguyên liệu, vật liệu trực tiếp</field>
+    </record>
+
+    <record id="chart622" model="account.account.template">
+        <field name="code">622</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân công trực tiếp</field>
+    </record>
+
+    <record id="chart623" model="account.account.template">
+        <field name="code">623</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí sử dụng máy thi công</field>
+    </record>
+    <record id="chart6231" model="account.account.template">
+        <field name="code">6231</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân công</field>
+    </record>
+    <record id="chart6232" model="account.account.template">
+        <field name="code">6232</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu</field>
+    </record>
+    <record id="chart6233" model="account.account.template">
+        <field name="code">6233</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dụng cụ sản xuất</field>
+    </record>
+    <record id="chart6234" model="account.account.template">
+        <field name="code">6234</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao máy thi công</field>
+    </record>
+    <record id="chart6237" model="account.account.template">
+        <field name="code">6237</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6238" model="account.account.template">
+        <field name="code">6238</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart623" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <record id="chart627" model="account.account.template">
+        <field name="code">627</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí sản xuất chung</field>
+    </record>
+    <record id="chart6271" model="account.account.template">
+        <field name="code">6271</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân viên phân xưởng</field>
+    </record>
+    <record id="chart6272" model="account.account.template">
+        <field name="code">6272</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu</field>
+    </record>
+    <record id="chart6273" model="account.account.template">
+        <field name="code">6273</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dụng cụ sản xuất</field>
+    </record>
+    <record id="chart6274" model="account.account.template">
+        <field name="code">6274</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao TSCĐ</field>
+    </record>
+    <record id="chart6277" model="account.account.template">
+        <field name="code">6277</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6278" model="account.account.template">
+        <field name="code">6278</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart627" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <record id="chart631" model="account.account.template">
+        <field name="code">631</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Giá thành sản xuất</field>
+    </record>
+
+    <record id="chart632" model="account.account.template">
+        <field name="code">632</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Giá vốn hàng bán</field>
+    </record>
+
+    <record id="chart635" model="account.account.template">
+        <field name="code">635</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí tài chính</field>
+    </record>
+
+    <record id="chart641" model="account.account.template">
+        <field name="code">641</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bán hàng</field>
+    </record>
+    <record id="chart6411" model="account.account.template">
+        <field name="code">6411</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân viên</field>
+    </record>
+    <record id="chart6412" model="account.account.template">
+        <field name="code">6412</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu, bao bì</field>
+    </record>
+    <record id="chart6413" model="account.account.template">
+        <field name="code">6413</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dụng cụ, đồ dùng</field>
+    </record>
+    <record id="chart6414" model="account.account.template">
+        <field name="code">6414</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao TSCĐ</field>
+    </record>
+    <record id="chart6415" model="account.account.template">
+        <field name="code">6415</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bảo hành</field>
+    </record>
+    <record id="chart6417" model="account.account.template">
+        <field name="code">6417</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6418" model="account.account.template">
+        <field name="code">6418</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart641" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <record id="chart642" model="account.account.template">
+        <field name="code">642</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart6" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí quản lý doanh nghiệp</field>
+    </record>
+    <record id="chart6421" model="account.account.template">
+        <field name="code">6421</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí nhân viên quản lý</field>
+    </record>
+    <record id="chart6422" model="account.account.template">
+        <field name="code">6422</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí vật liệu quản lý</field>
+    </record>
+    <record id="chart6423" model="account.account.template">
+        <field name="code">6423</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí đồ dùng văn phòng</field>
+    </record>
+    <record id="chart6424" model="account.account.template">
+        <field name="code">6424</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí khấu hao tài sản cố định</field>
+    </record>
+    <record id="chart6425" model="account.account.template">
+        <field name="code">6425</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Thuế, phí và lệ phí</field>
+    </record>
+    <record id="chart6426" model="account.account.template">
+        <field name="code">6426</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dự phòng</field>
+    </record>
+    <record id="chart6427" model="account.account.template">
+        <field name="code">6427</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí dịch vụ mua ngoài</field>
+    </record>
+    <record id="chart6428" model="account.account.template">
+        <field name="code">6428</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart642" />
+        <field name="user_type" ref="account_type_expense" />
+        <field name="name">Chi phí bằng tiền khác</field>
+    </record>
+
+    <!-- Loại 7 -->
+    <record id="chart7" model="account.account.template">
+        <field name="code">7</field>
+        <field name="name">THU NHẬP KHÁC</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_other_income" />
+    </record>
+
+    <record id="chart711" model="account.account.template">
+        <field name="code">711</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart7" />
+        <field name="user_type" ref="account_type_other_income" />
+        <field name="name">Thu nhập khác</field>
+    </record>
+
+    <!-- Loại 8 -->
+    <record id="chart8" model="account.account.template">
+        <field name="code">8</field>
+        <field name="name">CHI PHÍ KHÁC</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_other_expense" />
+    </record>
+
+    <record id="chart811" model="account.account.template">
+        <field name="code">811</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart8" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí khác</field>
+    </record>
+
+    <record id="chart821" model="account.account.template">
+        <field name="code">821</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart8" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí thuế thu nhập doanh nghiệp</field>
+    </record>
+    <record id="chart8211" model="account.account.template">
+        <field name="code">8211</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart821" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí thuế TNDN hiện hành</field>
+    </record>
+    <record id="chart8212" model="account.account.template">
+        <field name="code">8212</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart821" />
+        <field name="user_type" ref="account_type_other_expense" />
+        <field name="name">Chi phí thuế TNDN hoãn lại</field>
+    </record>
+
+    <!-- Loại 9 -->
+    <record id="chart9" model="account.account.template">
+        <field name="code">9</field>
+        <field name="name">XÁC ĐỊNH KẾT QUẢ KINH DOANH</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_evaluation" />
+    </record>
+
+    <record id="chart911" model="account.account.template">
+        <field name="code">911</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart9" />
+        <field name="user_type" ref="account_type_evaluation" />
+        <field name="name">Xác định kết quả kinh doanh</field>
+    </record>
+
+    <!-- Loại 10 -->
+    <record id="chart10" model="account.account.template">
+        <field name="code">X10</field>
+        <field name="name">TÀI KHOẢN NGOÀI BẢNG</field>
+        <field name="type">view</field>
+        <field name="parent_id" ref="chart0" />
+        <field name="user_type" ref="account_type_other" />
+    </record>
+
+    <record id="chart001" model="account.account.template">
+        <field name="code">001</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Tài sản thuê ngoài</field>
+    </record>
+
+    <record id="chart002" model="account.account.template">
+        <field name="code">002</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Vật tư, hàng hóa nhận giữ hộ, nhận gia công</field>
+    </record>
+
+    <record id="chart003" model="account.account.template">
+        <field name="code">003</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Hàng hóa nhận bán hộ, nhận ký gửi, ký cược</field>
+    </record>
+
+    <record id="chart004" model="account.account.template">
+        <field name="code">004</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Nợ khó đòi đã xử lý</field>
+    </record>
+
+    <record id="chart007" model="account.account.template">
+        <field name="code">007</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Ngoại tệ các loại</field>
+    </record>
+
+    <record id="chart008" model="account.account.template">
+        <field name="code">008</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Dự toán chi sự nghiệp, dự án</field>
+    </record>
+
+    <record id="chartoba" model="account.account.template">
+        <field name="code">OBA</field>
+        <field name="reconcile" eval="False" />
+        <field name="type">other</field>
+        <field name="parent_id" ref="chart10" />
+        <field name="user_type" ref="account_type_other" />
+        <field name="name">Opening Balance Account </field>
+    </record>
+
+    <!-- Chart template -->
+    <record id="vn_template" model="account.chart.template">
+        <field name="name">VN - Chart of Accounts</field>
+        <field name="code_digits">0</field>
+        <field name="account_root_id" ref="chart0" />
+        <field name="tax_code_root_id" ref="vat_code_tax" />
+        <field name="bank_account_view_id" ref="chart1121" />
+        <field name="property_account_receivable" ref="chart131" />
+        <field name="property_account_payable" ref="chart331" />
+        <field name="property_account_expense_categ" ref="chart1561" />
+        <field name="property_account_income_categ" ref="chart5111" />
+
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/account_tax.xml
new file mode 100755
index 00000000000..85f068023c2
--- /dev/null
+++ b/addons/l10n_vn/account_tax.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <!-- Tax Definitions -->
+    
+    <!-- for purchase -->
+    <record id="tax_purchase_vat10" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT được khấu trừ 10%</field>
+            <field name="amount" eval="0.100000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart1331"/>
+            <field name="account_paid_id" ref="chart1331"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_in_local_10_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_in_local_10_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_in_local_10_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_in_local_10_balance"/>
+    </record>
+    <record id="tax_purchase_vat5" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT được khấu trừ 5%</field>
+            <field name="amount" eval="0.050000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart1331"/>
+            <field name="account_paid_id" ref="chart1331"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_in_local_05_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_in_local_05_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_in_local_05_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_in_local_05_balance"/>
+    </record>
+    <record id="tax_purchase_vat0" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT được khấu trừ 0%</field>
+            <field name="amount" eval="0.000000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart1331"/>
+            <field name="account_paid_id" ref="chart1331"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_in_local_00_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_in_local_00_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_in_local_00_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_in_local_00_balance"/>
+    </record>
+    
+    <!-- for sale -->
+    <record id="tax_sale_vat10" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT phải nộp 10%</field>
+            <field name="amount" eval="0.100000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart33311"/>
+            <field name="account_paid_id" ref="chart33311"/>
+            <field name="type_tax_use">sale</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_out_local_10_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_out_local_10_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_out_local_10_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_out_local_10_balance"/>
+    </record>
+    <record id="tax_sale_vat5" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT phải nộp 5%</field>
+            <field name="amount" eval="0.050000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart33311"/>
+            <field name="account_paid_id" ref="chart33311"/>
+            <field name="type_tax_use">sale</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_out_local_05_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_out_local_05_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_out_local_05_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_out_local_05_balance"/>
+    </record>
+    <record id="tax_sale_vat0" model="account.tax.template">
+            <field name="chart_template_id" ref="vn_template"/>
+            <field name="name">Thuế GTGT phải nộp 0%</field>
+            <field name="amount" eval="0.000000"/>
+            <field name="type">percent</field>
+            <field name="account_collected_id" ref="chart33311"/>
+            <field name="account_paid_id" ref="chart33311"/>
+            <field name="type_tax_use">sale</field>
+            <field name="base_code_id" ref="l10n_vn.vat_code_tax_out_local_00_base"/>
+            <field name="tax_code_id" ref="l10n_vn.vat_code_tax_out_local_00_balance"/>
+            <field name="ref_base_code_id" ref="l10n_vn.vat_code_tax_out_local_00_base"/>
+            <field name="ref_tax_code_id" ref="l10n_vn.vat_code_tax_out_local_00_balance"/>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/l10n_vn/account_tax_code.xml b/addons/l10n_vn/account_tax_code.xml
new file mode 100755
index 00000000000..4f3aee1bfc6
--- /dev/null
+++ b/addons/l10n_vn/account_tax_code.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <!-- Tax Code Definitions -->
+
+    <record model="account.tax.code.template" id="vat_code_tax">
+        <field name="name">Tờ khai thuế GTGT</field>
+        <field name="code">MAIN</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in">
+        <field name="name">HHDV mua vào</field>
+        <field name="parent_id" ref="vat_code_tax"/>
+        <field name="code">IN</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out">
+        <field name="name">HHDV bán ra</field>
+        <field name="parent_id" ref="vat_code_tax"/>
+        <field name="code">OUT</field>
+    </record>
+    
+    <!-- Tax base -->
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_base">
+        <field name="name">Giá trị HHDV mua vào</field>
+        <field name="parent_id" ref="vat_code_tax_in"/>
+        <field name="code">IN_BASE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_00_base">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_base"/>
+        <field name="code">IN_BASE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_05_base">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_base"/>
+        <field name="code">IN_BASE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_10_base">
+        <field name="name">Giá trị HHDV mua vào chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_base"/>
+        <field name="code">IN_BASE_10</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_base">
+        <field name="name">Giá trị HHDV bán ra</field>
+        <field name="parent_id" ref="vat_code_tax_out"/>
+        <field name="code">OUT_BASE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_00_base">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_base"/>
+        <field name="code">OUT_BASE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_05_base">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_base"/>
+        <field name="code">OUT_BASE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_10_base">
+        <field name="name">Giá trị HHDV bán ra chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_base"/>
+        <field name="code">OUT_BASE_10</field>
+    </record>
+    
+    <!-- Tax balance -->
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_balance">
+        <field name="name">Thuế GTGT HHDV mua vào</field>
+        <field name="parent_id" ref="vat_code_tax_in"/>
+        <field name="code">IN_BALANCE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_00_balance">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_balance"/>
+        <field name="code">IN_BALANCE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_05_balance">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_balance"/>
+        <field name="code">IN_BALANCE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_in_local_10_balance">
+        <field name="name">Thuế GTGT HHDV mua vào chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_in_local_balance"/>
+        <field name="code">IN_BALANCE_10</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_balance">
+        <field name="name">Thuế GTGT HHDV bán ra</field>
+        <field name="parent_id" ref="vat_code_tax_out"/>
+        <field name="code">OUT_BALANCE</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_00_balance">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 0%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_balance"/>
+        <field name="code">OUT_BALANCE_00</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_05_balance">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 5%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_balance"/>
+        <field name="code">OUT_BALANCE_05</field>
+    </record>
+    
+    <record model="account.tax.code.template" id="vat_code_tax_out_local_10_balance">
+        <field name="name">Thuế GTGT HHDV bán ra chịu thuế 10%</field>
+        <field name="parent_id" ref="vat_code_tax_out_local_balance"/>
+        <field name="code">OUT_BALANCE_10</field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/l10n_vn/l10n_vn_wizard.xml b/addons/l10n_vn/l10n_vn_wizard.xml
new file mode 100755
index 00000000000..368a3cbd8b3
--- /dev/null
+++ b/addons/l10n_vn/l10n_vn_wizard.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
+        
+    </data>
+</openerp>        
\ No newline at end of file
diff --git a/addons/l10n_vn/static/src/img/icon.png b/addons/l10n_vn/static/src/img/icon.png
new file mode 100755
index 00000000000..241a2d3fa74
Binary files /dev/null and b/addons/l10n_vn/static/src/img/icon.png differ
diff --git a/addons/lunch/i18n/ko.po b/addons/lunch/i18n/ko.po
new file mode 100644
index 00000000000..e76966ad73b
--- /dev/null
+++ b/addons/lunch/i18n/ko.po
@@ -0,0 +1,896 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-11 19:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-12 05:28+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+
+#. module: lunch
+#: field:lunch.product,category_id:0
+#: field:lunch.product.category,name:0
+msgid "Category"
+msgstr "범주"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_by_supplier_form
+msgid "Today's Orders by Supplier"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "My Orders"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Partially Confirmed"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,sunday:0
+msgid "Sunday"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,supplier:0
+#: field:lunch.product,supplier:0
+msgid "Supplier"
+msgstr "공급업체"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Today"
+msgstr "오늘"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "March"
+msgstr "3월"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "By Employee"
+msgstr "직원에 의해"
+
+#. module: lunch
+#: field:lunch.alert,friday:0
+msgid "Friday"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "validate order lines"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Order lines Tree"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,specific_day:0
+#: field:report.lunch.order.line,day:0
+msgid "Day"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+#: selection:lunch.order.line,state:0
+msgid "Received"
+msgstr "받음"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "By Supplier"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_order_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch order. \n"
+"            </p>\n"
+"            <p>\n"
+"                A lunch order is defined by its user, date and order lines.\n"
+"                Each order line corresponds to a product, an additional note "
+"and a price.\n"
+"                Before selecting your order lines, don't forget to read the "
+"warnings displayed in the reddish area.\n"
+"            </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Not Received"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_by_supplier_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_control_suppliers
+msgid "Orders by Supplier"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Receive Meals"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "cashmove form"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove_form
+msgid ""
+"<p>\n"
+"                Here you can see your cash moves.<br/>A cash moves can be "
+"either an expense or a payment.\n"
+"                An expense is automatically created when an order is "
+"received while a payment is a reimbursement to the company encoded by the "
+"manager.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_products
+#: model:ir.ui.menu,name:lunch.menu_lunch_products
+#: field:lunch.order,order_line_ids:0
+msgid "Products"
+msgstr "상품"
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "By Date"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+#: view:lunch.order.line:0
+#: selection:lunch.order.line,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "lunch employee payment"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "alert tree"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order_line
+msgid "Lunch Orders Statistics"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_alert
+msgid "Lunch Alert"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:183
+#, python-format
+msgid "Select a product and put your order comments on the note."
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Every Week"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove
+msgid "Register Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "lunch orders"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.line:0
+msgid "Confirm"
+msgstr "확정"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+msgid "Your Account"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Your Lunch Account"
+msgstr "점심 계정"
+
+#. module: lunch
+#: field:lunch.alert,active_from:0
+msgid "Between"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_order
+msgid "Wizard to order a meal"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+#: selection:lunch.order.line,state:0
+msgid "New"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:180
+#, python-format
+msgid "This is the first time you order a meal"
+msgstr "이것은 첫번쨰 고기 주문입니다."
+
+#. module: lunch
+#: field:report.lunch.order.line,price_total:0
+msgid "Total Price"
+msgstr "총액"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_validation
+msgid "lunch validation for order"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Name/Date"
+msgstr "이름/날짜"
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Total :"
+msgstr "합계 :"
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "July"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_config
+msgid "Configuration"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order,state:0
+#: field:lunch.order.line,state:0
+msgid "Status"
+msgstr "상태"
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid ""
+"Order a meal doesn't mean that we have to pay it.\n"
+"                        A meal should be paid when it is received."
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_control_accounts
+#: model:ir.ui.menu,name:lunch.menu_lunch_control_accounts
+msgid "Control Accounts"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Every Day"
+msgstr "매일"
+
+#. module: lunch
+#: field:lunch.order.line,cashmove:0
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.order_order_lines
+msgid "Order meals"
+msgstr "육류 주문"
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "Schedule Hour"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "September"
+msgstr "9월"
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_control_suppliers
+msgid ""
+"<p>\n"
+"                Here you can see every orders grouped by suppliers and by "
+"date.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
+"that the order is ordered <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
+"the order is received <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> red X to announce "
+"that the order isn't available\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,tuesday:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_tree
+msgid "Your Orders"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,month:0
+msgid "Month"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_products
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a product for lunch. \n"
+"            </p>\n"
+"              <p>\n"
+"                A product is defined by its name, category, price and "
+"supplier.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+#: field:lunch.alert,message:0
+msgid "Message"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Order Meals"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+#: view:lunch.order.order:0
+#: view:lunch.validation:0
+msgid "or"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_product_categories
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch category. \n"
+"            </p>\n"
+"              <p>\n"
+"                Here you can find every lunch categories for products.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Order meal"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_categories
+msgid "Product Categories"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_control_suppliers
+msgid "Control Suppliers"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+msgid "Schedule Date"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_alert
+#: model:ir.ui.menu,name:lunch.menu_lunch_alert
+#: field:lunch.order,alerts:0
+msgid "Alerts"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,note:0
+#: field:report.lunch.order.line,note:0
+msgid "Note"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:250
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+#: view:lunch.product.category:0
+msgid "Products Form"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.cancel_order_lines
+msgid "Cancel meals"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+#: view:lunch.cashmove:0
+msgid "lunch cashmove"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Are you sure you want to cancel these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "My Account"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "August"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,monday:0
+msgid "Monday"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,name:0
+msgid "unknown"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.validate_order_lines
+msgid "Receive meals"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "June"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,user_id:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.order.line,user_id:0
+msgid "User Name"
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.category,name:lunch.module_lunch_category
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_title
+msgid "Lunch"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_line
+msgid "lunch order line"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "lunch product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,user_id:0
+#: model:res.groups,name:lunch.group_lunch_user
+msgid "User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,date:0
+#: field:lunch.order,date:0
+#: field:lunch.order.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "November"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Orders Tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Orders Form"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.alert:0
+#: view:lunch.order.line:0
+msgid "Search"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "October"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_order_by_supplier_form
+msgid ""
+"<p>\n"
+"                Here you can see today's orders grouped by suppliers.\n"
+"              </p>\n"
+"              <p>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/terp-call-start.png\"/> to announce "
+"that the order is ordered <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-apply.png\"/> to announce that "
+"the order is received <br/>\n"
+"                - Click on the <img "
+"src=\"../../../web/static/src/img/icons/gtk-cancel.png\"/> to announce that "
+"the order isn't available\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "January"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.alert,alter_type:0
+msgid "Specific Day"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,wednesday:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product.category:0
+msgid "Product Category: "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,active_to:0
+msgid "And"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order.line,state:0
+msgid "Ordered"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Cancel Orders"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_alert
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a lunch alert. \n"
+"            </p>\n"
+"              <p>\n"
+"                Alerts are used to warn employee from possible issues "
+"concerning the lunch orders.\n"
+"                To create a lunch alert you have to define its recurrency, "
+"the time interval during which the alert should be executed and the message "
+"to display.\n"
+"            </p>\n"
+"            <p>\n"
+"                Example: <br/>\n"
+"                - Recurency: Everyday<br/>\n"
+"                - Time interval: from 00h00 am to 11h59 pm<br/>\n"
+"                - Message: \"You must order before 10h30 am\"\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "A cancelled meal should not be paid by employees."
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cash
+msgid "Administrate Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cancel
+msgid "cancel lunch order"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "December"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+#: view:lunch.order.line:0
+#: view:lunch.order.order:0
+#: view:lunch.validation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_cashmove
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a payment. \n"
+"            </p>\n"
+"              <p>\n"
+"                Here you can see the employees' payment. A payment is a cash "
+"move from the employee to the company.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:186
+#, python-format
+msgid "Your favorite meals will be created based on your last orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.module.category,description:lunch.module_lunch_category
+msgid ""
+"Helps you handle your lunch needs, if you are a manager you will be able to "
+"create new products, cashmoves and to confirm or cancel orders."
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new payment. \n"
+"            </p>\n"
+"              <p>\n"
+"                A cashmove can either be an expense or a payment.<br/>\n"
+"                An expense is automatically created at the order "
+"receipt.<br/>\n"
+"                A payment represents the employee reimbursement to the "
+"company.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,alter_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: lunch
+#: code:addons/lunch/lunch.py:189
+#, python-format
+msgid "Don't forget the alerts displayed in the reddish area"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,thursday:0
+msgid "Thursday"
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order.line:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,product_id:0
+#: field:lunch.product,name:0
+msgid "Product"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,description:0
+#: report:lunch.order.line:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "May"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.order.line,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,state:0
+msgid "Is an order or a Payment"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+msgid "New Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "cashmove tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "Cancel a meal means that we didn't receive it from the supplier."
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: selection:lunch.cashmove,state:0
+msgid "Payment"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "February"
+msgstr ""
+
+#. module: lunch
+#: field:report.lunch.order.line,year:0
+msgid "Year"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "List"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_admin
+msgid "Administrate Orders"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.order.line,month:0
+msgid "April"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Select your order"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,order_id:0
+#: selection:lunch.cashmove,state:0
+#: report:lunch.order.line:0
+#: view:lunch.order.line:0
+#: field:lunch.order.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: report:lunch.order.line:0
+msgid "Lunch Order"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.order:0
+msgid "Are you sure you want to order these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cancel:0
+msgid "cancel order lines"
+msgstr ""
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product_category
+msgid "lunch product category"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.alert,saturday:0
+msgid "Saturday"
+msgstr ""
+
+#. module: lunch
+#: model:res.groups,name:lunch.group_lunch_manager
+msgid "Manager"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Did your received these meals?"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.validation:0
+msgid "Once a meal is received a new cash move is created for the employee."
+msgstr ""
+
+#. module: lunch
+#: view:lunch.product:0
+msgid "Products Tree"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: field:lunch.order,total:0
+#: view:lunch.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
+msgid "Previous Orders"
+msgstr ""
diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py
index 3a439a4a4dd..13c885e7896 100644
--- a/addons/lunch/report/report_lunch_order.py
+++ b/addons/lunch/report/report_lunch_order.py
@@ -60,6 +60,5 @@ class report_lunch_order(osv.osv):
                    lo.date,lo.user_id,lo.note
             )
             """)
-report_lunch_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 3f517ee7858..4e935e4aa88 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -27,6 +27,25 @@
             <field name="priority">1000</field>
         </record>
 
+        <record id="ir_cron_mail_garbage_collect_attachments" model="ir.cron">
+            <field name="name">Garbage Collect Mail Attachments</field>
+            <field eval="True" name="active" />
+            <field name="user_id" ref="base.user_root" />
+            <field name="interval_number">1</field>
+            <field name="interval_type">weeks</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall" />
+            <field name="model">mail.thread</field>
+            <field name="function">_garbage_collect_attachments</field>
+            <field name="args">()</field>
+        </record>
+
+        <!-- Catchall Email Alias -->
+        <record id="icp_mail_catchall_alias" model="ir.config_parameter">
+            <field name="key">mail.catchall.alias</field>
+            <field name="value">catchall</field>
+        </record>
+
         <!-- Discussion subtype for messaging / Chatter -->
         <record id="mt_comment" model="mail.message.subtype">
             <field name="name">Discussions</field>
diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html
new file mode 100644
index 00000000000..b564cf3ab1e
--- /dev/null
+++ b/addons/mail/html/index.html
@@ -0,0 +1,178 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Enterprise Social Network</h2>
+            <h3 class="oe_slogan">A private social network for your company</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="mail_sc_00.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Connect with experts, follow what interests you, share documents and promote
+best practices. Get work done with effective collaboration across departments,
+geographies, documents and business applications. All of this while decreasing
+email overload.
+
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Connect with experts</h2>
+        <h3 class="oe_slogan">Get the right information, when you need it</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Next time you have a question for the marketing, sales, R&amp;D or any other
+department, don't send an email blast-post the question to OpenERP and get
+answers from the right persons.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Follow what interests you</h2>
+        <h3 class="oe_slogan">Make the information flow across your company</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="mail_sc_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Want to get informed about new product features, hot deals, bottlenecks in projects or any other event? Just follow what interests you to get the information you need what you need; no more, no less.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Get Things Done</h2>
+        <h3 class="oe_slogan">Your inbox is a todo list</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+You can process (not only read) the inbox and easily mark messages for future actions. Start feeling the pleasure of having an empty inbox every day; no more overload of information.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_03.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Promote best practices</h2>
+        <h3 class="oe_slogan">Discussion groups at your fingertips</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_04.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Cut back on meetings and email chains by working together in groups of interests. Create a group to let people share files, discuss ideas, and vote to promote best practices.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Improve Access to Information and Expertise</h2>
+        <h3 class="oe_slogan">Easily find the information you need</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Break down information silos. Search across your existing systems to find the answers and expertise you need to complete projects quickly.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_illustration.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Collaborate securely</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_06.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Set the right security policy; public, private or on invitation only -- according to the information sensitivity.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">A Twitter-like Network For Your Company </h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Make every employee feel more connected and engaged with twitter-like features
+for your own company. Follow people, share best practices, 'like' top ideas, etc.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_07.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Trusted by millions worldwide</h2>
+        </div>
+        <div class="oe_span12">
+            <div class="oe_quote">
+                <q>
+                Emails make me waste my time. But I need them. Reading my inbox
+                is the most unproductive task I do on a daily basis. I have to
+                spend one or two full hours a day to process my emails. All the
+                junk flows in the same inbox; spams, information that doesn't
+                matter, quoted answers of quoted answers, etc. At the end of
+                the hour, only 10 emails actually requested an answer from me.
+                Since I use OpenERP, I can do the same job in only 10 minutes!
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="photo.png">
+                    <div class="oe_author">Luc de Keyser</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/mail/html/mail_illustration.png b/addons/mail/html/mail_illustration.png
new file mode 100644
index 00000000000..4fff4837faa
Binary files /dev/null and b/addons/mail/html/mail_illustration.png differ
diff --git a/addons/mail/html/mail_sc_00.png b/addons/mail/html/mail_sc_00.png
new file mode 100644
index 00000000000..3011ef129b5
Binary files /dev/null and b/addons/mail/html/mail_sc_00.png differ
diff --git a/addons/mail/html/mail_sc_01.png b/addons/mail/html/mail_sc_01.png
new file mode 100644
index 00000000000..1b1099f6536
Binary files /dev/null and b/addons/mail/html/mail_sc_01.png differ
diff --git a/addons/mail/html/mail_sc_02.png b/addons/mail/html/mail_sc_02.png
new file mode 100644
index 00000000000..4e59c9d1e0f
Binary files /dev/null and b/addons/mail/html/mail_sc_02.png differ
diff --git a/addons/mail/html/mail_sc_03.png b/addons/mail/html/mail_sc_03.png
new file mode 100644
index 00000000000..dbb14b4da36
Binary files /dev/null and b/addons/mail/html/mail_sc_03.png differ
diff --git a/addons/mail/html/mail_sc_04.png b/addons/mail/html/mail_sc_04.png
new file mode 100644
index 00000000000..b8f47ba2935
Binary files /dev/null and b/addons/mail/html/mail_sc_04.png differ
diff --git a/addons/mail/html/mail_sc_05.png b/addons/mail/html/mail_sc_05.png
new file mode 100644
index 00000000000..251b4ebc676
Binary files /dev/null and b/addons/mail/html/mail_sc_05.png differ
diff --git a/addons/mail/html/mail_sc_06.png b/addons/mail/html/mail_sc_06.png
new file mode 100644
index 00000000000..251b4ebc676
Binary files /dev/null and b/addons/mail/html/mail_sc_06.png differ
diff --git a/addons/mail/html/mail_sc_07.png b/addons/mail/html/mail_sc_07.png
new file mode 100644
index 00000000000..9a33332817e
Binary files /dev/null and b/addons/mail/html/mail_sc_07.png differ
diff --git a/addons/mail/html/photo.png b/addons/mail/html/photo.png
new file mode 100644
index 00000000000..e605e5c6f8e
Binary files /dev/null and b/addons/mail/html/photo.png differ
diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po
new file mode 100644
index 00000000000..6315792f4fc
--- /dev/null
+++ b/addons/mail/i18n/ko.po
@@ -0,0 +1,1687 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-05-12 07:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-13 05:17+0000\n"
+"X-Generator: Launchpad (build 16614)\n"
+
+#. module: mail
+#: view:mail.followers:0
+msgid "Followers Form"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,author_id:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr "작성자"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_to:0
+msgid "Message recipients"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Comments"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,body:0
+#: help:mail.message,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_name:0
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+"<jobs@example.my.openerp.com>"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "메일 작성"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Name"
+msgstr "그룹명"
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr "본문"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Show messages to read"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0
+#: help:mail.message,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr "보내는 사람의 이메일 주소. 이 필드는 수신 메일에서 일치하는 파트너를 찾을 수 없을 때 설정됩니다."
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_unread:0
+#: field:mail.thread,message_unread:0
+#: field:res.partner,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:296
+#, python-format
+msgid "show"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,group_ids:0
+msgid ""
+"Members of those groups will automatically added as followers. Note that "
+"they will be able to manage their subscription manually if necessary."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:1019
+#, python-format
+msgid "Do you really want to delete this message?"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+#: field:mail.notification,read:0
+msgid "Read"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Search Groups"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:159
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:726
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_medium:0
+msgid ""
+"Medium-sized photo of the group. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:212
+#, python-format
+msgid "Uploading error"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Thread"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "Open the full mail composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:29
+#, python-format
+msgid "&ograve"
+msgstr ""
+
+#. module: mail
+#: field:base.config.settings,alias_domain:0
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_ids:0
+msgid "Auto Subscription"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,references:0
+msgid "References"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:206
+#, python-format
+msgid "No messages."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_group
+msgid "Discussion group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:98
+#: code:addons/mail/static/src/xml/mail.xml:110
+#, python-format
+msgid "uploading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "more."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,type:0
+#: help:mail.message,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,relation_field:0
+msgid ""
+"Field used to link the related model to the subtype model when using "
+"automatic subscription on a related document. The field is used to compute "
+"getattr(related_document.relation_field)."
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:37
+#, python-format
+msgid "<div>You have been invited to follow %s.</div>"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_unread:0
+#: help:mail.thread,message_unread:0
+#: help:res.partner,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
+#: model:ir.ui.menu,name:mail.mail_tomefeeds
+msgid "To: me"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,name:0
+msgid "Message Type"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:295
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:74
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:25
+#, python-format
+msgid "User img"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_mail
+#: model:ir.ui.menu,name:mail.menu_mail_mail
+#: view:mail.mail:0
+#: view:mail.message:0
+msgid "Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.followers,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_summary:0
+#: help:mail.thread,message_summary:0
+#: help:res.partner,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_model_id:0
+msgid ""
+"The model (OpenERP Document Kind) to which this alias corresponds. Any "
+"incoming email that does not reply to an existing record will cause the "
+"creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: selection:mail.message,type:0
+msgid "System notification"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner
+#: view:mail.mail:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: view:mail.message.subtype:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:36
+#: view:mail.compose.message:0
+#, python-format
+msgid "Send"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:155
+#, python-format
+msgid "No followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
+#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.ui.menu,name:mail.menu_email_followers
+#: view:mail.followers:0
+#: field:mail.group,message_follower_ids:0
+#: field:mail.thread,message_follower_ids:0
+#: field:res.partner,message_follower_ids:0
+#, python-format
+msgid "Followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_archives_feeds
+#: model:ir.ui.menu,name:mail.mail_archivesfeeds
+msgid "Archives"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:97
+#: code:addons/mail/static/src/xml/mail.xml:109
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:245
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:157
+#, python-format
+msgid "One follower"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,type:0
+#: field:mail.message,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Email"
+msgstr ""
+
+#. module: mail
+#: field:ir.ui.menu,mail_group_id:0
+msgid "Mail Group"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Comments and Emails"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:89
+#, python-format
+msgid "%s has joined the %s network."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_small:0
+msgid ""
+"Small-sized photo of the group. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: field:mail.message,partner_ids:0
+msgid "Recipients"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:142
+#, python-format
+msgid "<<<"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:43
+#, python-format
+msgid "Write to the followers of this document..."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_public_id:0
+msgid "Authorized Group"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Join Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_from:0
+msgid "Message sender, taken from user preferences."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:40
+#, python-format
+msgid "<div>You have been invited to follow a new document.</div>"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,parent_id:0
+#: field:mail.message,parent_id:0
+msgid "Parent Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,res_id:0
+#: field:mail.followers,res_id:0
+#: field:mail.message,res_id:0
+#: field:mail.wizard.invite,res_id:0
+msgid "Related Document ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_to_me_feeds
+msgid ""
+"<p>\n"
+"                    <b>No private message.</b>\n"
+"                </p><p>\n"
+"                    This list contains messages sent to you.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_rd
+msgid "R&D"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:61
+#, python-format
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:244
+#, python-format
+msgid "Move to Inbox"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:165
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid ""
+"You may not create a user. To create new users, you should use the "
+"\"Settings > Users\" menu."
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_model:0
+#: help:mail.wizard.invite,res_model:0
+msgid "Model of the followed resource"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:320
+#, python-format
+msgid "like"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:47
+#, python-format
+msgid "Share with my followers..."
+msgstr ""
+
+#. module: mail
+#: field:mail.notification,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"Only the invited followers can read the\n"
+"                                    discussions on this group."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Has attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "on"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:915
+#, python-format
+msgid ""
+"The following partners chosen as recipients for the email have no email "
+"address linked :"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_defaults:0
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notified_partner_ids:0
+#: help:mail.message,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Comment"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,notification:0
+msgid "Is Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:188
+#, python-format
+msgid "Compose a new message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Send Now"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:74
+#, python-format
+msgid ""
+"Unable to send email, please configure the sender's email address or alias."
+msgstr ""
+
+#. module: mail
+#: help:res.users,alias_id:0
+msgid ""
+"Email address internally associated with this user. Incoming emails will "
+"appear in the user's notifications."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:56
+#: code:addons/mail/static/src/xml/mail.xml:191
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,vote_user_ids:0
+#: help:mail.message,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,alias_id:0
+msgid ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,child_ids:0
+#: field:mail.message,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+#: field:mail.mail,mail_message_id:0
+#: view:mail.message:0
+#: field:mail.notification,message_id:0
+#: field:mail.wizard.invite,message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_id:0
+#: help:mail.wizard.invite,res_id:0
+msgid "Id of the followed resource"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body:0
+#: field:mail.message,body:0
+msgid "Contents"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_alias
+#: model:ir.ui.menu,name:mail.mail_alias_menu
+msgid "Aliases"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,vote_user_ids:0
+#: field:mail.message,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,public:0
+msgid "Privacy"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:650
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_force_thread_id:0
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_group_root
+msgid "My Groups"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_archives_feeds
+msgid ""
+"<p>\n"
+"                    No message found and no message sent yet.\n"
+"                </p><p>\n"
+"                    Click on the top-right icon to compose a message. This\n"
+"                    message will be sent by email if it's an internal "
+"contact.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: field:mail.mail,state:0
+msgid "Status"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "All feeds"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,record_name:0
+#: help:mail.message,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_notifications
+#: model:ir.model,name:mail.model_mail_notification
+#: model:ir.ui.menu,name:mail.menu_email_notifications
+#: field:mail.compose.message,notification_ids:0
+#: view:mail.message:0
+#: field:mail.message,notification_ids:0
+#: view:mail.notification:0
+msgid "Notifications"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+msgid "Search Alias"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_force_thread_id:0
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,name:0
+msgid ""
+"Message subtype gives a more precise type on the message, especially for "
+"system notifications. For example, it can be a notification related to a new "
+"record (New), or to a stage change in a process (Stage change). Message "
+"subtypes allow to precisely tune the notifications the user want to receive "
+"on its wall."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "by"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_best_sales_practices
+msgid "Best Sales Practices"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Selected Group Only"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_is_follower:0
+#: field:mail.thread,message_is_follower:0
+#: field:res.partner,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Groups"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Messages Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0
+#: field:mail.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:34
+#, python-format
+msgid "Post"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:122
+#, python-format
+msgid "To:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:193
+#, python-format
+msgid "Write to my followers"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,default:0
+msgid "Default"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:294
+#, python-format
+msgid "show more message"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:246
+#, python-format
+msgid "Mark as Todo"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_summary:0
+#: field:mail.thread,message_summary:0
+#: field:res.partner,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subtype_id:0
+#: field:mail.followers,subtype_ids:0
+#: field:mail.message,subtype_id:0
+#: view:mail.message.subtype:0
+msgid "Subtype"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Form"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:296
+#, python-format
+msgid "more messages"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:13
+#, python-format
+msgid "Following"
+msgstr ""
+
+#. module: mail
+#: sql_constraint:mail.alias:0
+msgid ""
+"Unfortunately this email alias is already used, please choose a unique one"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_user_id:0
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image:0
+msgid ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,attachment_ids:0
+#: view:mail.mail:0
+#: field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,record_name:0
+#: field:mail.message,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:125
+#: view:mail.compose.message:0
+#, python-format
+msgid "Followers of"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_group_feeds
+msgid "Discussion Group"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:242
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_comment
+msgid "Discussions"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:11
+#, python-format
+msgid "Follow"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
+msgid "Whole Company"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:131
+#: code:addons/mail/static/src/xml/mail.xml:278
+#: view:mail.compose.message:0
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,body_html:0
+msgid "Rich-text/HTML message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:306
+#, python-format
+msgid "Compose new Message"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,menu_id:0
+msgid "Related Menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Content"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,notified_partner_ids:0
+#: field:mail.message,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,public:0
+msgid ""
+"This group is visible by non members.             Invisible groups can add "
+"members through the invite button."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_board
+msgid "Board meetings"
+msgstr ""
+
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_model_id:0
+msgid "Aliased Model"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0
+#: help:mail.message,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
+msgid "Description"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_followers
+msgid "Document Followers"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
+#, python-format
+msgid "Remove this follower"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Never"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:919
+#, python-format
+msgid "Partners email addresses not found"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Sent"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
+#. module: mail
+#: help:res.partner,notification_email_send:0
+msgid ""
+"Choose in which case you want to receive an email when you receive new feeds."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_groups
+#: model:ir.ui.menu,name:mail.mail_allgroups
+msgid "Join a group"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_group_feeds
+msgid ""
+"<p>\n"
+"                    No message in this group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:213
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"This group is visible by everyone,\n"
+"                                    including your customers if you "
+"installed\n"
+"                                    the portal module."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:243
+#, python-format
+msgid "Set back to Todo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:128
+#, python-format
+msgid "this document"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr ""
+
+#. module: mail
+#: help:base.config.settings,alias_domain:0
+msgid ""
+"If you have setup a catch-all email domain redirected to the OpenERP server, "
+"enter the domain name here."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:141
+#, python-format
+msgid "others..."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.alias,alias_name:0
+#: field:mail.group,alias_id:0
+#: field:res.users,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notification_ids:0
+#: help:mail.message,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_feeds
+#: model:ir.ui.menu,name:mail.mail_feeds_main
+msgid "Messaging"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.message.subtype,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Unread"
+msgstr "읽지 않음"
+
+#. module: mail
+#: help:mail.followers,subtype_ids:0
+msgid ""
+"Message subtypes followed, meaning subtypes that will be pushed onto the "
+"user's Wall."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_ids:0
+#: help:mail.thread,message_ids:0
+#: help:res.partner,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,composition_mode:0
+msgid "Composition mode"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0
+#: field:mail.followers,res_model:0
+#: field:mail.message,model:0
+#: field:mail.wizard.invite,res_model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:321
+#, python-format
+msgid "unlike"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,author_id:0
+#: help:mail.message,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_domain:0
+msgid "Alias domain"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error during communication with the publisher warranty server."
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_star_feeds
+msgid ""
+"<p>\n"
+"                    <b>No todo.</b>\n"
+"                </p><p>\n"
+"                    When you process messages in your inbox, you can mark "
+"some\n"
+"                    as <i>todo</i>. From this menu, you can process all your "
+"todo.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,partner_ids:0
+msgid "Additional contacts"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,parent_id:0
+#: help:mail.message,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_hr_policies
+msgid "HR Policies"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Emails only"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
+#: model:ir.ui.menu,name:mail.mail_inboxfeeds
+msgid "Inbox"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:58
+#, python-format
+msgid "File"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/many2many_tags_email.js:63
+#, python-format
+msgid "Please complete partner's informations and Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_message_subtype
+#: model:ir.ui.menu,name:mail.menu_message_subtype
+msgid "Subtypes"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_alias
+msgid "Email Aliases"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_small:0
+msgid "Small-sized photo"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,reply_to:0
+msgid "Preferred response address for the message"
+msgstr ""
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index d5e3b675b56..870695e074e 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -117,8 +117,13 @@ class mail_alias(osv.Model):
            mail catchall domain from config.
            e.g. `jobs@openerp.my.openerp.com` or `sales@openerp.my.openerp.com`
         """
-        return [(record['id'], "%s@%s" % (record['alias_name'], record['alias_domain']))
-                    for record in self.read(cr, uid, ids, ['alias_name', 'alias_domain'], context=context)]
+        res = []
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.alias_name and record.alias_domain:
+                res.append((record['id'], "%s@%s" % (record.alias_name, record.alias_domain)))
+            else:
+                res.append((record['id'], False))
+        return res
 
     def _find_unique(self, cr, uid, name, context=None):
         """Find a unique alias name similar to ``name``. If ``name`` is
@@ -134,7 +139,7 @@ class mail_alias(osv.Model):
         return new_name
 
     def migrate_to_alias(self, cr, child_model_name, child_table_name, child_model_auto_init_fct,
-        alias_id_column, alias_key, alias_prefix = '', alias_force_key = '', alias_defaults = {}, context=None):
+        alias_id_column, alias_key, alias_prefix='', alias_force_key='', alias_defaults={}, context=None):
         """ Installation hook to create aliases for all users and avoid constraint errors.
 
             :param child_model_name: model name of the child class (i.e. res.users)
@@ -149,25 +154,27 @@ class mail_alias(osv.Model):
             :param alias_defaults: dict, keys = mail.alias columns, values = child
                 model column name used for default values (i.e. {'job_id': 'id'})
         """
+        if context is None:
+            context = {}
 
-        # disable the unique alias_id not null constraint, to avoid spurious warning during 
+        # disable the unique alias_id not null constraint, to avoid spurious warning during
         # super.auto_init. We'll reinstall it afterwards.
         alias_id_column.required = False
 
         # call _auto_init
-        child_model_auto_init_fct(cr, context=context)
+        res = child_model_auto_init_fct(cr, context=context)
 
         registry = RegistryManager.get(cr.dbname)
         mail_alias = registry.get('mail.alias')
-        child_class_model = registry.get(child_model_name)
-        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
+        child_class_model = registry[child_model_name]
+        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test': False})
         # Use read() not browse(), to avoid prefetching uninitialized inherited fields
         for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]):
-            alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) }
+            alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key])}
             if alias_force_key:
                 alias_vals['alias_force_thread_id'] = obj_data[alias_force_key]
-            alias_vals['alias_defaults'] = dict( (k, obj_data[v]) for k, v in alias_defaults.iteritems())
-            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=child_model_name)
+            alias_vals['alias_defaults'] = dict((k, obj_data[v]) for k, v in alias_defaults.iteritems())
+            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=context.get('alias_model_name', child_model_name))
             child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id})
             _logger.info('Mail alias created for %s %s (uid %s)', child_model_name, obj_data[alias_key], obj_data['id'])
 
@@ -183,6 +190,8 @@ class mail_alias(osv.Model):
         # set back the unique alias_id constraint
         alias_id_column.required = True
 
+        return res
+
     def create_unique_alias(self, cr, uid, vals, model_name=None, context=None):
         """Creates an email.alias record according to the values provided in ``vals``,
         with 2 alterations: the ``alias_name`` value may be suffixed in order to
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 450b81dabbf..98e88b664e6 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -90,7 +90,7 @@ class mail_notification(osv.Model):
                 continue
             partner = notification.partner_id
             # If partners_to_notify specified: restrict to them
-            if partners_to_notify and partner.id not in partners_to_notify:
+            if partners_to_notify is not None and partner.id not in partners_to_notify:
                 continue
             # Do not send to partners without email address defined
             if not partner.email:
@@ -118,8 +118,8 @@ class mail_notification(osv.Model):
                     Administrator
                 </p>
                 <div>
-                    <small>Send by <a ...>Your Company</a> using <a ...>OpenERP</a>.</small> OR
-                    <small>Send by Administrator using <a ...>OpenERP</a>.</small>
+                    <small>Sent by <a ...>Your Company</a> using <a ...>OpenERP</a>.</small> OR
+                    <small>Sent by Administrator using <a ...>OpenERP</a>.</small>
                 </div>
         """
         footer = ""
@@ -135,14 +135,17 @@ class mail_notification(osv.Model):
         footer = tools.append_content_to_html(footer, signature, plaintext=False, container_tag='p')
 
         # add company signature
-        if user.company_id:
-            company = user.company_id.website and "<a style='color:inherit' href='%s'>%s</a>" % (user.company_id.website, user.company_id.name) or user.company_id.name
+        if user.company_id.website:
+            website_url = ('http://%s' % user.company_id.website) if not user.company_id.website.lower().startswith(('http:', 'https:')) \
+                else user.company_id.website
+            company = "<a style='color:inherit' href='%s'>%s</a>" % (website_url, user.company_id.name)
         else:
-            company = user.name
-        signature_company = _('<small>Send by %(company)s using %(openerp)s.</small>') % {
+            company = user.company_id.name
+        sent_by = _('Sent by %(company)s using %(openerp)s.')
+        signature_company = '<small>%s</small>' % (sent_by % {
                 'company': company,
                 'openerp': "<a style='color:inherit' href='https://www.openerp.com/'>OpenERP</a>"
-            }
+            })
         footer = tools.append_content_to_html(footer, signature_company, plaintext=False, container_tag='div')
 
         return footer
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 5ccee40d5c7..04212b2f58a 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -29,6 +29,7 @@
                     <field name="message_is_follower"/>
                     <field name="message_summary"/>
                     <field name="description"/>
+                    <field name="alias_id"/>
                     <templates>
                         <t t-name="kanban-description">
                             <div class="oe_group_description" t-if="record.description.raw_value">
@@ -42,6 +43,9 @@
                                 </div>
                                 <div class="oe_group_details">
                                     <h4><a type="open"><field name="name"/></a></h4>
+                                    <div class="oe_kanban_alias" t-if="record.alias_id.value">
+                                        <span class="oe_e">%%</span><small><field name="alias_id"/></small>
+                                    </div>
                                     <div class="oe_grey">
                                         <field name="description"/>
                                     </div>
@@ -68,39 +72,43 @@
             <field name="arch" type="xml">
                 <form string="Group Form" version="7.0">
                     <sheet class="openerp_mail_group_sheet">
-                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
+                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_small"}'/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
                                 <label for="name" string="Group Name"/>
                             </div>
                             <h1><field name="name" readonly="0"/></h1>
-                            <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <field name="alias_id" invisible="1" required="0"/>
-                                    <label for="alias_name" class="oe_edit_only"/>
-                                    <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
+                            <div name="group_alias"
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                <label for="alias_id" string="Email Alias"/>
+                                <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                                <span name="edit_alias" class="oe_edit_only">
+                                    <field name="alias_name" class="oe_inline"
+                                            attrs="{'required': [('alias_id', '!=', False)]}"/>
+                                    @
+                                    <field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </span>
                             </div>
-                            <field name="description" placeholder="Topics discussed in this group..."/>
                         </div>
+                        <field name="description" placeholder="Topics discussed in this group..."/>
                         <div class="oe_clear"/>
-                        <group>
-                            <group class="oe_edit_only">
-                                <field name="public"/>
-                                <field name="group_public_id"
-                                    attrs="{'invisible': [('public','&lt;&gt;','groups')], 'required': [('public','=','groups')]}"
-                                    />
-                                <field name="group_ids" widget="many2many_tags"/>
-                            </group>
-                            <group>
-                                <div class="oe_grey" attrs="{'invisible': [('public','&lt;&gt;','public')]}">
-                                    This group is visible by everyone,
-                                    including your customers if you installed
-                                    the portal module.
-                                </div>
-                                <div class="oe_grey" attrs="{'invisible': [('public','&lt;&gt;','private')]}">
-                                    Only the invited followers can read the
-                                    discussions on this group.
-                                </div>
-                            </group>
+                        <group class="oe_edit_only">
+                            <field name="public"/>
+                            <field name="group_public_id"
+                                attrs="{'invisible': [('public','&lt;&gt;','groups')], 'required': [('public','=','groups')]}"
+                                />
+                            <field name="group_ids" widget="many2many_tags"/>
+                        </group>
+                        <group attrs="{'invisible': [('public', 'not in', ['public', 'private'])]}">
+                            <div class="oe_grey" attrs="{'invisible': [('public','&lt;&gt;','public')]}">
+                                This group is visible by everyone,
+                                including your customers if you installed
+                                the portal module.
+                            </div>
+                            <div class="oe_grey" attrs="{'invisible': [('public','&lt;&gt;','private')]}">
+                                Only the invited followers can read the
+                                discussions on this group.
+                            </div>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index ab2b6f3e922..bd2b9c3f18a 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -27,8 +27,8 @@ from urlparse import urljoin
 
 from openerp import tools
 from openerp import SUPERUSER_ID
+from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import fields, osv
-from openerp.osv.orm import except_orm
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -60,9 +60,6 @@ class mail_mail(osv.Model):
         'recipient_ids': fields.many2many('res.partner', string='To (Partners)'),
         'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
         'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
-        # If not set in create values, auto-detected based on create values (res_id, model, email_from)
-        'reply_to': fields.char('Reply-To',
-            help='Preferred response address for the message'),
         # Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
         # and during unlink() we will not cascade delete the parent and its attachments
         'notification': fields.boolean('Is Notification',
@@ -93,32 +90,42 @@ class mail_mail(osv.Model):
         """ Return a specific reply_to: alias of the document through message_get_reply_to
             or take the email_from
         """
+        # if value specified: directly return it
         if values.get('reply_to'):
             return values.get('reply_to')
-        email_reply_to = False
 
-        # model, res_id: comes from values OR related message
-        model = values.get('model')
-        res_id = values.get('res_id')
-        if values.get('mail_message_id') and (not model or not res_id):
+        mailgateway = True  # tells whether the answer will go through the mailgateway, leading to the formatting of reply_to <Followers of ...>
+        ir_config_parameter = self.pool.get("ir.config_parameter")
+        catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
+
+        # model, res_id, email_from, reply_to: comes from values OR related message
+        message = None
+        if values.get('mail_message_id'):
             message = self.pool.get('mail.message').browse(cr, uid, values.get('mail_message_id'), context=context)
-            if not model:
-                model = message.model
-            if not res_id:
-                res_id = message.res_id
+        model = values.get('model', message and message.model or False)
+        res_id = values.get('res_id', message and message.res_id or False)
+        email_from = values.get('email_from', message and message.email_from or False)
+        email_reply_to = message and message.reply_to or False
 
         # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias
-        if model and res_id and hasattr(self.pool.get(model), 'message_get_reply_to'):
-            email_reply_to = self.pool.get(model).message_get_reply_to(cr, uid, [res_id], context=context)[0]
+        if not email_reply_to and model and res_id and hasattr(self.pool[model], 'message_get_reply_to'):
+            email_reply_to = self.pool[model].message_get_reply_to(cr, uid, [res_id], context=context)[0]
+        # no alias reply_to -> catchall alias
+        if not email_reply_to:
+            catchall_alias = ir_config_parameter.get_param(cr, uid, "mail.catchall.alias", context=context)
+            if catchall_domain and catchall_alias:
+                email_reply_to = '%s@%s' % (catchall_alias, catchall_domain)
         # no alias reply_to -> reply_to will be the email_from, only the email part
-        if not email_reply_to and values.get('email_from'):
-            emails = tools.email_split(values.get('email_from'))
+        if not email_reply_to and email_from:
+            emails = tools.email_split(email_from)
             if emails:
                 email_reply_to = emails[0]
+                if emails[0].split('@')[1] != catchall_domain:
+                    mailgateway = False
 
         # format 'Document name <email_address>'
-        if email_reply_to and model and res_id:
-            document_name = self.pool.get(model).name_get(cr, SUPERUSER_ID, [res_id], context=context)[0]
+        if email_reply_to and model and res_id and mailgateway:
+            document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0]
             if document_name:
                 # sanitize document name
                 sanitized_doc_name = re.sub(r'[^\w+.]+', '-', document_name[1])
@@ -195,6 +202,36 @@ class mail_mail(osv.Model):
             self.unlink(cr, SUPERUSER_ID, [mail.id], context=context)
         return True
 
+    #------------------------------------------------------
+    # mail_mail formatting, tools and send mechanism
+    #------------------------------------------------------
+
+    # TODO in 8.0(+): maybe factorize this to enable in modules link generation
+    # independently of mail_mail model
+    # TODO in 8.0(+): factorize doc name sanitized and 'Followers of ...' formatting
+    # because it begins to appear everywhere
+
+    def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
+        """ Generate URLs for links in mails:
+            - partner is an user and has read access to the document: direct link to document with model, res_id
+        """
+        if partner and partner.user_ids:
+            base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+            # the parameters to encode for the query and fragment part of url
+            query = {'db': cr.dbname}
+            fragment = {
+                'login': partner.user_ids[0].login,
+                'action': 'mail.action_mail_redirect',
+            }
+            if mail.notification:
+                fragment.update({
+                        'message_id': mail.mail_message_id.id,
+                    })
+            url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
+            return _("""<small>Access your messages and documents <a style='color:inherit' href="%s">in OpenERP</a></small>""") % url
+        else:
+            return None
+
     def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
         """ If subject is void and record_name defined: '<Author> posted on <Resource>'
 
@@ -202,36 +239,12 @@ class mail_mail(osv.Model):
             :param browse_record mail: mail.mail browse_record
             :param browse_record partner: specific recipient partner
         """
-        if force or (not mail.subject and mail.model and mail.res_id):
+        if (force or not mail.subject) and mail.record_name:
             return 'Re: %s' % (mail.record_name)
+        elif (force or not mail.subject) and mail.parent_id and mail.parent_id.subject:
+            return 'Re: %s' % (mail.parent_id.subject)
         return mail.subject
 
-    def send_get_mail_body_footer(self, cr, uid, mail, partner=None, context=None):
-        """ Return a specific footer for the ir_email body.  The main purpose of this method
-            is to be inherited by Portal, to add modify the link for signing in, in
-            each notification email a partner receives.
-        """
-        body_footer = ""
-        # partner is a user, link to a related document (incentive to install portal)
-        if partner and partner.user_ids and mail.model and mail.res_id \
-                and self.check_access_rights(cr, partner.user_ids[0].id, 'read', raise_exception=False):
-            related_user = partner.user_ids[0]
-            try:
-                self.pool.get(mail.model).check_access_rule(cr, related_user.id, [mail.res_id], 'read', context=context)
-                base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
-                # the parameters to encode for the query and fragment part of url
-                query = {'db': cr.dbname}
-                fragment = {
-                    'login': related_user.login,
-                    'model': mail.model,
-                    'id': mail.res_id,
-                }
-                url = urljoin(base_url, "?%s#%s" % (urlencode(query), urlencode(fragment)))
-                body_footer = _("""<small>Access this document <a style='color:inherit' href="%s">directly in OpenERP</a></small>""") % url
-            except except_orm, e:
-                pass
-        return body_footer
-
     def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
         """ Return a specific ir_email body. The main purpose of this method
             is to be inherited to add custom content depending on some module.
@@ -241,9 +254,10 @@ class mail_mail(osv.Model):
         """
         body = mail.body_html
 
-        # add footer
-        body_footer = self.send_get_mail_body_footer(cr, uid, mail, partner=partner, context=context)
-        body = tools.append_content_to_html(body, body_footer, plaintext=False, container_tag='div')
+        # generate footer
+        link = self._get_partner_access_link(cr, uid, mail, partner, context=context)
+        if link:
+            body = tools.append_content_to_html(body, link, plaintext=False, container_tag='div')
         return body
 
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
@@ -276,7 +290,7 @@ class mail_mail(osv.Model):
             'email_to': email_to,
         }
 
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
+    def send(self, cr, uid, ids, auto_commit=False, raise_exception=False, context=None):
         """ Sends the selected emails immediately, ignoring their current
             state (mails that have already been sent should not be passed
             unless they should actually be re-sent).
@@ -287,6 +301,8 @@ class mail_mail(osv.Model):
             :param bool auto_commit: whether to force a commit of the mail status
                 after sending each mail (meant only for scheduler processing);
                 should never be True during normal transactions (default: False)
+            :param bool raise_exception: whether to raise an exception if the
+                email sending process has failed
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
@@ -332,9 +348,16 @@ class mail_mail(osv.Model):
                 # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
                 if mail_sent:
                     self._postprocess_sent_message(cr, uid, mail, context=context)
-            except Exception:
+            except Exception as e:
                 _logger.exception('failed sending mail.mail %s', mail.id)
                 mail.write({'state': 'exception'})
+                if raise_exception:
+                    if isinstance(e, AssertionError):
+                        # get the args of the original error, wrap into a value and throw a MailDeliveryException
+                        # that is an except_orm, with name and value as arguments
+                        value = '. '.join(e.args)
+                        raise MailDeliveryException(_("Mail Delivery Failed"), value)
+                    raise
 
             if auto_commit == True:
                 cr.commit()
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 1ff9a2a292e..7384cc24a75 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -6,6 +6,11 @@
             <field name="model">mail.mail</field>
             <field name="arch" type="xml">
                 <form string="Email message" version="7.0">
+                    <header>
+                        <button name="send" string="Send Now" type="object" states='outgoing' class="oe_highlight"/>
+                        <button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
+                        <button name="cancel" string="Cancel" type="object" states='outgoing'/>
+                    </header>
                     <sheet>
                         <label for="subject" class="oe_edit_only"/>
                         <h2><field name="subject"/></h2>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4f830b21e50..252179614c6 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -27,6 +27,7 @@ from openerp import SUPERUSER_ID
 from openerp.osv import osv, orm, fields
 from openerp.tools import html_email_clean
 from openerp.tools.translate import _
+from HTMLParser import HTMLParser
 
 _logger = logging.getLogger(__name__)
 
@@ -43,6 +44,19 @@ def decode(text):
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
+class MLStripper(HTMLParser):
+    def __init__(self):
+        self.reset()
+        self.fed = []
+    def handle_data(self, d):
+        self.fed.append(d)
+    def get_data(self):
+        return ''.join(self.fed)
+
+def strip_tags(html):
+    s = MLStripper()
+    s.feed(html)
+    return s.get_data()
 
 class mail_message(osv.Model):
     """ Messages model: system notification (replacing res.log notifications),
@@ -76,9 +90,9 @@ class mail_message(osv.Model):
         # TDE note: regroup by model/ids, to have less queries to perform
         result = dict.fromkeys(ids, False)
         for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
-            if not message.get('model') or not message.get('res_id') or not self.pool.get(message['model']):
+            if not message.get('model') or not message.get('res_id') or message['model'] not in self.pool:
                 continue
-            result[message['id']] = self.pool.get(message['model']).name_get(cr, SUPERUSER_ID, [message['res_id']], context=context)[0][1]
+            result[message['id']] = self.pool[message['model']].name_get(cr, SUPERUSER_ID, [message['res_id']], context=context)[0][1]
         return result
 
     def _get_to_read(self, cr, uid, ids, name, arg, context=None):
@@ -125,7 +139,7 @@ class mail_message(osv.Model):
             ids = [ids]
         res = []
         for message in self.browse(cr, uid, ids, context=context):
-            name = '%s: %s' % (message.subject or '', message.body or '')
+            name = '%s: %s' % (message.subject or '', strip_tags(message.body or '') or '')
             res.append((message.id, self._shorten_name(name.lstrip(' :'))))
         return res
 
@@ -144,6 +158,7 @@ class mail_message(osv.Model):
         'author_id': fields.many2one('res.partner', 'Author', select=1,
             ondelete='set null',
             help="Author of the message. If not set, email_from may hold an email address that did not match any partner."),
+        'author_avatar': fields.related('author_id', 'image_small', type="binary", string="Author's Avatar"),
         'partner_ids': fields.many2many('res.partner', string='Recipients'),
         'notified_partner_ids': fields.many2many('res.partner', 'mail_notification',
             'message_id', 'partner_id', 'Notified partners',
@@ -236,6 +251,8 @@ class mail_message(osv.Model):
             :param bool read: set notification as (un)read
             :param bool create_missing: create notifications for missing entries
                 (i.e. when acting on displayed messages not notified)
+
+            :return number of message mark as read
         """
         notification_obj = self.pool.get('mail.notification')
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
@@ -246,14 +263,16 @@ class mail_message(osv.Model):
 
         # all message have notifications: already set them as (un)read
         if len(notif_ids) == len(msg_ids) or not create_missing:
-            return notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+            notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+            return len(notif_ids)
 
         # some messages do not have notifications: find which one, create notification, update read status
         notified_msg_ids = [notification.message_id.id for notification in notification_obj.browse(cr, uid, notif_ids, context=context)]
         to_create_msg_ids = list(set(msg_ids) - set(notified_msg_ids))
         for msg_id in to_create_msg_ids:
             notification_obj.create(cr, uid, {'partner_id': user_pid, 'read': read, 'message_id': msg_id}, context=context)
-        return notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+        notification_obj.write(cr, uid, notif_ids, {'read': read}, context=context)
+        return len(notif_ids)
 
     def set_message_starred(self, cr, uid, msg_ids, starred, create_missing=True, context=None):
         """ Set messages as (un)starred. Technically, the notifications related
@@ -273,7 +292,7 @@ class mail_message(osv.Model):
         }
         if starred:
             values['read'] = False
- 
+
         notif_ids = notification_obj.search(cr, uid, domain, context=context)
 
         # all message have notifications: already set them as (un)starred
@@ -369,6 +388,7 @@ class mail_message(osv.Model):
 
         return {'id': message.id,
                 'type': message.type,
+                'subtype': message.subtype_id.name if message.subtype_id else False,
                 'body': body_html,
                 'model': message.model,
                 'res_id': message.res_id,
@@ -379,6 +399,7 @@ class mail_message(osv.Model):
                 'parent_id': parent_id,
                 'is_private': is_private,
                 'author_id': False,
+                'author_avatar': message.author_avatar,
                 'is_author': False,
                 'partner_ids': [],
                 'vote_nb': vote_nb,
@@ -509,7 +530,6 @@ class mail_message(osv.Model):
         message_unload_ids = message_unload_ids if message_unload_ids is not None else []
         if message_unload_ids:
             domain += [('id', 'not in', message_unload_ids)]
-        notification_obj = self.pool.get('mail.notification')
         limit = limit or self._message_read_limit
         message_tree = {}
         message_list = []
@@ -569,7 +589,7 @@ class mail_message(osv.Model):
 
     def _find_allowed_model_wise(self, cr, uid, doc_model, doc_dict, context=None):
         doc_ids = doc_dict.keys()
-        allowed_doc_ids = self.pool.get(doc_model).search(cr, uid, [('id', 'in', doc_ids)], context=context)
+        allowed_doc_ids = self.pool[doc_model].search(cr, uid, [('id', 'in', doc_ids)], context=context)
         return set([message_id for allowed_doc_id in allowed_doc_ids for message_id in doc_dict[allowed_doc_id]])
 
     def _find_allowed_doc_ids(self, cr, uid, model_ids, context=None):
@@ -717,14 +737,12 @@ class mail_message(osv.Model):
         model_record_ids = _generate_model_record_ids(message_values, other_ids)
         document_related_ids = []
         for model, doc_dict in model_record_ids.items():
-            model_obj = self.pool.get(model)
+            model_obj = self.pool[model]
             mids = model_obj.exists(cr, uid, doc_dict.keys())
-            if operation in ['create', 'write', 'unlink']:
-                model_obj.check_access_rights(cr, uid, 'write')
-                model_obj.check_access_rule(cr, uid, mids, 'write', context=context)
+            if hasattr(model_obj, 'check_mail_message_access'):
+                model_obj.check_mail_message_access(cr, uid, mids, operation, context=context)
             else:
-                model_obj.check_access_rights(cr, uid, operation)
-                model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+                self.pool['mail.thread'].check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
             document_related_ids += [mid for mid, message in message_values.iteritems()
                 if message.get('model') == model and message.get('res_id') in mids]
 
@@ -742,7 +760,7 @@ class mail_message(osv.Model):
         default_starred = context.pop('default_starred', False)
         # generate message_id, to redirect answers to the right discussion thread
         if not values.get('message_id') and values.get('reply_to'):
-            values['message_id'] = tools.generate_tracking_message_id('reply_to-%(model)s' % values)
+            values['message_id'] = tools.generate_tracking_message_id('reply_to')
         elif not values.get('message_id') and values.get('res_id') and values.get('model'):
             values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
         elif not values.get('message_id'):
@@ -773,7 +791,7 @@ class mail_message(osv.Model):
         attachments_to_delete = []
         for message in self.browse(cr, uid, ids, context=context):
             for attach in message.attachment_ids:
-                if attach.res_model == self._name and attach.res_id == message.id:
+                if attach.res_model == self._name and (attach.res_id == message.id or attach.res_id == 0):
                     attachments_to_delete.append(attach.id)
         if attachments_to_delete:
             self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 8f2fb3f1020..02f4ef7fdbe 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -59,6 +59,9 @@
                     <field name="type"/>
                     <field name="author_id"/>
                     <field name="partner_ids"/>
+                    <field name="model"/>
+                    <field name="res_id"/>
+                    <field name="parent_id"/>
                     <filter string="To Read"
                             name="message_unread" help="Show messages to read"
                             domain="[('to_read', '=', True)]"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index b7720d6c947..a46f416f44b 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -33,7 +33,7 @@ from email.message import Message
 from openerp import tools
 from openerp import SUPERUSER_ID
 from openerp.addons.mail.mail_message import decode
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 
@@ -89,6 +89,50 @@ class mail_thread(osv.AbstractModel):
     #   :param function lambda: returns whether the tracking should record using this subtype
     _track = {}
 
+    def get_empty_list_help(self, cr, uid, help, context=None):
+        """ Override of BaseModel.get_empty_list_help() to generate an help message
+            that adds alias information. """
+        model = context.get('empty_list_help_model')
+        res_id = context.get('empty_list_help_id')
+        ir_config_parameter = self.pool.get("ir.config_parameter")
+        catchall_domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
+        document_name = context.get('empty_list_help_document_name', _('document'))
+        alias = None
+
+        if catchall_domain and model and res_id:  # specific res_id -> find its alias (i.e. section_id specified)
+            object_id = self.pool.get(model).browse(cr, uid, res_id, context=context)
+            # check that the alias effectively creates new records
+            if object_id.alias_id and object_id.alias_id.alias_model_id and \
+                    object_id.alias_id.alias_model_id.model == self._name and \
+                    object_id.alias_id.alias_force_thread_id == 0:
+                alias = object_id.alias_id
+        elif catchall_domain and model:  # no specific res_id given -> generic help message, take an example alias (i.e. alias of some section_id)
+            model_id = self.pool.get('ir.model').search(cr, uid, [("model", "=", self._name)], context=context)[0]
+            alias_obj = self.pool.get('mail.alias')
+            alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ('alias_force_thread_id', '=', 0)], context=context, order='id ASC')
+            if alias_ids and len(alias_ids) == 1:  # if several aliases -> incoherent to propose one guessed from nowhere, therefore avoid if several aliases
+                alias = alias_obj.browse(cr, uid, alias_ids[0], context=context)
+
+        if alias:
+            alias_email = alias.name_get()[0][1]
+            return _("""<p class='oe_view_nocontent_create'>
+                            Click here to add a new %(document)s or send an email to: <a href='mailto:%(email)s'>%(email)s</a>
+                        </p>
+                        %(static_help)s"""
+                    ) % {
+                        'document': document_name,
+                        'email': alias_email,
+                        'static_help': help or ''
+                    }
+
+        if document_name != 'document' and help and help.find("oe_view_nocontent_create") == -1:
+            return _("<p class='oe_view_nocontent_create'>Click here to add a new %(document)s</p>%(static_help)s") % {
+                        'document': document_name,
+                        'static_help': help or '',
+                    }
+
+        return help
+
     def _get_message_data(self, cr, uid, ids, name, args, context=None):
         """ Computes:
             - message_unread: has uid unread message for the document
@@ -241,14 +285,21 @@ class mail_thread(osv.AbstractModel):
             context = {}
         thread_id = super(mail_thread, self).create(cr, uid, values, context=context)
 
+        # automatic logging unless asked not to (mainly for various testing purpose)
+        if not context.get('mail_create_nolog'):
+            self.message_post(cr, uid, thread_id, body=_('%s created') % (self._description), context=context)
+
         # subscribe uid unless asked not to
         if not context.get('mail_create_nosubscribe'):
             self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
         self.message_auto_subscribe(cr, uid, [thread_id], values.keys(), context=context)
 
-        # automatic logging unless asked not to (mainly for various testing purpose)
-        if not context.get('mail_create_nolog'):
-            self.message_post(cr, uid, thread_id, body=_('%s created') % (self._description), context=context)
+        # track values
+        tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
+        if tracked_fields:
+            initial_values = {thread_id: dict((item, False) for item in tracked_fields)}
+            self.message_track(cr, uid, [thread_id], tracked_fields, initial_values, context=context)
+
         return thread_id
 
     def write(self, cr, uid, ids, values, context=None):
@@ -368,7 +419,7 @@ class mail_thread(osv.AbstractModel):
             posted = False
             for subtype in subtypes:
                 try:
-                    subtype_rec = self.pool.get('ir.model.data').get_object(cr, uid, subtype.split('.')[0], subtype.split('.')[1])
+                    subtype_rec = self.pool.get('ir.model.data').get_object(cr, uid, subtype.split('.')[0], subtype.split('.')[1], context=context)
                 except ValueError, e:
                     _logger.debug('subtype %s not found, giving error "%s"' % (subtype, e))
                     continue
@@ -389,6 +440,104 @@ class mail_thread(osv.AbstractModel):
             return [('message_unread', '=', True)]
         return []
 
+    def _garbage_collect_attachments(self, cr, uid, context=None):
+        """ Garbage collect lost mail attachments. Those are attachments
+            - linked to res_model 'mail.compose.message', the composer wizard
+            - with res_id 0, because they were created outside of an existing
+                wizard (typically user input through Chatter or reports
+                created on-the-fly by the templates)
+            - unused since at least one day (create_date and write_date)
+        """
+        limit_date = datetime.datetime.utcnow() - datetime.timedelta(days=1)
+        limit_date_str = datetime.datetime.strftime(limit_date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+        ir_attachment_obj = self.pool.get('ir.attachment')
+        attach_ids = ir_attachment_obj.search(cr, uid, [
+                            ('res_model', '=', 'mail.compose.message'),
+                            ('res_id', '=', 0),
+                            ('create_date', '<', limit_date_str),
+                            ('write_date', '<', limit_date_str),
+                            ], context=context)
+        ir_attachment_obj.unlink(cr, uid, attach_ids, context=context)
+        return True
+
+    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
+        """ mail.message check permission rules for related document. This method is
+            meant to be inherited in order to implement addons-specific behavior.
+            A common behavior would be to allow creating messages when having read
+            access rule on the document, for portal document such as issues. """
+        if not model_obj:
+            model_obj = self
+        if operation in ['create', 'write', 'unlink']:
+            model_obj.check_access_rights(cr, uid, 'write')
+            model_obj.check_access_rule(cr, uid, mids, 'write', context=context)
+        else:
+            model_obj.check_access_rights(cr, uid, operation)
+            model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+
+    def _get_formview_action(self, cr, uid, id, model=None, context=None):
+        """ Return an action to open the document. This method is meant to be
+            overridden in addons that want to give specific view ids for example.
+
+            :param int id: id of the document to open
+            :param string model: specific model that overrides self._name
+        """
+        return {
+                'type': 'ir.actions.act_window',
+                'res_model': model or self._name,
+                'view_type': 'form',
+                'view_mode': 'form',
+                'views': [(False, 'form')],
+                'target': 'current',
+                'res_id': id,
+            }
+
+    def _get_inbox_action_xml_id(self, cr, uid, context=None):
+        """ When redirecting towards the Inbox, choose which action xml_id has
+            to be fetched. This method is meant to be inherited, at least in portal
+            because portal users have a different Inbox action than classic users. """
+        return ('mail', 'action_mail_inbox_feeds')
+
+    def message_redirect_action(self, cr, uid, context=None):
+        """ For a given message, return an action that either
+            - opens the form view of the related document if model, res_id, and
+              read access to the document
+            - opens the Inbox with a default search on the conversation if model,
+              res_id
+            - opens the Inbox with context propagated
+
+        """
+        if context is None:
+            context = {}
+
+        # default action is the Inbox action
+        self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+        act_model, act_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, *self._get_inbox_action_xml_id(cr, uid, context=context))
+        action = self.pool.get(act_model).read(cr, uid, act_id, [])
+
+        # if msg_id specified: try to redirect to the document or fallback on the Inbox
+        msg_id = context.get('params', {}).get('message_id')
+        if not msg_id:
+            return action
+        msg = self.pool.get('mail.message').browse(cr, uid, msg_id, context=context)
+        if msg.model and msg.res_id:
+            action.update({
+                'context': {
+                    'search_default_model': msg.model,
+                    'search_default_res_id': msg.res_id,
+                }
+            })
+            if self.pool.get(msg.model).check_access_rights(cr, uid, 'read', raise_exception=False):
+                try:
+                    model_obj = self.pool.get(msg.model)
+                    model_obj.check_access_rule(cr, uid, [msg.res_id], 'read', context=context)
+                    if not hasattr(model_obj, '_get_formview_action'):
+                        action = self.pool.get('mail.thread')._get_formview_action(cr, uid, msg.res_id, model=msg.model, context=context)
+                    else:
+                        action = model_obj._get_formview_action(cr, uid, msg.res_id, context=context)
+                except (osv.except_osv, orm.except_orm):
+                    pass
+        return action
+
     #------------------------------------------------------
     # Email specific
     #------------------------------------------------------
@@ -399,7 +548,7 @@ class mail_thread(osv.AbstractModel):
         return ["%s@%s" % (record['alias_name'], record['alias_domain'])
                     if record.get('alias_domain') and record.get('alias_name')
                     else False
-                    for record in self.read(cr, uid, ids, ['alias_name', 'alias_domain'], context=context)]
+                    for record in self.read(cr, SUPERUSER_ID, ids, ['alias_name', 'alias_domain'], context=context)]
 
     #------------------------------------------------------
     # Mail gateway
@@ -409,13 +558,15 @@ class mail_thread(osv.AbstractModel):
         """ Used by the plugin addon, based for plugin_outlook and others. """
         ret_dict = {}
         for model_name in self.pool.obj_list():
-            model = self.pool.get(model_name)
+            model = self.pool[model_name]
             if 'mail.thread' in getattr(model, '_inherit', []):
                 ret_dict[model_name] = model._description
         return ret_dict
 
     def _message_find_partners(self, cr, uid, message, header_fields=['From'], context=None):
-        """ Find partners related to some header fields of the message. """
+        """ Find partners related to some header fields of the message.
+
+            TDE TODO: merge me with other partner finding methods in 8.0 """
         partner_obj = self.pool.get('res.partner')
         partner_ids = []
         s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
@@ -427,6 +578,7 @@ class mail_thread(osv.AbstractModel):
         return partner_ids
 
     def _message_find_user_id(self, cr, uid, message, context=None):
+        """ TDE TODO: check and maybe merge me with other user finding methods in 8.0 """
         from_local_part = tools.email_split(decode(message.get('From')))[0]
         # FP Note: canonification required, the minimu: .lower()
         user_ids = self.pool.get('res.users').search(cr, uid, ['|',
@@ -480,12 +632,12 @@ class mail_thread(osv.AbstractModel):
         if ref_match:
             thread_id = int(ref_match.group(1))
             model = ref_match.group(2) or model
-            model_pool = self.pool.get(model)
-            if thread_id and model and model_pool and model_pool.exists(cr, uid, thread_id) \
-                and hasattr(model_pool, 'message_update'):
-                _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
-                                email_from, email_to, message_id, model, thread_id, custom_values, uid)
-                return [(model, thread_id, custom_values, uid)]
+            if thread_id and model in self.pool:
+                model_obj = self.pool[model]
+                if model_obj.exists(cr, uid, thread_id) and hasattr(model_obj, 'message_update'):
+                    _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
+                                    email_from, email_to, message_id, model, thread_id, custom_values, uid)
+                    return [(model, thread_id, custom_values, uid)]
 
         # Verify whether this is a reply to a private message
         if in_reply_to:
@@ -626,7 +778,7 @@ class mail_thread(osv.AbstractModel):
             if self._name == 'mail.thread':
                 context.update({'thread_model': model})
             if model:
-                model_pool = self.pool.get(model)
+                model_pool = self.pool[model]
                 assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
                     "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
                         (msg['message_id'], model)
@@ -680,7 +832,7 @@ class mail_thread(osv.AbstractModel):
         if isinstance(custom_values, dict):
             data = custom_values.copy()
         model = context.get('thread_model') or self._name
-        model_pool = self.pool.get(model)
+        model_pool = self.pool[model]
         fields = model_pool.fields_get(cr, uid, context=context)
         if 'name' in fields and not data.get('name'):
             data['name'] = msg_dict.get('subject', '')
@@ -852,7 +1004,8 @@ class mail_thread(osv.AbstractModel):
             recipient in the result dictionary. The form is :
                 partner_id, partner_name<partner_email> or partner_name, reason """
         if email and not partner:
-            partner_info = self.message_get_partner_info_from_emails(cr, uid, [email], context=context)[0]
+            # get partner info from email
+            partner_info = self.message_get_partner_info_from_emails(cr, uid, [email], context=context, res_id=obj.id)[0]
             if partner_info.get('partner_id'):
                 partner = self.pool.get('res.partner').browse(cr, SUPERUSER_ID, [partner_info.get('partner_id')], context=context)[0]
         if email and email in [val[1] for val in result[obj.id]]:  # already existing email -> skip
@@ -880,29 +1033,49 @@ class mail_thread(osv.AbstractModel):
                 self._message_add_suggested_recipient(cr, uid, result, obj, partner=obj.user_id.partner_id, reason=self._all_columns['user_id'].column.string, context=context)
         return result
 
-    def message_get_partner_info_from_emails(self, cr, uid, emails, link_mail=False, context=None):
+    def message_get_partner_info_from_emails(self, cr, uid, emails, link_mail=False, context=None, res_id=None):
+        """ Wrapper with weird order parameter because of 7.0 fix.
+
+            TDE TODO: remove me in 8.0 """
+        return self.message_find_partner_from_emails(cr, uid, res_id, emails, link_mail=link_mail, context=context)
+
+    def message_find_partner_from_emails(self, cr, uid, id, emails, link_mail=False, context=None):
         """ Convert a list of emails into a list partner_ids and a list
             new_partner_ids. The return value is non conventional because
             it is meant to be used by the mail widget.
 
             :return dict: partner_ids and new_partner_ids
-        """
+
+            TDE TODO: merge me with other partner finding methods in 8.0 """
         mail_message_obj = self.pool.get('mail.message')
         partner_obj = self.pool.get('res.partner')
         result = list()
+        if id and self._name != 'mail.thread':
+            obj = self.browse(cr, SUPERUSER_ID, id, context=context)
+        else:
+            obj = None
         for email in emails:
             partner_info = {'full_name': email, 'partner_id': False}
             m = re.search(r"((.+?)\s*<)?([^<>]+@[^<>]+)>?", email, re.IGNORECASE | re.DOTALL)
             if not m:
                 continue
             email_address = m.group(3)
-            ids = partner_obj.search(cr, SUPERUSER_ID, [('email', '=', email_address)], context=context)
-            if ids:
-                partner_info['partner_id'] = ids[0]
+            # first try: check in document's followers
+            if obj:
+                for follower in obj.message_follower_ids:
+                    if follower.email == email_address:
+                        partner_info['partner_id'] = follower.id
+            # second try: check in partners
+            if not partner_info.get('partner_id'):
+                ids = partner_obj.search(cr, SUPERUSER_ID, [('email', 'ilike', email_address), ('user_ids', '!=', False)], limit=1, context=context)
+                if not ids:
+                    ids = partner_obj.search(cr, SUPERUSER_ID, [('email', 'ilike', email_address)], limit=1, context=context)
+                if ids:
+                    partner_info['partner_id'] = ids[0]
             result.append(partner_info)
 
             # link mail with this from mail to the new partner id
-            if link_mail and ids:
+            if link_mail and partner_info['partner_id']:
                 message_ids = mail_message_obj.search(cr, SUPERUSER_ID, [
                                     '|',
                                     ('email_from', '=', email),
@@ -910,7 +1083,7 @@ class mail_thread(osv.AbstractModel):
                                     ('author_id', '=', False)
                                 ], context=context)
                 if message_ids:
-                    mail_message_obj.write(cr, SUPERUSER_ID, message_ids, {'author_id': ids[0]}, context=context)
+                    mail_message_obj.write(cr, SUPERUSER_ID, message_ids, {'author_id': partner_info['partner_id']}, context=context)
         return result
 
     def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
@@ -957,7 +1130,7 @@ class mail_thread(osv.AbstractModel):
             model = context.get('thread_model', self._name) if self._name == 'mail.thread' else self._name
             if model != self._name:
                 del context['thread_model']
-                return self.pool.get(model).message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, content_subtype=content_subtype, **kwargs)
+                return self.pool[model].message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, content_subtype=content_subtype, **kwargs)
 
         # 0: Parse email-from, try to find a better author_id based on document's followers for incoming emails
         email_from = kwargs.get('email_from')
@@ -1006,7 +1179,6 @@ class mail_thread(osv.AbstractModel):
         if attachment_ids:
             filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
                 ('res_model', '=', 'mail.compose.message'),
-                ('res_id', '=', 0),
                 ('create_uid', '=', uid),
                 ('id', 'in', attachment_ids)], context=context)
             if filtered_attachment_ids:
@@ -1117,19 +1289,35 @@ class mail_thread(osv.AbstractModel):
         """ Add partners to the records followers. """
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         if set(partner_ids) == set([user_pid]):
-            self.check_access_rights(cr, uid, 'read')
+            try:
+                self.check_access_rights(cr, uid, 'read')
+            except (osv.except_osv, orm.except_orm):
+                return
         else:
             self.check_access_rights(cr, uid, 'write')
 
+        # subscribe partners
         self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
-        # if subtypes are not specified (and not set to a void list), fetch default ones
-        if subtype_ids is None:
-            subtype_obj = self.pool.get('mail.message.subtype')
-            subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
-        # update the subscriptions
+
+        # subtype specified: update the subscriptions
         fol_obj = self.pool.get('mail.followers')
-        fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
-        fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+        if subtype_ids is not None:
+            fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
+            fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+        # no subtypes: default ones for new subscription, do not update existing subscriptions
+        else:
+            # search new subscriptions: subtype_ids is False
+            fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
+                            ('res_model', '=', self._name),
+                            ('res_id', 'in', ids),
+                            ('partner_id', 'in', partner_ids),
+                            ('subtype_ids', '=', False)
+                        ], context=context)
+            if fol_ids:
+                subtype_obj = self.pool.get('mail.message.subtype')
+                subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+                fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+
         return True
 
     def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 75c86e4645d..c9c5141d303 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -8,6 +8,7 @@
             <field name="context">{
               'default_model': 'res.users',
               'default_res_id': uid,
+              'needaction_menu_ref': ['mail.mail_tomefeeds', 'mail.mail_starfeeds']
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [
@@ -36,7 +37,8 @@
             <field name="context">{
               'default_model': 'res.users',
               'default_res_id': uid,
-              'search_default_message_unread': True
+              'search_default_message_unread': True,
+              'needaction_menu_ref': ['mail.mail_starfeeds', 'mail.mail_inboxfeeds']
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [
@@ -87,7 +89,8 @@
             <field name="tag">mail.wall</field>
             <field name="context">{
               'default_model': 'res.users',
-              'default_res_id': uid
+              'default_res_id': uid,
+              'needaction_menu_ref': ['mail.mail_tomefeeds', 'mail.mail_starfeeds', 'mail.mail_inboxfeeds']
             }</field>
             <field name="params" eval="&quot;{
                 'domain': [
@@ -108,6 +111,15 @@
             </field>
         </record>
 
+        <record id="action_mail_redirect" model="ir.actions.server">
+            <field name="name">Mail Redirection (Document / Inbox)</field>
+            <field name="condition">True</field>
+            <field name="model_id" ref="model_mail_thread"/>
+            <field name="code">action = pool.get('mail.thread').message_redirect_action(cr, uid, context)</field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+        </record>
+
         <!-- MENU -->
 
         <!-- Top menu item -->
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index 91606e1c720..c19eb4a38ee 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -23,11 +23,12 @@ import urlparse
 
 from openerp.osv import osv, fields
 
+
 class project_configuration(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'alias_domain' : fields.char('Alias Domain',
+        'alias_domain': fields.char('Alias Domain',
                                      help="If you have setup a catch-all email domain redirected to "
                                           "the OpenERP server, enter the domain name here."),
     }
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index f7c91939b98..5545745b235 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -60,8 +60,9 @@ class res_users(osv.Model):
     def _auto_init(self, cr, context=None):
         """ Installation hook: aliases, partner following themselves """
         # create aliases for all users and avoid constraint errors
-        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
+        res = self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
             self._columns['alias_id'], 'login', alias_force_key='id', context=context)
+        return res
 
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index f49ff72194a..1cacadfc898 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -26,7 +26,7 @@
                 <field name="signature" position="before">
                     <field name="notification_email_send"/>
                 </field>
-                <field name="email" position="after">
+                <field name="signature" position="before">
                     <field name="alias_domain" invisible="1"/>
                     <field name="alias_id" readonly="1" required="0" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
                 </field>
diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
old mode 100644
new mode 100755
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 934fb6b5487..958c2bccd5f 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -57,6 +57,9 @@
 .openerp .oe_mail .oe_msg.oe_msg_nobody{
     background: #F8F8F8;
 }
+.openerp .oe_mail .oe_msg.oe_msg_notification{
+    background: #F8F8F8;
+}
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
     left:0; top: 0; bottom: 0; width: 40px;
@@ -561,13 +564,6 @@
     text-align: center;
     width:100%;
 }
-.openerp .oe_followers button.oe_invite{
-    margin: 5px 0;
-    padding: 2px 8px;
-    font-size: 12px;
-    text-shadow: none;
-    width: 100%;
-}
 .openerp .oe_followers button.oe_follower.oe_following{
     color: white;
     background-color: #3465A4;
@@ -621,8 +617,12 @@
     margin-top: 12px;
     margin-bottom: 4px;
 }
+.openerp .oe_followers .oe_invite{
+    float: right;
+}
 .openerp .oe_followers .oe_partner {
     height: 32px;
+    margin-right: 8px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index c1cefee9070..4f2b8a16dd0 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -14,6 +14,10 @@
   padding: 0px 18px;
 }
 
+.openerp .oe_form_sheetbg.openerp_mail_group_sheet .oe_avatar {
+  padding-top: 3px;
+}
+
 /* Resize footer width */
 .openerp .oe_form div.oe_mail_group_footer {
   max-width: 80%;
@@ -21,7 +25,7 @@
 
 /* Resize group description */
 .openerp .oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea {
-  height: 40px;
+  height: 60px;
 }
 
 /* ------------------------------ */
diff --git a/addons/mail/static/src/img/email_icon.png b/addons/mail/static/src/img/email_icon.png
old mode 100755
new mode 100644
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index ec4feed82e2..7df6cdbef0d 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -217,7 +217,9 @@ openerp.mail = function (session) {
             this.res_id = datasets.res_id || this.context.default_res_id ||  false,
             this.parent_id = datasets.parent_id ||  false,
             this.type = datasets.type ||  false,
+            this.subtype = datasets.subtype ||  false,
             this.is_author = datasets.is_author ||  false,
+            this.author_avatar = datasets.author_avatar || false,
             this.is_private = datasets.is_private ||  false,
             this.subject = datasets.subject ||  false,
             this.name = datasets.name ||  false,
@@ -259,8 +261,10 @@ openerp.mail = function (session) {
             this.date = this.date ? session.web.str_to_datetime(this.date) : false;
             if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
                 this.timerelative = $.timeago(this.date);
-            } 
-            if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
+            }
+            if (this.author_avatar) {
+                this.avatar = "data:image/png;base64," + this.author_avatar;
+            } else if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
                 this.avatar = ('/mail/static/src/img/email_icon.png');
             } else if (this.author_id && this.template != 'mail.compose_message') {
                 this.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', this.author_id[0]);
@@ -619,7 +623,10 @@ openerp.mail = function (session) {
             // have unknown names -> call message_get_partner_info_from_emails to try to find partner_id
             var find_done = $.Deferred();
             if (names_to_find.length > 0) {
-                find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [names_to_find]);
+                var values = {
+                    'res_id': this.context.default_res_id,
+                }
+                find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [names_to_find], values);
             }
             else {
                 find_done.resolve([]);
@@ -665,7 +672,11 @@ openerp.mail = function (session) {
                     var new_names_to_find = _.difference(names_to_find, names_to_remove);
                     find_done = $.Deferred();
                     if (new_names_to_find.length > 0) {
-                        find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [new_names_to_find, true]);
+                        var values = {
+                            'link_mail': true,
+                            'res_id': self.context.default_res_id,
+                        }
+                        find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [new_names_to_find], values);
                     }
                     else {
                         find_done.resolve([]);
@@ -842,9 +853,9 @@ openerp.mail = function (session) {
 
         on_checked_recipient: function (event) {
             var $input = $(event.target);
-            var email = $input.attr("data");
+            var full_name = $input.attr("data");
             _.each(this.recipients, function (recipient) {
-                if (recipient.email_address == email) {
+                if (recipient.full_name == full_name) {
                     recipient.checked = $input.is(":checked");
                 }
             });
@@ -1048,9 +1059,7 @@ openerp.mail = function (session) {
                             msg.renderElement();
                             msg.start();
                         }
-                        if( self.options.root_thread.__parentedParent.__parentedParent.do_reload_menu_emails ) {
-                            self.options.root_thread.__parentedParent.__parentedParent.do_reload_menu_emails();
-                        }
+                        self.options.root_thread.MailWidget.do_reload_menu_emails();
                     });
 
                 });
@@ -1190,6 +1199,7 @@ openerp.mail = function (session) {
         init: function (parent, datasets, options) {
             var self = this;
             this._super(parent, options);
+            this.MailWidget = parent.__proto__ == mail.Widget.prototype ? parent : false;
             this.domain = options.domain || [];
             this.context = _.extend(options.context || {});
 
@@ -1423,11 +1433,16 @@ openerp.mail = function (session) {
 
         message_fetch_set_read: function (message_list) {
             if (! this.context.mail_read_set_read) return;
-            this.render_mutex.exec(_.bind(function() {
+            var self = this;
+            this.render_mutex.exec(function() {
                 msg_ids = _.pluck(message_list, 'id');
-                return this.ds_message.call('set_message_read', [
-                        msg_ids, true, false, this.context]);
-             }, this));
+                return self.ds_message.call('set_message_read', [msg_ids, true, false, self.context])
+                    .then(function (nb_read) {
+                        if (nb_read) {
+                            self.options.root_thread.MailWidget.do_reload_menu_emails();
+                        }
+                    });
+             });
         },
 
         /**
@@ -1692,6 +1707,22 @@ openerp.mail = function (session) {
             this.bind_events();
         },
         
+        /**
+        * create an object "related_menu"
+        * contains the menu widget and the sub menu related of this wall
+        */
+        do_reload_menu_emails: function () {
+            var menu = session.webclient.menu;
+            if (!menu || !menu.current_menu) {
+                return $.when();
+            }
+            return menu.rpc("/web/menu/load_needaction", {'menu_ids': [menu.current_menu]}).done(function(r) {
+                menu.on_needaction_loaded(r);
+            }).then(function () {
+                menu.trigger("need_action_reloaded");
+            });
+        },
+
         /**
          *Create the root thread and display this object in the DOM.
          * Call the no_message method then c all the message_fetch method 
@@ -1741,6 +1772,7 @@ openerp.mail = function (session) {
 
         init: function (parent, node) {
             this._super.apply(this, arguments);
+            this.ParentViewManager = parent;
             this.node = _.clone(node);
             this.node.params = _.extend({
                 'display_indented_thread': -1,
@@ -1760,7 +1792,7 @@ openerp.mail = function (session) {
 
             this.domain = this.node.params && this.node.params.domain || [];
 
-            if (!this.__parentedParent.is_action_enabled('edit')) {
+            if (!this.ParentViewManager.is_action_enabled('edit')) {
                 this.node.params.show_link = false;
             }
         },
@@ -1831,12 +1863,20 @@ openerp.mail = function (session) {
          */
         init: function (parent, action) {
             this._super(parent, action);
+            this.ActionManager = parent;
 
             this.action = _.clone(action);
             this.domain = this.action.params.domain || this.action.domain || [];
             this.context = _.extend(this.action.params.context || {}, this.action.context || {});
 
+            // filter some parameters that we will propagate as search_default
             this.defaults = {};
+            for (var key in this.action.context.params) {
+                if (_.indexOf(['model', 'res_id'], key) == -1) {
+                    continue;
+                }
+                this.context['search_default_' + key] = this.action.context.params[key];
+            }
             for (var key in this.context) {
                 if (key.match(/^search_default_/)) {
                     this.defaults[key.replace(/^search_default_/, '')] = this.context[key];
@@ -1863,23 +1903,6 @@ openerp.mail = function (session) {
             }
         },
 
-        /**
-        * crete an object "related_menu"
-        * contain the menu widget and the the sub menu related of this wall
-        */
-        do_reload_menu_emails: function () {
-            var menu = this.__parentedParent.__parentedParent.menu;
-            // return this.rpc("/web/menu/load", {'menu_id': 100}).done(function(r) {
-            //     _.each(menu.data.data.children, function (val) {
-            //         if (val.id == 100) {
-            //             val.children = _.find(r.data.children, function (r_val) {return r_val.id == 100;}).children;
-            //         }
-            //     });
-            //     var r = menu.data;
-            // window.setTimeout(function(){menu.do_reload();}, 0);
-            // });
-        },
-
         /**
          * Load the mail.message search view
          * @param {Object} defaults ??
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 6fc2f0fdfcd..f812844194b 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -148,8 +148,6 @@ openerp_mail_followers = function(session, mail) {
             }).then(self.proxy('display_generic'));
         },
         _format_followers: function(count){
-            // TDE note: why redefining _t ?
-            function _t(str) { return str; }
             var str = '';
             if(count <= 0){
                 str = _t('No followers');
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index db53a60cdbc..f5004941a8d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -143,8 +143,10 @@
         <div class="oe_recipients" t-if="!widget.is_log">
             <t t-foreach='widget.recipients' t-as='recipient'>
                 <label t-attf-title="Add as recipient and follower (reason: #{recipient.reason})">
-                    <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.email_address"/>
-                    <t t-raw="recipient.name"/> (<t t-raw="recipient.email_address"/>)
+                    <input type="checkbox" t-att-checked="recipient.checked ? 'checked' : undefined" t-att-data="recipient.full_name"/>
+                    <t t-raw="recipient.name"/> 
+                    <t t-if="recipient.email_address">(<t t-raw="recipient.email_address"/>)</t>
+                    <t t-if="!recipient.email_address">(no email address)</t>
                 </label>
             </t>
         </div>
@@ -226,7 +228,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} #{widget.partner_ids.length == 0 ? 'oe_msg_nobody' : ''} oe_msg_#{widget.type}">
+        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} #{widget.subtype ? '' : 'oe_msg_nobody'} oe_msg_#{widget.type}">
 
             <div class='oe_msg_left'>
                 <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
@@ -263,13 +265,23 @@
                     </t>
                     <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[2]"/></a>
                     <span t-if="widget.author_id and (!widget.options.show_link or !widget.author_id[0])"><t t-raw="widget.author_id[2]"/></span>
-                    <t t-if="widget.partner_ids.length == 0">
+                    <t t-if="widget.type == 'notification'">
+                        updated document
+                        <t t-if="widget.partner_ids.length > 0">
+                            <span class='oe_subtle'>•</span>
+                        </t>
+                    </t>
+                    <t t-if="widget.type == 'comment' and ! widget.subtype">
                         logged a note
                     </t>
-                    <t t-if="widget.partner_ids.length > 0">
+                    <t t-if="(widget.type == 'comment' or widget.type == 'email') and widget.subtype">
                         to
+                        <t t-if="widget.partner_ids.length == 0">
+                            nobody
+                        </t>
                     </t>
-                    <t t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner">
+                    <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and widget.subtype)"
+                            t-foreach="widget.partner_ids.slice(0, 3)" t-as="partner">
                         <span t-attf-class="oe_partner_follower">
                         <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
                         <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
@@ -279,6 +291,9 @@
                     <t t-if="widget.partner_ids.length > 3">
                         <span t-att-title="widget.extra_partners_str">and <t t-raw="widget.extra_partners_nbr"/> more</span>
                     </t>
+                    <t t-if="widget.type == 'notification' and widget.partner_ids.length > 0">
+                        notified
+                    </t>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-if="widget.timerelative" t-raw="widget.timerelative"/><t t-if="!widget.timerelative" t-raw="widget.date"/></span>
                     <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index f3317223f1d..5ad3ff09bb3 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -19,7 +19,7 @@
         </div>
         <div class='oe_follower_title_box'>
             <h4 class='oe_follower_title'>Followers</h4>
-            <button t-if="widget.view_is_editable" href='#' class="oe_invite">Invite people</button>
+            <a t-if="widget.view_is_editable" href='#' class="oe_invite">Add others</a>
         </div>
         <div class="oe_follower_list"></div>
     </div>
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 7eea66b3b90..46f4555349d 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -19,12 +19,15 @@
 #
 ##############################################################################
 
+from openerp.addons.mail.mail_mail import mail_mail
+from openerp.addons.mail.mail_thread import mail_thread
 from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.tools import mute_logger
 from openerp.tools.mail import html_sanitize
 
 
 class test_mail(TestMailBase):
-    
+
     def test_000_alias_setup(self):
         """ Test basic mail.alias setup works, before trying to use them for routing """
         cr, uid = self.cr, self.uid
@@ -43,7 +46,6 @@ class test_mail(TestMailBase):
         self.user_barty = self.res_users.browse(cr, uid, self.user_barty_id)
         self.assertEquals(self.user_barty.alias_name, 'b4r+_-_r3wl-', 'Disallowed chars should be replaced by hyphens')
 
-
     def test_00_followers_function_field(self):
         """ Tests designed for the many2many function field 'follower_ids'.
             We will test to perform writes using the many2many commands 0, 3, 4,
@@ -116,18 +118,66 @@ class test_mail(TestMailBase):
         # CASE1: test subscriptions with subtypes
         # ----------------------------------------
 
-        # Do: Subscribe Raoul three times (niak niak) through message_subscribe_users
+        # Do: subscribe Raoul, should have default subtypes
+        group_pigs.message_subscribe_users([user_raoul.id])
+        group_pigs.refresh()
+        # Test: 2 followers (Admin and Raoul)
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+                        'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+        # Raoul follows default subtypes
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                        ('partner_id', '=', user_raoul.partner_id.id)
+                    ])
+        fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+        fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+        self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes),
+                        'message_subscribe: Raoul subscription subtypes are incorrect, should be all default ones')
+
+        # Do: subscribe Raoul with specified new subtypes
+        group_pigs.message_subscribe_users([user_raoul.id], subtype_ids=[mt_mg_nodef])
+        # Test: 2 followers (Admin and Raoul)
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+                        'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
+        # Test: 2 lines in mail.followers (no duplicate for Raoul)
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                    ])
+        self.assertEqual(len(fol_ids), 2,
+                        'message_subscribe: subscribing an already-existing follower should not create new entries in mail.followers')
+        # Test: Raoul follows only specified subtypes
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                        ('partner_id', '=', user_raoul.partner_id.id)
+                    ])
+        fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+        fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+        self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+                        'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
+
+        # Do: Subscribe Raoul without specified subtypes: should not erase existing subscription subtypes
         group_pigs.message_subscribe_users([user_raoul.id, user_raoul.id])
         group_pigs.message_subscribe_users([user_raoul.id])
         group_pigs.refresh()
         # Test: 2 followers (Admin and Raoul)
         follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
-        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]),
+                        'message_subscribe: Admin and Raoul should be the only 2 Pigs fans')
         # Test: Raoul follows default subtypes
-        fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_raoul.partner_id.id)])
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id),
+                        ('partner_id', '=', user_raoul.partner_id.id)
+                    ])
         fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
         fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
-        self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes), 'subscription subtypes are incorrect')
+        self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef]),
+                        'message_subscribe: Raoul subscription subtypes are incorrect, should be only specified')
 
         # Do: Unsubscribe Raoul twice through message_unsubscribe_users
         group_pigs.message_unsubscribe_users([user_raoul.id, user_raoul.id])
@@ -135,6 +185,13 @@ class test_mail(TestMailBase):
         # Test: 1 follower (Admin)
         follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
         self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan')
+        # Test: 1 lines in mail.followers (no duplicate for Raoul)
+        fol_ids = self.mail_followers.search(cr, uid, [
+                        ('res_model', '=', 'mail.group'),
+                        ('res_id', '=', self.group_pigs_id)
+                    ])
+        self.assertEqual(len(fol_ids), 1,
+                        'message_subscribe: group should have only 1 entry in mail.follower for 1 follower')
 
         # Do: subscribe Admin with subtype_ids
         group_pigs.message_subscribe_users([uid], [mt_mg_nodef, mt_all_nodef])
@@ -171,6 +228,64 @@ class test_mail(TestMailBase):
         self.assertNotIn('First answer, should not be displayed', result, 'Old answer should not be in quote.')
         self.assertNotIn('My answer I am propagating', result, 'Thread header content should be in quote.')
 
+    def test_11_notification_url(self):
+        """ Tests designed to test the URL added in notification emails. """
+        cr, uid, group_pigs = self.cr, self.uid, self.group_pigs
+
+        # Partner data
+        partner_raoul = self.res_partner.browse(cr, uid, self.partner_raoul_id)
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'bert'})
+        partner_bert = self.res_partner.browse(cr, uid, partner_bert_id)
+        # Mail data
+        mail_mail_id = self.mail_mail.create(cr, uid, {'state': 'exception'})
+        mail = self.mail_mail.browse(cr, uid, mail_mail_id)
+
+        # Test: link for nobody -> None
+        url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail)
+        self.assertEqual(url, None,
+                        'notification email: mails not send to a specific partner should not have any URL')
+
+        # Test: link for partner -> None
+        url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail, partner=partner_bert)
+        self.assertEqual(url, None,
+                        'notification email: mails send to a not-user partner should not have any URL')
+
+        # Test: link for user -> signin
+        url = mail_mail._get_partner_access_link(self.mail_mail, cr, uid, mail, partner=partner_raoul)
+        self.assertIn('action=mail.action_mail_redirect', url,
+                        'notification email: link should contain the redirect action')
+        self.assertIn('login=%s' % partner_raoul.user_ids[0].login, url,
+                        'notification email: link should contain the user login')
+
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+    def test_12_inbox_redirection(self):
+        """ Tests designed to test the inbox redirection of emails notification URLs. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        model, act_id = self.ir_model_data.get_object_reference(cr, uid, 'mail', 'action_mail_inbox_feeds')
+        # Data: post a message on pigs
+        msg_id = self.group_pigs.message_post(body='My body', partner_ids=[self.partner_bert_id], type='comment', subtype='mail.mt_comment')
+
+        # No specific parameters -> should redirect to Inbox
+        action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_raoul_id, {'params': {}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+        # Bert has read access to Pigs -> should redirect to form view of Pigs
+        action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_raoul_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.act_window',
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+        self.assertEqual(action.get('res_id'), group_pigs.id,
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+
+        # Bert has no read access to Pigs -> should redirect to Inbox
+        action = mail_thread.message_redirect_action(self.mail_thread, cr, self.user_bert_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
     def test_20_message_post(self):
         """ Tests designed for message_post. """
         cr, uid, user_raoul, group_pigs = self.cr, self.uid, self.user_raoul, self.group_pigs
@@ -364,8 +479,8 @@ class test_mail(TestMailBase):
                             'message_post: notification email sent to more than one email address instead of a precise partner')
             self.assertIn(sent_email['email_to'][0], test_emailto,
                             'message_post: notification email email_to incorrect')
-            self.assertEqual(sent_email['reply_to'], '"Followers of Pigs" <r@r>',
-                            'message_post: notification email reply_to incorrect: should name Followers of Pigs, and have raoul email')
+            self.assertEqual(sent_email['reply_to'], 'r@r',  # was '"Followers of Pigs" <r@r>', but makes no sense
+                            'message_post: notification email reply_to incorrect: should have raoul email')
             self.assertEqual(_mail_subject, sent_email['subject'],
                             'message_post: notification email subject incorrect')
             self.assertIn(html_sanitize(_body2), sent_email['body'],
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index a68011298c7..5615e22b2c2 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.tools import mute_logger
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -83,7 +84,156 @@ Sylvie
 
 class TestMailgateway(TestMailBase):
 
-    def test_00_message_process(self):
+    def test_00_partner_find_from_email(self):
+        """ Tests designed for partner fetch based on emails. """
+        cr, uid, user_raoul, group_pigs = self.cr, self.uid, self.user_raoul, self.group_pigs
+
+        # --------------------------------------------------
+        # Data creation
+        # --------------------------------------------------
+        # 1 - Partner ARaoul
+        p_a_id = self.res_partner.create(cr, uid, {'name': 'ARaoul', 'email': 'test@test.fr'})
+
+        # --------------------------------------------------
+        # CASE1: without object
+        # --------------------------------------------------
+
+        # Do: find partner with email -> first partner should be found
+        partner_info = self.mail_thread.message_find_partner_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
+        self.assertEqual(partner_info['full_name'], 'Maybe Raoul <test@test.fr>',
+                        'mail_thread: message_find_partner_from_emails did not handle email')
+        self.assertEqual(partner_info['partner_id'], p_a_id,
+                        'mail_thread: message_find_partner_from_emails wrong partner found')
+
+        # Data: add some data about partners
+        # 2 - User BRaoul
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'BRaoul', 'email': 'test@test.fr', 'user_ids': [(4, user_raoul.id)]})
+
+        # Do: find partner with email -> first user should be found
+        partner_info = self.mail_thread.message_find_partner_from_emails(cr, uid, None, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
+        self.assertEqual(partner_info['partner_id'], p_b_id,
+                        'mail_thread: message_find_partner_from_emails wrong partner found')
+
+        # --------------------------------------------------
+        # CASE1: with object
+        # --------------------------------------------------
+
+        # Do: find partner in group where there is a follower with the email -> should be taken
+        self.mail_group.message_subscribe(cr, uid, [group_pigs.id], [p_b_id])
+        partner_info = self.mail_group.message_find_partner_from_emails(cr, uid, group_pigs.id, ['Maybe Raoul <test@test.fr>'], link_mail=False)[0]
+        self.assertEqual(partner_info['partner_id'], p_b_id,
+                        'mail_thread: message_find_partner_from_emails wrong partner found')
+
+    def test_05_mail_message_mail_mail(self):
+        """ Tests designed for testing email values based on mail.message, aliases, ... """
+        cr, uid = self.cr, self.uid
+
+        # Data: clean catchall domain
+        param_ids = self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.domain')])
+        self.registry('ir.config_parameter').unlink(cr, uid, param_ids)
+
+        # Do: create a mail_message with a reply_to, without message-id
+        msg_id = self.mail_message.create(cr, uid, {'subject': 'Subject', 'body': 'Body', 'reply_to': 'custom@example.com'})
+        msg = self.mail_message.browse(cr, uid, msg_id)
+        # Test: message content
+        self.assertIn('reply_to', msg.message_id,
+                        'mail_message: message_id should be specific to a mail_message with a given reply_to')
+        self.assertEqual('custom@example.com', msg.reply_to,
+                        'mail_message: incorrect reply_to')
+        # Do: create a mail_mail with the previous mail_message and specified reply_to
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'reply_to': 'other@example.com', 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'other@example.com',
+                        'mail_mail: reply_to should be equal to the one coming from creation values')
+        # Do: create a mail_mail with the previous mail_message
+        self.mail_message.write(cr, uid, [msg_id], {'reply_to': 'custom@example.com'})
+        msg.refresh()
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, msg.reply_to,
+                        'mail_mail: reply_to should be equal to the one coming from the mail_message')
+
+        # Do: create a mail_message without a reply_to
+        msg_id = self.mail_message.create(cr, uid, {'subject': 'Subject', 'body': 'Body', 'model': 'mail.group', 'res_id': self.group_pigs_id, 'email_from': False})
+        msg = self.mail_message.browse(cr, uid, msg_id)
+        # Test: message content
+        self.assertIn('mail.group', msg.message_id,
+                        'mail_message: message_id should contain model')
+        self.assertIn('%s' % self.group_pigs_id, msg.message_id,
+                        'mail_message: message_id should contain res_id')
+        self.assertFalse(msg.reply_to,
+                        'mail_message: should not generate a reply_to address when not specified')
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertFalse(mail.reply_to,
+                        'mail_mail: reply_to should not have been guessed')
+        # Update message
+        self.mail_message.write(cr, uid, [msg_id], {'email_from': 'someone@example.com'})
+        msg.refresh()
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, msg.email_from,
+                        'mail_mail: reply_to should be equal to mail_message.email_from when having no document or default alias')
+
+        # Data: set catchall domain
+        self.registry('ir.config_parameter').set_param(cr, uid, 'mail.catchall.domain', 'schlouby.fr')
+        self.registry('ir.config_parameter').unlink(cr, uid, self.registry('ir.config_parameter').search(cr, uid, [('key', '=', 'mail.catchall.alias')]))
+
+        # Update message
+        self.mail_message.write(cr, uid, [msg_id], {'email_from': False, 'reply_to': False})
+        msg.refresh()
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, '"Followers of Pigs" <group+pigs@schlouby.fr>',
+                        'mail_mail: reply_to should equal the mail.group alias')
+
+        # Update message
+        self.mail_message.write(cr, uid, [msg_id], {'res_id': False, 'email_from': 'someone@schlouby.fr', 'reply_to': False})
+        msg.refresh()
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, msg.email_from,
+                        'mail_mail: reply_to should equal the mail_message email_from')
+
+        # Data: set catchall alias
+        self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.alias', 'gateway')
+
+        # Update message
+        self.mail_message.write(cr, uid, [msg_id], {'email_from': False, 'reply_to': False})
+        msg.refresh()
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, uid, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
+                        'mail_mail: reply_to should equal the catchall email alias')
+
+        # Do: create a mail_mail
+        mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
+                        'mail_mail: reply_to should equal the catchall email alias')
+
+        # Do: create a mail_mail
+        mail_id = self.mail_mail.create(cr, uid, {'state': 'cancel', 'reply_to': 'someone@example.com'})
+        mail = self.mail_mail.browse(cr, uid, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, 'someone@example.com',
+                        'mail_mail: reply_to should equal the rpely_to given to create')
+
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+    def test_10_message_process(self):
         """ Testing incoming emails processing. """
         cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
 
@@ -325,7 +475,8 @@ class TestMailgateway(TestMailBase):
         self.assertEqual(msg.body, '<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>',
                             'message_process: plaintext incoming email incorrectly parsed')
 
-    def test_10_thread_parent_resolution(self):
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+    def test_20_thread_parent_resolution(self):
         """ Testing parent/child relationships are correctly established when processing incoming mails """
         cr, uid = self.cr, self.uid
 
@@ -370,7 +521,7 @@ class TestMailgateway(TestMailBase):
         self.assertEqual(6, len(group_pigs.message_ids), 'message_process: group should contain 6 messages')
         self.assertEqual(3, len(msg1.child_ids), 'message_process: msg1 should have 3 children now')
 
-    def test_20_private_discussion(self):
+    def test_30_private_discussion(self):
         """ Testing private discussion between partners. """
         cr, uid = self.cr, self.uid
 
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index 2eb48f3d998..a6bfc34c213 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -37,10 +37,10 @@ class invite_wizard(osv.osv_memory):
         res_id = result.get('res_id')
         if 'message' in fields and model and res_id:
             ir_model = self.pool.get('ir.model')
-            model_ids = ir_model.search(cr, uid, [('model', '=', self.pool.get(model)._name)], context=context)
+            model_ids = ir_model.search(cr, uid, [('model', '=', self.pool[model]._name)], context=context)
             model_name = ir_model.name_get(cr, uid, model_ids, context=context)[0][1]
 
-            document_name = self.pool.get(model).name_get(cr, uid, [res_id], context=context)[0][1]
+            document_name = self.pool[model].name_get(cr, uid, [res_id], context=context)[0][1]
             message = _('<div><p>Hello,</p><p>%s invited you to follow %s document: %s.<p></div>') % (user_name, model_name, document_name)
             result['message'] = message
         elif 'message' in fields:
@@ -63,7 +63,7 @@ class invite_wizard(osv.osv_memory):
 
     def add_followers(self, cr, uid, ids, context=None):
         for wizard in self.browse(cr, uid, ids, context=context):
-            model_obj = self.pool.get(wizard.res_model)
+            model_obj = self.pool[wizard.res_model]
             document = model_obj.browse(cr, uid, wizard.res_id, context=context)
 
             # filter partner_ids to get the new followers, to avoid sending email to already following partners
@@ -75,7 +75,7 @@ class invite_wizard(osv.osv_memory):
             model_name = ir_model.name_get(cr, uid, model_ids, context=context)[0][1]
 
             # send an email if option checked and if a message exists (do not send void emails)
-            if wizard.send_mail and wizard.message:
+            if wizard.send_mail and wizard.message and not wizard.message == '<br>':  # when deleting the message, cleditor keeps a <br>
                 # add signature
                 # FIXME 8.0: use notification_email_send, send a wall message and let mail handle email notification + message box
                 signature_company = self.pool.get('mail.notification').get_signature_footer(cr, uid, user_id=uid, res_model=wizard.res_model, res_id=wizard.res_id, context=context)
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 629dd6a88f0..7bf4d47d1ff 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,10 +19,8 @@
 #
 ##############################################################################
 
-import base64
 import re
 from openerp import tools
-
 from openerp import SUPERUSER_ID
 from openerp.osv import osv
 from openerp.osv import fields
@@ -174,7 +172,7 @@ class mail_compose_message(osv.TransientModel):
                 related to.
             :param int res_id: id of the document record this mail is related to
         """
-        doc_name_get = self.pool.get(model).name_get(cr, uid, [res_id], context=context)
+        doc_name_get = self.pool[model].name_get(cr, uid, [res_id], context=context)
         record_name = False
         if doc_name_get:
             record_name = doc_name_get[0][1]
@@ -230,33 +228,35 @@ class mail_compose_message(osv.TransientModel):
             email(s), rendering any template patterns on the fly if needed. """
         if context is None:
             context = {}
+        ir_attachment_obj = self.pool.get('ir.attachment')
         active_ids = context.get('active_ids')
         is_log = context.get('mail_compose_log', False)
 
         for wizard in self.browse(cr, uid, ids, context=context):
             mass_mail_mode = wizard.composition_mode == 'mass_mail'
-            if mass_mail_mode:  # mass mail: avoid any auto subscription because this could lead to people being follower of plenty of documents
-                context['mail_create_nosubscribe'] = True
-            active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')
+            active_model_pool = self.pool[wizard.model if wizard.model else 'mail.thread']
 
             # wizard works in batch mode: [res_id] or active_ids
             res_ids = active_ids if mass_mail_mode and wizard.model and active_ids else [wizard.res_id]
             for res_id in res_ids:
-                # default values, according to the wizard options
+                # mail.message values, according to the wizard options
                 post_values = {
                     'subject': wizard.subject,
                     'body': wizard.body,
                     'parent_id': wizard.parent_id and wizard.parent_id.id,
                     'partner_ids': [partner.id for partner in wizard.partner_ids],
-                    'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
+                    'attachment_ids': [attach.id for attach in wizard.attachment_ids],
                 }
                 # mass mailing: render and override default values
                 if mass_mail_mode and wizard.model:
                     email_dict = self.render_message(cr, uid, wizard, res_id, context=context)
-                    new_partner_ids = email_dict.pop('partner_ids', [])
-                    post_values['partner_ids'] += new_partner_ids
-                    new_attachments = email_dict.pop('attachments', [])
-                    post_values['attachments'] += new_attachments
+                    post_values['partner_ids'] += email_dict.pop('partner_ids', [])
+                    post_values['attachments'] = email_dict.pop('attachments', [])
+                    attachment_ids = []
+                    for attach_id in post_values.pop('attachment_ids'):
+                        new_attach_id = ir_attachment_obj.copy(cr, uid, attach_id, {'res_model': self._name, 'res_id': wizard.id}, context=context)
+                        attachment_ids.append(new_attach_id)
+                    post_values['attachment_ids'] = attachment_ids
                     post_values.update(email_dict)
                     # email_from: mass mailing only can specify another email_from
                     if email_dict.get('email_from'):
@@ -270,6 +270,7 @@ class mail_compose_message(osv.TransientModel):
                 context.pop('default_partner_ids', None)
                 # post the message
                 if mass_mail_mode and not wizard.post:
+                    post_values['body_html'] = post_values.get('body', '')
                     post_values['recipient_ids'] = [(4, id) for id in post_values.pop('partner_ids', [])]
                     self.pool.get('mail.mail').create(cr, uid, post_values, context=context)
                 else:
@@ -319,7 +320,7 @@ class mail_compose_message(osv.TransientModel):
             exp = str(match.group()[2:-1]).strip()
             result = eval(exp, {
                 'user': self.pool.get('res.users').browse(cr, uid, uid, context=context),
-                'object': self.pool.get(model).browse(cr, uid, res_id, context=context),
+                'object': self.pool[model].browse(cr, uid, res_id, context=context),
                 'context': dict(context),  # copy context to prevent side-effects of eval
                 })
             return result and tools.ustr(result) or ''
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index dfa13259383..fdec2fb39e0 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -165,7 +165,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
 
     # dead code
     def signal(self, cr, uid, model, res_id, signal, run_existing=True, context=None):
-        record = self.pool.get(model).browse(cr, uid, res_id, context)
+        record = self.pool[model].browse(cr, uid, res_id, context)
         return self._signal(cr, uid, record, signal, run_existing, context)
 
     #dead code
@@ -228,7 +228,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
             if unique_value:
                 if unique_field.ttype == 'many2one':
                     unique_value = unique_value.id
-                similar_res_ids = self.pool.get(campaign_rec.object_id.model).search(cr, uid,
+                similar_res_ids = self.pool[campaign_rec.object_id.model].search(cr, uid,
                                     [(unique_field.name, '=', unique_value)], context=context)
                 if similar_res_ids:
                     duplicate_workitem_domain = [('res_id','in', similar_res_ids),
@@ -236,7 +236,6 @@ Normal - the campaign runs normally and automatically sends all emails and repor
         return Workitems.search(cr, uid, duplicate_workitem_domain, context=context)
 
 
-marketing_campaign()
 
 class marketing_campaign_segment(osv.osv):
     _name = "marketing.campaign.segment"
@@ -349,7 +348,7 @@ class marketing_campaign_segment(osv.osv):
             act_ids = self.pool.get('marketing.campaign.activity').search(cr,
                   uid, [('start', '=', True), ('campaign_id', '=', segment.campaign_id.id)], context=context)
 
-            model_obj = self.pool.get(segment.object_id.model)
+            model_obj = self.pool[segment.object_id.model]
             criteria = []
             if segment.sync_last_date and segment.sync_mode != 'all':
                 criteria += [(segment.sync_mode, '>', segment.sync_last_date)]
@@ -383,7 +382,6 @@ class marketing_campaign_segment(osv.osv):
         Workitems.process_all(cr, uid, list(campaigns), context=context)
         return True
 
-marketing_campaign_segment()
 
 class marketing_campaign_activity(osv.osv):
     _name = "marketing.campaign.activity"
@@ -510,7 +508,6 @@ class marketing_campaign_activity(osv.osv):
         workitem = workitem_obj.browse(cr, uid, wi_id, context=context)
         return action(cr, uid, activity, workitem, context=context)
 
-marketing_campaign_activity()
 
 class marketing_campaign_transition(osv.osv):
     _name = "marketing.campaign.transition"
@@ -582,7 +579,6 @@ class marketing_campaign_transition(osv.osv):
         ('interval_positive', 'CHECK(interval_nbr >= 0)', 'The interval must be positive or zero')
     ]
 
-marketing_campaign_transition()
 
 class marketing_campaign_workitem(osv.osv):
     _name = "marketing.campaign.workitem"
@@ -594,7 +590,7 @@ class marketing_campaign_workitem(osv.osv):
             if not wi.res_id:
                 continue
 
-            proxy = self.pool.get(wi.object_id.model)
+            proxy = self.pool[wi.object_id.model]
             if not proxy.exists(cr, uid, [wi.res_id]):
                 continue
             ng = proxy.name_get(cr, uid, [wi.res_id], context=context)
@@ -628,7 +624,7 @@ class marketing_campaign_workitem(osv.osv):
         for id, res_id, model in res:
             workitem_map.setdefault(model,{}).setdefault(res_id,set()).add(id)
         for model, id_map in workitem_map.iteritems():
-            model_pool = self.pool.get(model)
+            model_pool = self.pool[model]
             condition_name[0] = model_pool._rec_name
             condition = [('id', 'in', id_map.keys()), condition_name]
             for res_id in model_pool.search(cr, uid, condition, context=context):
@@ -676,7 +672,7 @@ class marketing_campaign_workitem(osv.osv):
             return False
 
         activity = workitem.activity_id
-        proxy = self.pool.get(workitem.object_id.model)
+        proxy = self.pool[workitem.object_id.model]
         object_id = proxy.browse(cr, uid, workitem.res_id, context=context)
 
         eval_context = {
@@ -818,7 +814,6 @@ class marketing_campaign_workitem(osv.osv):
             raise osv.except_osv(_('No preview'),_('The current step for this item has no email or report to preview.'))
         return res
 
-marketing_campaign_workitem()
 
 class email_template(osv.osv):
     _inherit = "email.template"
@@ -828,7 +823,6 @@ class email_template(osv.osv):
 
     # TODO: add constraint to prevent disabling / disapproving an email account used in a running campaign
 
-email_template()
 
 class report_xml(osv.osv):
     _inherit = 'ir.actions.report.xml'
@@ -841,7 +835,6 @@ class report_xml(osv.osv):
             args.append(('model', '=', model))
         return super(report_xml, self).search(cr, uid, args, offset, limit, order, context, count)
 
-report_xml()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 92443fe987d..89a299e3a85 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <openerp>
     <data>
         <!-- Email tempalte -->
@@ -66,13 +65,13 @@
 
     <!-- Transition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
         <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_1"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_1"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_2"/>
         </record>
 
     <!-- Segment -->
@@ -85,9 +84,9 @@
             <field eval="time.strftime('%Y-%m-%d %H:%M:%S')" name="date_run"/>
             <field name="name">OpenERP Partner</field>
             <field name="sync_mode">create_date</field>
-            <field name="ir_filter_id" ref="filter0"></field>
+            <field name="ir_filter_id" ref="filter0"/>
             <field name="campaign_id" ref="marketing_campaign_openerppartnerchannel"/>
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index 1fc8a5f1dc7..f09ed966857 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -98,6 +98,5 @@ class campaign_analysis(osv.osv):
                 wi.date::date
             )
         """)
-campaign_analysis()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
index c151c2f4050..b012cbb7181 100644
--- a/addons/marketing_campaign/res_partner.py
+++ b/addons/marketing_campaign/res_partner.py
@@ -36,7 +36,6 @@ class res_partner(osv.osv):
         })
         return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
     
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 141981a21d6..f6eb8a1d905 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" ?>
 <openerp>
     <data>
         <record id="action_dummy" model="ir.actions.server">
             <field name="name">Dummy Action</field>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field name="state">dummy</field>
-            <field name="code"></field>
+            <field name="code"/>
             <field eval="5" name="sequence"/>
             <field eval="True" name="condition"/>
         </record>
@@ -40,10 +39,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for the genuine interest you have shown in OpenERP.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for the genuine interest you have shown in OpenERP.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
@@ -53,11 +52,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            We suggest you subscribe to the OpenERP Discovery Day on May 2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
@@ -68,10 +67,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and for subscribing to the OpenERP Discovery Day.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
@@ -82,10 +81,10 @@
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and buying the OpenERP book.</p>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and buying the OpenERP book.&lt;/p&gt;
             If any further information required kindly revert back.
-            <p>Regards,OpenERP Team,</p>]]></field>
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">For OpenERP book</field>
         </record>
 
@@ -95,11 +94,11 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">technical training to gold partners</field>
         </record>
 
@@ -110,11 +109,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2010.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">training to silver partners</field>
         </record>
 
@@ -125,11 +124,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>We have very good offer that might suit you.
-            For our silver partners, we are  offering Gold partnership.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;We have very good offer that might suit you.
+            For our silver partners, we are  offering Gold partnership.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">gold partnership to silver partners</field>
         </record>
 
@@ -140,11 +139,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_html"><![CDATA[<p>Hello,</p>
-            <p>Thanks for showing interest and for subscribing to technical training.</p>
-            If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
-            <p>If any further information is required, do not hesitate to reply to this message.</p>
-            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
+            &lt;p&gt;Thanks for showing interest and for subscribing to technical training.&lt;/p&gt;
+            If any further information required kindly revert back.I really appreciate your co-operation on this.&lt;/p&gt;
+            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
+            &lt;p&gt;Regards,OpenERP Team,&lt;/p&gt;</field>
             <field name="name">subscribing to technical training</field>
         </record>
         <!-- Report -->
@@ -171,7 +170,7 @@
         <record id="marketing_campaign_activity_0" model="marketing.campaign.activity">
             <field name="name">Propose a 1 month free trial for an OnDemand offer</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">report</field>
             <field eval="1" name="start"/>
@@ -180,27 +179,27 @@
         <record id="marketing_campaign_activity_1" model="marketing.campaign.activity">
             <field name="name">Thanks for showing interest</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_1"/>
         </record>
 
         <record id="marketing_campaign_activity_2" model="marketing.campaign.activity">
             <field name="name">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
              <field name="email_template_id" ref="email_template_2"/>
         </record>
 
         <record id="marketing_campaign_activity_3" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to the OpenERP Discovery Day</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_3"/>
         </record>
         <record id="marketing_campaign_activity_4" model="marketing.campaign.activity">
             <field name="name">Propose to buy the OpenERP Book</field>
            <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="report_directory_id" ref="document_directory_campaign1"/>
             <field name="type">report</field>
             <field name="report_id" ref="mc_crm_lead_demo_report"/>
@@ -209,81 +208,81 @@
         <record id="marketing_campaign_activity_5" model="marketing.campaign.activity">
             <field name="name">Thanks for buying the OpenERP book</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_4"/>
         </record>
         <record id="marketing_campaign_activity_6" model="marketing.campaign.activity">
             <field name="name">Propose a free technical training to Gold partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_5"/>
         </record>
         <record id="marketing_campaign_activity_7" model="marketing.campaign.activity">
             <field name="name">Propose paid training to Silver partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_6"/>
         </record>
 
         <record id="marketing_campaign_activity_8" model="marketing.campaign.activity">
             <field name="name">Propose gold partnership to silver partners</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
             <field name="email_template_id" ref="email_template_7"/>
         </record>
 
          <record id="marketing_campaign_activity_9" model="marketing.campaign.activity">
             <field name="name">Thanks for subscribing to technical training</field>
             <field name="server_action_id" ref="action_dummy"/>
-            <field model="marketing.campaign" name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
+            <field name="campaign_id" ref="marketing_campaign_openerpondemandfreetrial0"/>
         <field name="email_template_id" ref="email_template_8"/>
         </record>
 
     <!-- Tranisition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
         <record id="marketing_campaign_transition_1" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_2"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_0"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_2"/>
         </record>
         <record id="marketing_campaign_transition_2" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_3"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_2"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_3"/>
         </record>
         <record id="marketing_campaign_transition_3" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_2"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_4"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_2"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_4"/>
         </record>
         <record id="marketing_campaign_transition_4" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_5"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_5"/>
         </record>
         <record id="marketing_campaign_transition_5" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_6"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_6"/>
         </record>
         <record id="marketing_campaign_transition_6" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_4"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_7"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_4"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_7"/>
         </record>
         <record id="marketing_campaign_transition_7" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_6"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_6"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_9"/>
         </record>
         <record id="marketing_campaign_transition_8" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_8"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_7"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_8"/>
         </record>
         <record id="marketing_campaign_transition_9" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_7"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_9"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_7"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_9"/>
         </record>
         <record id="marketing_campaign_transition_10" model="marketing.campaign.transition">
-            <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_9"/>
-            <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
+            <field name="activity_from_id" ref="marketing_campaign_activity_9"/>
+            <field name="activity_to_id" ref="marketing_campaign_activity_1"/>
         </record>
 
     <!-- Segment -->
@@ -296,4 +295,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index ae7f4948d72..b75284637c9 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -169,7 +169,6 @@ class membership_line(osv.osv):
         (_check_membership_date, 'Error, this membership product is out of date', [])
     ]
 
-membership_line()
 
 
 class Partner(osv.osv):
@@ -442,7 +441,6 @@ class Partner(osv.osv):
         self.pool.get('res.partner').write(cr, uid, ids, {})
         return invoice_list
 
-Partner()
 
 class Product(osv.osv):
 
@@ -476,7 +474,6 @@ class Product(osv.osv):
         'membership': False,
     }
 
-Product()
 
 
 class Invoice(osv.osv):
@@ -494,7 +491,6 @@ class Invoice(osv.osv):
             member_line_obj.write(cr, uid, mlines, {'date_cancel': today})
         return super(Invoice, self).action_cancel(cr, uid, ids, context=context)
 
-Invoice()
 
 class account_invoice_line(osv.osv):
     _inherit='account.invoice.line'
@@ -561,6 +557,5 @@ class account_invoice_line(osv.osv):
                         }, context=context)
         return result
 
-account_invoice_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml
index d67ee864b34..b3ba426ff4a 100644
--- a/addons/membership/process/membership_process.xml
+++ b/addons/membership/process/membership_process.xml
@@ -87,16 +87,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Product to member&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Define product for membership.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_waitingmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_membershipproduct0"/>
+            <field name="target_node_id" ref="process_node_waitingmember0"/>
+            <field name="source_node_id" ref="process_node_membershipproduct0"/>
         </record>
 
         <record id="process_transition_waitingtoinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Waiting to invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoice is now open.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoicedmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_waitingmember0"/>
+            <field name="target_node_id" ref="process_node_invoicedmember0"/>
+            <field name="source_node_id" ref="process_node_waitingmember0"/>
         </record>
 
         <record id="process_transition_action_create0" model="process.transition.action">
@@ -110,25 +110,25 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice to paid&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Invoice is be paid.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_paidmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
+            <field name="target_node_id" ref="process_node_paidmember0"/>
+            <field name="source_node_id" ref="process_node_invoicedmember0"/>
         </record>
 
         <record id="process_transition_invoicetoassociate0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;invoice to associate&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Invoiced member may be Associated member.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_invoicedmember0"/>
+            <field name="target_node_id" ref="process_node_associatedmember0"/>
+            <field name="source_node_id" ref="process_node_invoicedmember0"/>
         </record>
 
         <record id="process_transition_associationpartner0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Association Partner&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Associated partner.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_associatedmember0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_setassociation0"/>
+            <field name="target_node_id" ref="process_node_associatedmember0"/>
+            <field name="source_node_id" ref="process_node_setassociation0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index f68e52992af..081a2f0d8a5 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -139,6 +139,5 @@ class report_membership(osv.osv):
             membership_amount
         )""")
 
-report_membership()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index 2425cd648ea..a1e07146da0 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -73,6 +73,5 @@ class membership_invoice(osv.osv_memory):
             'search_view_id': search_view_id,
         }
 
-membership_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index af8a21f4934..375a318c9d0 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -30,7 +30,6 @@ class company(osv.osv):
     _defaults = {
         'manufacturing_lead': lambda *a: 1.0,
     }
-company()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/html/coppernic.png b/addons/mrp/html/coppernic.png
new file mode 100644
index 00000000000..692230a5198
Binary files /dev/null and b/addons/mrp/html/coppernic.png differ
diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html
new file mode 100644
index 00000000000..5777eb5f147
--- /dev/null
+++ b/addons/mrp/html/index.html
@@ -0,0 +1,193 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Manufacturing Resource Planning</h2>
+            <h3 class="oe_slogan">Manage Bill of Materials, Plan Manufacturing Orders, Track Work Orders</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=mrp">
+                    <img src="mrp_product.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get all your assembly or manufacturing operations managed by OpenERP. Schedule
+manufacturing orders and work orders automatically. Review the proposed
+planning with the smart kanban and gantt views. Use the advanced analytics
+features to detect bottleneck in resources capacities and inventory locations.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Schedule Manufacuring Orders Efficiently</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get manufacturing orders and work orders scheduled automatically based on your
+procurement rules, quantities forecasted and dependent demand (demand for this
+part based on another part consuming it).
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="mrp_calendar.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Define Flexible Master Data</h2>
+        <h3 class="oe_slogan">Products, Bill of Materials and Routings</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="mrp_bom.png">
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the flexibility to create multi-level bill of materials, optional routing,
+version changes and phantom bill of materials. You can use BoM for kits or for
+manufacturing orders.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Get Flexibility In All Opertions</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+            Edit manually all proposed operations at any level of the progress.
+            With OpenERP, you will not be frustrated by a rigid system.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="mrp_mo.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Schedule Work Orders</h2>
+        <h3 class="oe_slogan">Check resources capacities and fix bottlenecks</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="manufacturing_illu_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Define routings and plan the working time and capacity of your resources.
+Quickly identify resource requirements and bottlenecks to ensure your production
+meets your delivery schedule dates.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">A Productive User Interface</h2>
+        <h3 class="oe_slogan">Work with lists, calendars or gantt charts</h3>
+        <div class="oe_span12">
+            <p>
+Organize manufacturing orders and work orders the way you like it. Process next
+orders from the list view, control inthe calendar view and edit the proposed
+schedule in the Gantt view.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Lists</h3>
+            <div class="oe_row_img oe_centered">
+            <img class="oe_picture oe_screenshot" src="mrp_list.png">
+            </div>
+        </div>
+        <div class="oe_span4">
+            <h3>Gantt Charts</h3>
+            <img class="oe_picture oe_screenshot" src="mrp_gantt.png">
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Calendar</h3>
+            <img class="oe_picture oe_screenshot" src="mrp_calendar.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Inventory &amp; Manufacturing Analytics</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="manufacturing_illu_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Track the evolution of the stock value, according to the level of manufacturing
+activities as they progress in the transformation process.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Integrated with Operations</h2>
+        <h3 class="oe_slogan">Sales, Purchases and Accounting integration</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Get your manufacturing resource planning accurate with it's full integration
+with sales and purchases apps. The accounting integration allows real time
+accounting valuation and deeper reporting on costs and revenues on your
+manufacturing operations.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="mrp_integrate.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+					OpenERP allowed our company to efficiently manage a growth from a turnover of 2.4m€ to 15m€ in 4 years.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="coppernic.png">
+                    <div class="oe_author">Jacky Lecuivre</div>
+                    <div class="oe_job">President at <a href="http://coppernic.fr" target="_blank">Coppernic</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/mrp/html/manufacturing_illu_01.png b/addons/mrp/html/manufacturing_illu_01.png
new file mode 100644
index 00000000000..771223a8dd9
Binary files /dev/null and b/addons/mrp/html/manufacturing_illu_01.png differ
diff --git a/addons/mrp/html/manufacturing_illu_02.png b/addons/mrp/html/manufacturing_illu_02.png
new file mode 100644
index 00000000000..4a1910c0b73
Binary files /dev/null and b/addons/mrp/html/manufacturing_illu_02.png differ
diff --git a/addons/mrp/html/mrp_bom.png b/addons/mrp/html/mrp_bom.png
new file mode 100644
index 00000000000..29b0fd48ca9
Binary files /dev/null and b/addons/mrp/html/mrp_bom.png differ
diff --git a/addons/mrp/html/mrp_calendar.png b/addons/mrp/html/mrp_calendar.png
new file mode 100644
index 00000000000..a2d52775a0e
Binary files /dev/null and b/addons/mrp/html/mrp_calendar.png differ
diff --git a/addons/mrp/html/mrp_gantt.png b/addons/mrp/html/mrp_gantt.png
new file mode 100644
index 00000000000..05c9315d5cd
Binary files /dev/null and b/addons/mrp/html/mrp_gantt.png differ
diff --git a/addons/mrp/html/mrp_integrate.png b/addons/mrp/html/mrp_integrate.png
new file mode 100644
index 00000000000..954f54953cb
Binary files /dev/null and b/addons/mrp/html/mrp_integrate.png differ
diff --git a/addons/mrp/html/mrp_list.png b/addons/mrp/html/mrp_list.png
new file mode 100644
index 00000000000..5813c32e6b7
Binary files /dev/null and b/addons/mrp/html/mrp_list.png differ
diff --git a/addons/mrp/html/mrp_mo.png b/addons/mrp/html/mrp_mo.png
new file mode 100644
index 00000000000..6138973570f
Binary files /dev/null and b/addons/mrp/html/mrp_mo.png differ
diff --git a/addons/mrp/html/mrp_product.png b/addons/mrp/html/mrp_product.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/mrp/html/mrp_product.png differ
diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po
index 8d3c0aee785..53f793c1804 100644
--- a/addons/mrp/i18n/mn.po
+++ b/addons/mrp/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-07-21 12:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-06-04 04:00+0000\n"
+"Last-Translator: erdenebold <erdenebold10@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:01+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -48,7 +48,7 @@ msgstr "Дамжлагуудын Ашиглалт"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr "Дамжлагуудын маршрут"
+msgstr "Шугамын дамжлагууд"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -86,12 +86,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr "Маршрут"
+msgstr "Шугам"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr "Жор Хайх"
+msgstr "Орц Хайх"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
@@ -112,8 +112,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
-"Үйлдвэрлэлийн нэг маршрутын хувьд уг дамжлага өөрийн үйлдлийг давтан "
-"гүйцэтгэх давтамжын тоо."
+"Үйлдвэрлэлийн нэг шугамын хувьд уг дамжлага өөрийн үйлдлийг давтан гүйцэтгэх "
+"давтамжын тоо."
 
 #. module: mrp
 #: view:product.product:0
@@ -214,7 +214,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Үйлдвэрийн захиалгыг цуцлах боломжгүй!"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -337,7 +337,7 @@ msgstr "Бараа Үйлдвэрлэх"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr "Алдаа ! Тойрог хамааралтай жор үүсгэж болохгүй."
+msgstr "Алдаа ! Тойрог хамааралтай орц үүсгэж болохгүй."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -423,7 +423,7 @@ msgstr ""
 #: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Quantity"
-msgstr ""
+msgstr "Барааны тоо"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -491,13 +491,13 @@ msgstr "Товлогдсон огноо"
 #: code:addons/mrp/procurement.py:124
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
-msgstr ""
+msgstr "Үйлдвэрлэлийн захиалга <em>%s</em> үүсгэгдлээ."
 
 #. module: mrp
 #: view:mrp.bom:0
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Жор"
+msgstr "Орц"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -518,7 +518,7 @@ msgstr "Нөөцийн Үнийн Хазайлт"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Жорын Бүтэц"
+msgstr "Орцын Бүтэц"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -560,7 +560,7 @@ msgstr ""
 msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
-msgstr "Жор нь маршруттай холбогдсон, ө.х. дамжлагуудын цуваанууд"
+msgstr "Орц нь шугамтай холбогдсон, ө.х. дамжлагуудын цуваанууд"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -592,7 +592,7 @@ msgstr "Нөөцийн үнэ"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Барааны Жорын Бүтэц"
+msgstr "Барааны Орцын Бүтэц"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -603,12 +603,12 @@ msgstr "Үйлдвэрлэл Хайх"
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
-msgstr "Маршруутын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө."
+msgstr "Шугамын дамжлагуудыг жагсаалтаар харуулах дэс дарааллыг өгнө."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Жорын удамшил"
+msgstr "Орцын удамшил"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
@@ -637,7 +637,7 @@ msgstr "Бэлтгэлтийн Сондгойрол"
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr "Жорын мөрүүд"
+msgstr "Орцын мөрүүд"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
@@ -650,13 +650,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
-"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал машрутыг устгалгүйгээр "
+"Идэвхтэй талбар нь худал буюу тэмдэглэгдээгүй байвал шугамыг устгалгүйгээр "
 "нуудаг."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr "Материалын Машрут"
+msgstr "Материалын Шугам"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -676,13 +676,13 @@ msgstr "Дамжлагын Ачаалал"
 #: code:addons/mrp/procurement.py:50
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr "Энэ бараанд жор тодорхойлогдоогүй байна !"
+msgstr "Энэ бараанд орц тодорхойлогдоогүй байна !"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr "Жорын бүрдэлүүд"
+msgstr "Орцын бүрдэлүүд"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
@@ -708,7 +708,7 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
-"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Машрут гэдэг нь "
+"Эцсийн барааг үйлдвэрлэх үйлдлүүд (дамжлагууд)-н жагсаалт. Шугам гэдэг нь "
 "үндсэндээ дамжлагуудын өртөгийг тооцоолох болон ажлын ачааллыг тооцоолоход "
 "үйлдвэрлэлийн төлөвлөгөөн дээр суурилан бодоход хэрэглэгддэг."
 
@@ -734,7 +734,7 @@ msgstr ""
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr "Жорын мөр нь жорын бараатайгаа ижил байж болохгүй."
+msgstr "Орцын мөр нь орцын бараатайгаа ижил байж болохгүй."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -744,7 +744,7 @@ msgstr "Үйлдвэрлэгдэж буй"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr "Мастер жор"
+msgstr "Мастер орц"
 
 #. module: mrp
 #: help:mrp.config.settings,module_product_manufacturer:0
@@ -907,7 +907,7 @@ msgid ""
 "All product quantities must be greater than 0.\n"
 "You should install the mrp_byproduct module if you want to manage extra "
 "products on BoMs !"
-msgstr ""
+msgstr "Бүх бүтээгдэхүүнийг тоог 0-оос эхэлж үүсгэнэ."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -954,7 +954,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr "Жорын төрөл"
+msgstr "Орцын төрөл"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:52
@@ -962,7 +962,7 @@ msgstr "Жорын төрөл"
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
-"'%s' татан авалтад сондгойрол байна: 'Бараанд жор тодорхойлогдоогүй !'"
+"'%s' татан авалтад сондгойрол байна: 'Бараанд орц тодорхойлогдоогүй !'"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -1077,7 +1077,7 @@ msgstr "Нөөцлүүлэх"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr "Жорын нэр"
+msgstr "Орцын нэр"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
@@ -1167,7 +1167,7 @@ msgstr "Хийгдэж байгаа үйлдвэрлэлийн захиалгу
 #. module: mrp
 #: model:ir.actions.client,name:mrp.action_client_mrp_menu
 msgid "Open MRP Menu"
-msgstr ""
+msgstr "Нээлттэй MRP цэс"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1194,7 +1194,7 @@ msgstr "Циклийн Өртөг"
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
 msgid "Cannot find bill of material for this product."
-msgstr ""
+msgstr "Энэ бараа материалаар хайх боломжгүй."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
@@ -1216,8 +1216,7 @@ msgstr "Нөөцүүд"
 msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
-msgstr ""
-"Заагдсан маршрутын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар."
+msgstr "Заагдсан шугамын үйлдлийг гүйцэтгэхэд энэ дамжлагын хугацаа цагаар."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1272,7 +1271,7 @@ msgstr "Үйлдвэрлэлийг эхлүүлэхэд бэлэн Үйлдвэ
 #: field:mrp.production,bom_id:0
 #: model:process.node,name:mrp.process_node_billofmaterial0
 msgid "Bill of Material"
-msgstr "Жор"
+msgstr "Орц"
 
 #. module: mrp
 #: view:mrp.workcenter.load:0
@@ -1304,9 +1303,9 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
-"Маршрут нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг "
-"илэрхийлдэг. Хэрэв маршрут байгаа бол гурав дахь үйлдвэрлэлийн дарааллын "
-"хавтас автоматаар бөглөгддөг."
+"Шугам нь дамжлагууд ямар хугацаагаар хэдэн циклээр ашиглагдахыг илэрхийлдэг. "
+"Хэрэв шугам байгаа бол гурав дахь үйлдвэрлэлийн дарааллын хавтас автоматаар "
+"бөглөгддөг."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:505
@@ -1431,7 +1430,7 @@ msgstr "Үйлдвэрлэлийн дамжлагыг хайх"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr "Жорын бүтэц"
+msgstr "Орцын бүтэц"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
@@ -1541,7 +1540,7 @@ msgstr "БЗ Дугаар"
 #: code:addons/mrp/mrp.py:505
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'."
-msgstr ""
+msgstr "Үйлдвэрлэлийн захиалгын '%s' төлөвт устгах боломжгүй."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1689,7 +1688,7 @@ msgstr "Нөөц"
 #: help:mrp.bom,date_stop:0
 msgid "Validity of this BoM or component. Keep empty if it's always valid."
 msgstr ""
-"Энэ жор эсвэл бүрэлдхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон "
+"Орц эсвэл бүрэлдэхүүний зөв эсэхийн шалгалт. Хэрэв байнга зөв бол хоосон "
 "үлдээнэ."
 
 #. module: mrp
@@ -1710,7 +1709,7 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
-"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Машрут нь  "
+"Барааг үйлдвэрлэх үйлдлийн жагсаалт (дамжлагын жагсаалт). Шугам нь  "
 "үйлдвэрлэлийн захиалга дээр үндэслэн дамжлагуудын өртөгийг тооцох, ажлын "
 "ирээдүйн ачааллыг тооцоолох зэрэгт голчлон хэрэглэгддэг."
 
@@ -1816,8 +1815,8 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
-"Жор гэдэг нь барааны задаргаа юм. Бүрэлдхүүнүүд (мөн бараанууд) нь мөн "
-"өөрийн жортой буюу олон түвшний жор байж болно."
+"Орц гэдэг нь барааны задаргаа юм. Бүрэлдэхүүнүүд (мөн бараанууд) нь мөн "
+"өөрийн орцтой буюу олон түвшний орц байж болно."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1882,7 +1881,7 @@ msgstr "Бүрэлдэхүүнүүд"
 #: report:bom.structure:0
 #: model:ir.actions.report.xml,name:mrp.report_bom_structure
 msgid "BOM Structure"
-msgstr "Жорын бүтэц"
+msgstr "Орцын бүтэц"
 
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_jit:0
@@ -1902,7 +1901,7 @@ msgstr "Хүчинтэй байх эхлэл"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Normal BoM"
-msgstr "Хэвийн жор"
+msgstr "Хэвийн орц"
 
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
@@ -1958,7 +1957,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
-"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол жорыг устгалгүйгээр нууна."
+"Идэвхтэй талбар худал буюу тэмдэглэгдээгүй бол орцыг устгалгүйгээр нууна."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -2083,7 +2082,7 @@ msgstr ""
 #. module: mrp
 #: field:procurement.order,bom_id:0
 msgid "BoM"
-msgstr "Жор"
+msgstr "Орц"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2145,12 +2144,12 @@ msgstr "Хангах болон Үйлдвэрлэх"
 #. module: mrp
 #: field:mrp.bom,bom_id:0
 msgid "Parent BoM"
-msgstr "Эцэг жор"
+msgstr "Эцэг орц"
 
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr "Жорын код"
+msgstr "Орцын код"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:765
@@ -2190,7 +2189,7 @@ msgstr "Тоо хэмжээг сонго"
 #: view:product.product:0
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr "Жорууд"
+msgstr "Орцууд"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:610
@@ -2322,7 +2321,7 @@ msgstr ""
 msgid ""
 "a manufacturing\n"
 "                        order"
-msgstr ""
+msgstr "үйлдвэрлэл"
 
 #. module: mrp
 #: field:mrp.config.settings,group_mrp_properties:0
@@ -2344,7 +2343,7 @@ msgstr "Үзүүлэлтийн бүлэгүүд"
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr "Маршрут"
+msgstr "Шугам"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2390,8 +2389,8 @@ msgid ""
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
 "Түүхий эдийг хангахын тулд (худалдан авах эсвэл үйлдвэрлэх) үйлдвэрлэлийн "
-"захиалга нь жорд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг ба "
-"энэ нь товлогчийг ажиллахад үүсдэг."
+"захиалга нь орцонд тодорхойлогдсон бүрдлүүдээр татан авах захиалга үүсгэдэг "
+"ба энэ нь товлогчийг ажиллахад үүсдэг."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -2423,7 +2422,7 @@ msgstr "Нөөцийн Амралт, Чөлөө"
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr "Жорын жагсаалтыг харуулах дэс дарааллыг өгдөг."
+msgstr "Орцын жагсаалтыг харуулах дэс дарааллыг өгдөг."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_config_settings
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 5f7bf67a0e1..ef4cdb8675b 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-09-14 07:17+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2013-05-27 12:24+0000\n"
+"Last-Translator: Pavel <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:01+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:16+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -131,7 +131,7 @@ msgstr "Конечный продукт"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Производственные заказы, которые в настоящее время в изготовлении."
 
 #. module: mrp
 #: help:mrp.bom,message_summary:0
@@ -156,7 +156,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Конечная продукция"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -195,7 +195,7 @@ msgstr "Для приобретенного материала"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 msgid "Order Planning"
-msgstr ""
+msgstr "Планирование заказов"
 
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
@@ -206,7 +206,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Нельзя отменить производственый заказ!"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@@ -253,7 +253,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Производимая продукция"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -268,7 +268,7 @@ msgstr "Основные данные"
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_byproduct:0
 msgid "Produce several products from one manufacturing order"
-msgstr ""
+msgstr "Изготовить несколько продуктов по одному производственному заказу"
 
 #. module: mrp
 #: help:mrp.config.settings,group_mrp_properties:0
@@ -329,7 +329,7 @@ msgstr "Производимый продукт"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивную спецификацию."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -381,6 +381,8 @@ msgid ""
 "Fill this product to easily track your production costs in the analytic "
 "accounting."
 msgstr ""
+"Заполнив этот продукт легко отслеживать ваши производственные издержки в "
+"аналитическом учете."
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 58fcacaa1f5..7fb40ce12af 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -70,7 +70,6 @@ class mrp_workcenter(osv.osv):
             value = {'costs_hour': cost.standard_price}
         return {'value': value}
 
-mrp_workcenter()
 
 
 class mrp_routing(osv.osv):
@@ -98,7 +97,6 @@ class mrp_routing(osv.osv):
         'active': lambda *a: 1,
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.routing', context=context)
     }
-mrp_routing()
 
 class mrp_routing_workcenter(osv.osv):
     """
@@ -124,7 +122,6 @@ class mrp_routing_workcenter(osv.osv):
         'cycle_nbr': lambda *a: 1.0,
         'hour_nbr': lambda *a: 0.0,
     }
-mrp_routing_workcenter()
 
 class mrp_bom(osv.osv):
     """
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index b827a2731c9..dd52268e2d1 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -131,96 +131,96 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If the service has a 'Produce' supply method, this creates a task in the project management module of OpenERP.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="procurement.process_node_serviceonorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+            <field name="target_node_id" ref="procurement.process_node_serviceonorder0"/>
+            <field name="source_node_id" ref="process_node_serviceproduct1"/>
         </record>
 
         <record id="process_transition_servicemts0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;This is used in case of a service without any impact in the system, a training session for instance.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
+            <field name="target_node_id" ref="mrp.process_node_servicemts0"/>
+            <field name="source_node_id" ref="process_node_serviceproduct1"/>
         </record>
 
         <record id="process_transition_stockmts0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Stock&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+            <field name="target_node_id" ref="mrp.process_node_mts0"/>
+            <field name="source_node_id" ref="process_node_stockproduct1"/>
         </record>
 
         <record id="process_transition_stockproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system creates an order (production or purchased) depending on the sold quantity and the products parameters.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="mrp.process_node_stock0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
+            <field name="target_node_id" ref="mrp.process_node_stock0"/>
+            <field name="source_node_id" ref="process_node_stockproduct1"/>
         </record>
 
         <record id="process_transition_productionprocureproducts0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of raw material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
+            <field name="target_node_id" ref="process_node_procureproducts0"/>
+            <field name="source_node_id" ref="process_node_productionorder0"/>
         </record>
 
         <record id="process_transition_minimumstockprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;'Minimum stock rule' material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The 'Minimum stock rule' allows the system to create procurement orders automatically as soon as the minimum stock is reached.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
+            <field name="target_node_id" ref="process_node_procureproducts0"/>
+            <field name="source_node_id" ref="process_node_minimumstockrule0"/>
         </record>
 
         <record id="process_transition_procurestockableproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of stockable Products&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the chosen method to supply the stockable products, the procurement order creates a RFQ, a production order, ... &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
+            <field name="target_node_id" ref="process_node_stockproduct0"/>
+            <field name="source_node_id" ref="process_node_procureproducts0"/>
         </record>
 
         <record id="process_transition_procureserviceproduct0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of services&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
+            <field name="target_node_id" ref="process_node_serviceproduct0"/>
+            <field name="source_node_id" ref="process_node_procureproducts0"/>
         </record>
 
         <record id="process_transition_purchaseprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic RFQ&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The system launches automatically a RFQ to the preferred supplier.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_purchaseprocure0"/>
+            <field name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_purchaseprocure0"/>
         </record>
 
          <record id="process_transition_producttostockrules0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement rule&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Minimum Stock Rule is an automatic procurement rule based on a mini and maxi quantity. It's available in the Inventory management menu and configured by product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_productminimumstockrule0"/>
-            <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
+            <field name="target_node_id" ref="process_node_productminimumstockrule0"/>
+            <field name="source_node_id" ref="product.process_node_product0"/>
         </record>
 
         <record id="process_transition_billofmaterialrouting0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Material Routing&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Bill of Material is linked to a routing, i.e. the succession of work centers.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_routing0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/>
+            <field name="target_node_id" ref="process_node_routing0"/>
+            <field name="source_node_id" ref="process_node_billofmaterial0"/>
         </record>
 
         <record id="process_transition_bom0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Manufacturing decomposition&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Bill of Material is the product's decomposition. The components (that are products themselves) can also have their own Bill of Material (multi-level).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_billofmaterial0"/>
-            <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
+            <field name="target_node_id" ref="process_node_billofmaterial0"/>
+            <field name="source_node_id" ref="product.process_node_product0"/>
         </record>
 
     </data>
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 965f3f57d69..0005be6f48c 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -39,9 +39,9 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/>
-            <field model="process.node" name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
+            <field name="target_node_id" ref="process_node_orderrfq0"/>
+            <field name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index e3fa1136822..a43a09313b8 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -69,16 +69,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;To Buy&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In case the Supply method of the product is Buy, the system creates a purchase order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_rfq0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stock0"/>
+            <field name="target_node_id" ref="process_node_rfq0"/>
+            <field name="source_node_id" ref="process_node_stock0"/>
         </record>
 
         <record id="process_transition_stockproduction0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;To Produce&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In case the Supply method of the product is Produce, the system creates a production order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_production0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_stock0"/>
+            <field name="target_node_id" ref="process_node_production0"/>
+            <field name="source_node_id" ref="process_node_stock0"/>
         </record>
 
     </data>
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 1f94f0034ad..6347e22d576 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -33,6 +33,11 @@ class procurement_order(osv.osv):
         'production_id': fields.many2one('mrp.production', 'Manufacturing Order'),
     }
 
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
+        result = super(procurement_order, self)._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, context)
+        result['property_ids'] = [(6, 0, [x.id for x in line.property_ids])]
+        return result
+
     def check_produce_product(self, cr, uid, procurement, context=None):
         ''' Depict the capacity of the procurement workflow to produce products (not services)'''
         return True
@@ -122,6 +127,5 @@ class procurement_order(osv.osv):
             body = _("Manufacturing Order <em>%s</em> created.") % ( procurement.production_id.name,)
             self.message_post(cr, uid, [procurement.id], body=body, context=context)
     
-procurement_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index f5e29a1d103..d7a19c718fa 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -37,6 +37,5 @@ class product_product(osv.osv):
         return super(product_product, self).copy(cr, uid, id, default, context=context)
 
 
-product_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py
index 7dff886a4ba..76474ccb6ab 100644
--- a/addons/mrp/report/mrp_report.py
+++ b/addons/mrp/report/mrp_report.py
@@ -52,7 +52,6 @@ class report_workcenter_load(osv.osv):
                     to_char(p.date_planned,'YYYY:mm:dd')
             )""")
 
-report_workcenter_load()
 
 
 class report_mrp_inout(osv.osv):
@@ -97,7 +96,6 @@ class report_mrp_inout(osv.osv):
                     to_char(sm.date,'YYYY:IW')
             )""")
 
-report_mrp_inout()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml
index 8833d08e596..f413a6cfc70 100644
--- a/addons/mrp/report/order.rml
+++ b/addons/mrp/report/order.rml
@@ -139,37 +139,18 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -178,16 +159,16 @@
     <blockTable colWidths="256.0,61.0,107.0,104.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Product </para>
+          <para style="terp_tblheader_Details"><b>Product </b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
+          <para style="terp_tblheader_Details_Centre"><b>Quantity</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Source Location</para>
+          <para style="terp_tblheader_Details_Centre"><b>Source Location</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Destination Location</para>
+          <para style="terp_tblheader_Details_Centre"><b>Destination Location</b></para>
         </td>
       </tr>
     </blockTable>
@@ -196,20 +177,20 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Production Order N° : [[ o.name ]]</para>
+    <para style="terp_header"><b>Production Order N° : [[ o.name ]]</b></para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="193.0,206.0,129.0" style="Table3">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Source Document</para>
+          <para style="terp_tblheader_General_Centre"><b>Source Document</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Product </para>
+          <para style="terp_tblheader_General_Centre"><b>Product </b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Quantity</para>
+          <para style="terp_tblheader_General_Centre"><b>Quantity</b></para>
         </td>
       </tr>
     </blockTable>
@@ -232,16 +213,16 @@
     <blockTable colWidths="193.0,92.0,114.0,129.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Scheduled Date</para>
+          <para style="terp_tblheader_General_Centre"><b>Scheduled Date</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Printing date</para>
+          <para style="terp_tblheader_General_Centre"><b>Printing date</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Partner Ref</para>
+          <para style="terp_tblheader_General_Centre"><b>Partner Ref</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">SO Number</para>
+          <para style="terp_tblheader_General_Centre"><b>SO Number</b></para>
         </td>
       </tr>
     </blockTable>
@@ -266,26 +247,26 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_Bold_8">Work Orders [[ o.workcenter_lines ==[] and removeParentNode('para')]]</para>
+    <para style="terp_default_Bold_8"><b>Work Orders [[ o.workcenter_lines ==[] and removeParentNode('para')]]</b></para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="74.0,212.0,112.0,66.0,64.0" style="Table6">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Sequence</para>
+          <para style="terp_tblheader_General_Centre"><b>Sequence</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Name [[ o.workcenter_lines ==[] and removeParentNode('blockTable')]]</para>
+          <para style="terp_tblheader_Details_Centre"><b>Name [[ o.workcenter_lines ==[] and removeParentNode('blockTable')]]</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">WorkCenter</para>
+          <para style="terp_tblheader_General_Centre"><b>WorkCenter</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">No. Of Cycles</para>
+          <para style="terp_tblheader_General_Centre"><b>No. Of Cycles</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">No. Of Hours</para>
+          <para style="terp_tblheader_General_Centre"><b>No. Of Hours</b></para>
         </td>
       </tr>
     </blockTable>
@@ -317,28 +298,28 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_Bold_9">Bill Of Material </para>
+    <para style="terp_default_Bold_9"><b>Bill Of Material </b></para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="256.0,61.0,107.0,104.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Product </para>
+          <para style="terp_tblheader_Details"><b>Product </b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
+          <para style="terp_tblheader_Details_Centre"><b>Quantity</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Source Location</para>
+          <para style="terp_tblheader_Details_Centre"><b>Source Location</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Destination Location</para>
+          <para style="terp_tblheader_Details_Centre"><b>Destination Location</b></para>
         </td>
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_Bold_9">Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]</para>
+      <para style="terp_default_Bold_9"><b>Products to Consume [[ o.move_lines ==[] and removeParentNode('section')]]</b></para>
       <section>
         <para style="terp_default_2">[[ repeatIn(o.move_lines,'line') ]]</para>
         <blockTable colWidths="250.0,65.0,108.0,104.0" style="Table9">
@@ -363,7 +344,7 @@
       <para style="terp_default_Bold_9">
         <font color="white"> </font>
       </para>
-      <para style="terp_default_Bold_9">Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]</para>
+      <para style="terp_default_Bold_9"><b>Consumed Products [[ o.move_lines2 ==[] and removeParentNode('section')]]</b></para>
       <section>
         <para style="terp_default_2">[[ repeatIn(o.move_lines2,'line2') ]]</para>
         <blockTable colWidths="251.0,66.0,106.0,104.0" style="Table10">
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 2feffee94a1..0ebc7bd199d 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -145,7 +145,6 @@ class StockMove(osv.osv):
                 res.append(new_move)
         return res
 
-StockMove()
 
 
 class StockPicking(osv.osv):
@@ -162,7 +161,6 @@ class StockPicking(osv.osv):
             todo.extend(move_obj._action_explode(cr, uid, move))
         return list(set(todo))
 
-StockPicking()
 
 
 class split_in_production_lot(osv.osv_memory):
@@ -179,6 +177,5 @@ class split_in_production_lot(osv.osv_memory):
         production_obj.write(cr, uid, production_ids, {'move_lines': [(4, m) for m in new_moves]})
         return new_moves
 
-split_in_production_lot()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 74309b50825..41b6022a178 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -101,6 +101,5 @@ class change_production_qty(osv.osv_memory):
             self._update_product_to_produce(cr, uid, prod, wiz_qty.product_qty, context=context)
         return {}
 
-change_production_qty()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/mrp_price.py b/addons/mrp/wizard/mrp_price.py
index 08506ccf0e2..70b4482b019 100644
--- a/addons/mrp/wizard/mrp_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -52,6 +52,5 @@ class mrp_price(osv.osv_memory):
             'datas' : datas,
        }
 
-mrp_price()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 3a3c5961d1e..0851657587c 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -67,6 +67,5 @@ class mrp_product_produce(osv.osv_memory):
                             data.product_qty, data.mode, context=context)
         return {}
 
-mrp_product_produce()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
index 265c6ddcea0..79905673a6b 100644
--- a/addons/mrp/wizard/mrp_workcenter_load.py
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -51,6 +51,5 @@ class mrp_workcenter_load(osv.osv_memory):
             'datas' : datas,
        }
 
-mrp_workcenter_load()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_byproduct/mrp_byproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
index 22bbface59d..2425c2d8fea 100644
--- a/addons/mrp_byproduct/mrp_byproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -64,7 +64,6 @@ class mrp_subproduct(osv.osv):
             res['value'].update({'product_uom': product.uom_id.id})
         return res
 
-mrp_subproduct()
 
 class mrp_bom(osv.osv):
     _name = 'mrp.bom'
@@ -75,7 +74,6 @@ class mrp_bom(osv.osv):
         'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'Byproducts'),
     }
 
-mrp_bom()
 
 class mrp_production(osv.osv):
     _description = 'Production'
@@ -143,7 +141,6 @@ class mrp_production(osv.osv):
                 return subproduct_factor
         return super(mrp_production, self)._get_subproduct_factor(cr, uid, production_id, move_id, context=context)
 
-mrp_production()
 
 class change_production_qty(osv.osv_memory):
     _inherit = 'change.production.qty'
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index c069def7554..87861ba8fc6 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -46,7 +46,6 @@ class stock_move(osv.osv):
         })
         return super(stock_move, self).copy(cr, uid, id, default, context)
 
-stock_move()
 
 class mrp_production_workcenter_line(osv.osv):
 
@@ -129,7 +128,7 @@ class mrp_production_workcenter_line(osv.osv):
                elif prod_obj.state =='in_production':
                    return
                else:
-                   raise osv.except_osv(_('Error!'),_('Manufacturing order cannot start in state "%s"!') % (prod_obj.state,))
+                   raise osv.except_osv(_('Error!'),_('Manufacturing order cannot be started in state "%s"!') % (prod_obj.state,))
         else:
             oper_ids = self.search(cr,uid,[('production_id','=',prod_obj.id)])
             obj = self.browse(cr,uid,oper_ids)
@@ -371,7 +370,6 @@ class mrp_production(osv.osv):
         self._compute_planned_workcenter(cr, uid, ids, context=context)
         return result
 
-mrp_production()
 
 class mrp_operations_operation_code(osv.osv):
     _name="mrp_operations.operation.code"
@@ -380,7 +378,6 @@ class mrp_operations_operation_code(osv.osv):
         'code': fields.char('Code', size=16, required=True),
         'start_stop': fields.selection([('start','Start'),('pause','Pause'),('resume','Resume'),('cancel','Cancelled'),('done','Done')], 'Status', required=True),
     }
-mrp_operations_operation_code()
 
 class mrp_operations_operation(osv.osv):
     _name="mrp_operations.operation"
@@ -446,7 +443,7 @@ class mrp_operations_operation(osv.osv):
 
         if not oper_objs:
             if code.start_stop!='start':
-                raise osv.except_osv(_('Sorry!'),_('Operation is not started yet !'))
+                raise osv.except_osv(_('Sorry!'),_('Operation is not started yet!'))
                 return False
         else:
             for oper in oper_objs:
@@ -560,6 +557,5 @@ class mrp_operations_operation(osv.osv):
         'date_start': lambda *a:datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     }
 
-mrp_operations_operation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml
index 452434bbe92..d448b6a299a 100644
--- a/addons/mrp_operations/process/mrp_operation_process.xml
+++ b/addons/mrp_operations/process/mrp_operation_process.xml
@@ -75,32 +75,32 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Creation of the work order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The work orders are created on the basis of the production order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
+            <field name="target_node_id" ref="process_node_startoperation0"/>
+            <field name="source_node_id" ref="process_node_productionorder0"/>
         </record>
 
         <record id="process_transition_workstartoperation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Details of the work order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;There is 1 work order per work center. The information about the number of cycles or the cycle time.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_startoperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_workorder0"/>
+            <field name="target_node_id" ref="process_node_startoperation0"/>
+            <field name="source_node_id" ref="process_node_workorder0"/>
         </record>
 
         <record id="process_transition_startdoneoperation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Operation done&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;When the operation is finished, the operator updates the system by finishing the work order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_doneoperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
+            <field name="target_node_id" ref="process_node_doneoperation0"/>
+            <field name="source_node_id" ref="process_node_startoperation0"/>
         </record>
 
         <record id="process_transition_startcanceloperation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Operation cancelled&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;When the operation needs to be cancelled, you can do it in the work order form.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_canceloperation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_startoperation0"/>
+            <field name="target_node_id" ref="process_node_canceloperation0"/>
+            <field name="source_node_id" ref="process_node_startoperation0"/>
         </record>
 
     </data>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis.py b/addons/mrp_operations/report/mrp_workorder_analysis.py
index 73982b09f8b..f91961ad74c 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis.py
+++ b/addons/mrp_operations/report/mrp_workorder_analysis.py
@@ -71,6 +71,5 @@ class mrp_workorder(osv.osv):
                     w.costs_hour, mp.product_id, mp.name, wl.state, wl.date_planned, wl.production_id, wl.workcenter_id
         )""")
 
-mrp_workorder()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 6c3f0ce21e1..f7b082db74b 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -365,7 +365,7 @@ class mrp_repair(osv.osv):
             if repair.state in ('draft','cancel') or repair.invoice_id:
                 continue
             if not (repair.partner_id.id and repair.partner_invoice_id.id):
-                raise osv.except_osv(_('No partner !'),_('You have to select a Partner Invoice Address in the repair form !'))
+                raise osv.except_osv(_('No partner!'),_('You have to select a Partner Invoice Address in the repair form!'))
             comment = repair.quotation_notes
             if (repair.invoice_method != 'none'):
                 if group and repair.partner_invoice_id.id in invoices_group:
@@ -582,7 +582,7 @@ class ProductChangeMixin(object):
             result['product_uom'] = product_obj.uom_id and product_obj.uom_id.id or False
             if not pricelist:
                 warning = {
-                    'title':'No Pricelist !',
+                    'title':'No Pricelist!',
                     'message':
                         'You have to select a pricelist in the Repair form !\n'
                         'Please set one before choosing a product.'
@@ -699,7 +699,6 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
                 'location_dest_id': scrap_location_ids and scrap_location_ids[0] or False,
                 }}
 
-mrp_repair_line()
 
 class mrp_repair_fee(osv.osv, ProductChangeMixin):
     _name = 'mrp.repair.fee'
@@ -741,5 +740,4 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         'to_invoice': lambda *a: True,
     }
 
-mrp_repair_fee()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index d35a9ebcf1d..a4526b5b581 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -210,7 +210,7 @@
                   <separator/>
                   <filter icon="terp-dolar" string="Invoiced" domain="[('invoiced','=',True)]"/>
                   <field name="product_id"/>
-                  <field name="partner_id"/>
+                  <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                   <group expand="0" string="Group By...">
                       <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                       <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
diff --git a/addons/mrp_repair/security/mrp_repair_security.xml b/addons/mrp_repair/security/mrp_repair_security.xml
index 0b34310fc4e..e94b675b57f 100644
--- a/addons/mrp_repair/security/mrp_repair_security.xml
+++ b/addons/mrp_repair/security/mrp_repair_security.xml
@@ -11,4 +11,4 @@
     </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 12b85efd202..4c60f6c3251 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -81,7 +81,6 @@ class repair_cancel(osv.osv_memory):
             """
         return res
 
-repair_cancel()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 9442746d68e..f9c84cb7bdb 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -68,7 +68,6 @@ class make_invoice(osv.osv_memory):
             'type': 'ir.actions.act_window'
         }
 
-make_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/multi_company/i18n/ru.po b/addons/multi_company/i18n/ru.po
index 3dea680c371..e1665d9c838 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-08-17 11:09+0000\n"
+"PO-Revision-Date: 2013-06-06 10:25+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:36+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
@@ -45,6 +45,16 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Уважаемые господа,\n"
+"\n"
+"Наши записи зафиксировали что некоторые платежи остаются неоплаченными. "
+"Пожалуйста ознакомьтесь с подробностями ниже.\n"
+"Если сумма уже была оплачена, пожалуйста проигнорируйте это оповещение. В "
+"ином случае, пожалуйста перечислите нам всю сумму отображенную ниже.\n"
+"Если у вас есть какие-либо замечания, пожалуйста свяжитесь с нами.\n"
+"\n"
+"Заранее благодарим за сотрудничество.\n"
+"С наилучшими пожеланиями,"
 
 #. module: multi_company
 #: view:multi_company.default:0
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 088aa35e915..c772a8fd67d 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -192,8 +192,8 @@
             <field name="code">SAJ-OpenERP IN</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -204,8 +204,8 @@
             <field name="code">SCNJ-OpenERP IN</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -216,8 +216,8 @@
             <field name="code">EXJ-OpenERP IN</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -228,8 +228,8 @@
             <field name="code">ECNJ-OpenERP IN</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -240,8 +240,8 @@
             <field name="code">BNK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -252,8 +252,8 @@
             <field name="code">CHK-OpenERP IN</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -264,8 +264,8 @@
             <field name="code">CSH-OpenERP IN</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_in"/>
@@ -277,8 +277,8 @@
             <field name="code">SAJ-OpenERP US</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -289,8 +289,8 @@
             <field name="code">SCNJ-OpenERP US</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -301,8 +301,8 @@
             <field name="code">EXJ-OpenERP US</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -313,8 +313,8 @@
             <field name="code">ECNJ-OpenERP US</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -325,8 +325,8 @@
             <field name="code">BNK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -337,8 +337,8 @@
             <field name="code">CHK-OpenERP US</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -349,8 +349,8 @@
             <field name="code">CSH-OpenERP US</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_us"/>
@@ -363,8 +363,8 @@
             <field name="code">SAJ-OpenERP BE</field>
             <field name="type">sale</field>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -375,8 +375,8 @@
             <field name="code">SCNJ-OpenERP BE</field>
             <field name="type">sale_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
+            <field name="default_credit_account_id" ref="account.a_sale"/>
+            <field name="default_debit_account_id" ref="account.a_sale"/>
             <field name="analytic_journal_id" ref="account.cose_journal_sale"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -387,8 +387,8 @@
             <field name="code">EXJ-OpenERP BE</field>
             <field name="type">purchase</field>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -399,8 +399,8 @@
             <field name="code">ECNJ-OpenERP BE</field>
             <field name="type">purchase_refund</field>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
+            <field name="default_debit_account_id" ref="account.a_expense"/>
+            <field name="default_credit_account_id" ref="account.a_expense"/>
             <field name="analytic_journal_id" ref="account.exp"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -411,8 +411,8 @@
             <field name="code">BNK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -423,8 +423,8 @@
             <field name="code">CHK-OpenERP BE</field>
             <field name="type">bank</field>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
@@ -435,8 +435,8 @@
             <field name="code">CSH-OpenERP BE</field>
             <field name="type">cash</field>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
+            <field name="default_debit_account_id" ref="account.cash"/>
+            <field name="default_credit_account_id" ref="account.cash"/>
             <field name="analytic_journal_id" ref="account.sit"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="res_company_oerp_be"/>
diff --git a/addons/note/html/index.html b/addons/note/html/index.html
new file mode 100644
index 00000000000..7ef37c646e9
--- /dev/null
+++ b/addons/note/html/index.html
@@ -0,0 +1,116 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Notes</h2>
+        <h3 class="oe_slogan">Getting Things Done with Notes</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=note">
+                    <img src="notes_sc_00.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Organize yourself with efficient todo lists and notes. From personnal tasks to collaborative meeting minutes, increase your user's productivity by giving them the tools to prioritize their work, share their ideas and collaborate on documents.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Personal to-do lists that works</h2>
+            <p class="oe_mt32">
+Quickly create to-dos, organize horizontally for the mid-term (today, this week, this month, ...), prioritize vertically for the short term and group by assigning colors. The kanban approach allows a simple visual organization of your to-dos.
+            </p>
+        </div>
+        <div class="oe_span12">
+            <img src="notes_illu_01.png">
+        </div>
+        <div class="oe_span4">
+            <h3>Beat Work Overload</h3>
+            <p>
+             Feel how good it is to rely on a structured way to organize your work instead of keeping everything in memory. Use notes to <a href="http://en.wikipedia.org/wiki/Getting_Things_Done">Get Things Done</a>.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Prioritize Efficiently</h3>
+            <p>
+              Most people are lost in the flow of urgent daily tasks and have difficulties to work on important, long-term tasks. Notes gives you a simple way to allocate time very day to do important, but less urgent tasks.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Find Motivation to Close Tasks</h3>
+            <p>
+              People used to work on tasks they like and not on important tasks. Start feeling good by checking tasks as done.
+            </p>
+        </div>
+    </div>
+</section>
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Adapts to Your Creative Process</h2>
+        <h3 class="oe_slogan">Customize to your own workflow</h3>
+            <p>
+Everyone has their own way to organize activities. OpenERP Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes.
+            </p>
+            <img class="oe_picture oe_screenshot" src="notes_sc_03.png">
+        
+        <div class="oe_span4">
+          <h3>A Creative Person</h3>
+          <p>
+A creative person will organize notes based on idea's maturity level: Draft Ideas <i class="icon-angle-right"></i> Mature Ideas <i class="icon-angle-right"></i> Specified <i class="icon-angle-right"></i>To Do</p>
+        </div>
+        <div class="oe_span4">
+          <h3>A Frequent Traveler</h3>
+          <p>
+            An employee travelling a lot can organize their tasks based on the context to perform the task: U.S. Office | London's Office | To Review during Flights | At Home
+          </p>
+        </div>
+        <div class="oe_span4">
+          <h3>A Manager</h3>
+          <p>
+            A manager will organize their high number of tasks based on prioritizations: Todo Today | This Week | This Month | Later
+        </div>
+        
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Personnal Notes</h2>
+        <h3 class="oe_slogan">Notes are private but can be shared</h3>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="notes_sc_01.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Write down your ideas in pads, keep your notes at your finger tips, attach related documents and use tags and colors to organize the information. Once your ideas are mature, you can share them to others users, start discussing it and collaborate by improving the specification in the pad.
+          </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Collaborative Meeting Minutes</h2>
+        <h3 class="oe_slogan">Real-time sharing and edition of notes</h3>
+        <div class="oe_span6">
+           <p class="oe_mt32">
+The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="notes_sc_02.png">
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/note/html/notes_illu_01.png b/addons/note/html/notes_illu_01.png
new file mode 100644
index 00000000000..a7d4197561d
Binary files /dev/null and b/addons/note/html/notes_illu_01.png differ
diff --git a/addons/note/html/notes_sc_00.png b/addons/note/html/notes_sc_00.png
new file mode 100644
index 00000000000..7bb4f95a640
Binary files /dev/null and b/addons/note/html/notes_sc_00.png differ
diff --git a/addons/note/html/notes_sc_01.png b/addons/note/html/notes_sc_01.png
new file mode 100644
index 00000000000..ce9367abf9b
Binary files /dev/null and b/addons/note/html/notes_sc_01.png differ
diff --git a/addons/note/html/notes_sc_02.png b/addons/note/html/notes_sc_02.png
new file mode 100644
index 00000000000..e47889b33fc
Binary files /dev/null and b/addons/note/html/notes_sc_02.png differ
diff --git a/addons/note/html/notes_sc_03.png b/addons/note/html/notes_sc_03.png
new file mode 100644
index 00000000000..6d59d7e5df8
Binary files /dev/null and b/addons/note/html/notes_sc_03.png differ
diff --git a/addons/note/i18n/lt.po b/addons/note/i18n/lt.po
new file mode 100644
index 00000000000..3e030054520
--- /dev/null
+++ b/addons/note/i18n/lt.po
@@ -0,0 +1,284 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-04-29 15:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr ""
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr ""
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr ""
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr ""
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr ""
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr ""
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr ""
diff --git a/addons/note/i18n/ru.po b/addons/note/i18n/ru.po
new file mode 100644
index 00000000000..ef2cd6be0c1
--- /dev/null
+++ b/addons/note/i18n/ru.po
@@ -0,0 +1,286 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-06-06 10:35+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Содержание заметки"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Этапы заметок"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr "Эта неделя"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "Тег заметки"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Заметка"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Группировать по ..."
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Подписчики"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Сегодня"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Пользователи"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "Этап заметок"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Непрочитанные"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "неизвестно"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "Название этапа"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Подписан"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
+msgstr "Завтра"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Активно"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "Владелец этапа заметки"
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Категории"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Этап"
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Название тега"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Заметки"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Позже"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "Этап заметки"
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Итог"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "Этапы пользователей"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "Заметка - кратко"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "Этапы"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Сообщения и история общения"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Удалить"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Цветовая палитра"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Нумерация"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Теги"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Архив"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "Используйте совместный планшет (etherpad)"
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Владелец"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Используется для сортировки этапов заметок"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Дата выполнения"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "Свернуто по умолчанию"
diff --git a/addons/note/note.py b/addons/note/note.py
index 2d95b15107a..eb9a6397d18 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -141,12 +141,19 @@ class note_note(osv.osv):
                 #note without user's stage
                 nb_notes_ws = self.search(cr,uid, domain+[('stage_ids', 'not in', current_stage_ids)], context=context, count=True)
                 if nb_notes_ws:
-                    result += [{ #notes for unknown stage and if stage_ids is not empty
-                        '__context': {'group_by': groupby[1:]},
-                        '__domain': domain + [('stage_ids', 'not in', current_stage_ids)],
-                        'stage_id': (0, 'Unknown'),
-                        'stage_id_count':nb_notes_ws
-                    }]
+                    # add note to the first column if it's the first stage
+                    dom_not_in = ('stage_ids', 'not in', current_stage_ids)
+                    if result and result[0]['stage_id'][0] == current_stage_ids[0]:
+                        dom_in = result[0]['__domain'].pop()
+                        result[0]['__domain'] = domain + ['|', dom_in, dom_not_in]
+                    else:
+                        # add the first stage column
+                        result = [{
+                            '__context': {'group_by': groupby[1:]},
+                            '__domain': domain + [dom_not_in],
+                            'stage_id': (current_stage_ids[0], stage_name[current_stage_ids[0]]),
+                            'stage_id_count':nb_notes_ws
+                        }] + result
 
             else: # if stage_ids is empty
 
@@ -156,7 +163,7 @@ class note_note(osv.osv):
                     result = [{ #notes for unknown stage
                         '__context': {'group_by': groupby[1:]},
                         '__domain': domain,
-                        'stage_id': (0, 'Unknown'),
+                        'stage_id': False,
                         'stage_id_count':nb_notes_ws
                     }]
                 else:
@@ -187,9 +194,12 @@ class res_users(osv.Model):
         model_id = data_obj.get_object_reference(cr, uid, 'base', 'group_user') #Employee Group
         group_id = model_id and model_id[1] or False
         if group_id in [x.id for x in user.groups_id]:
-            for note_xml_id in ['note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
-                data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+            for note_xml_id in ['note_stage_00','note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
+                try:
+                    data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+                except ValueError:
+                    continue
                 stage_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
                 note_obj.copy(cr, uid, stage_id, default = { 
                                         'user_id': user_id}, context=context)
-        return user_id
\ No newline at end of file
+        return user_id
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
index 592292788b3..376b8e9053f 100644
--- a/addons/note/note_data.xml
+++ b/addons/note/note_data.xml
@@ -2,6 +2,12 @@
 <openerp>
   <data>
 
+    <record model="note.stage" id="note_stage_00">
+      <field name="name">New</field>
+      <field name="sequence" eval="0"/>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
     <record model="note.stage" id="note_stage_01">
       <field name="name">Today</field>
       <field name="sequence">1</field>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 49a154d10cc..f3b9e4669c7 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -175,7 +175,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
-      <field name="context">{'search_default_open_true':True}</field>
+      <field name="context">{}</field>
       <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to add a personal note.
@@ -193,7 +193,7 @@
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>
-    <menuitem name="Categories" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
+    <menuitem name="Stages" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
 
   </data>
 </openerp>
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index b0c79561355..2c6e9f3bc7f 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -3,7 +3,7 @@
 <data>
   <record id="note_note_rule_global" model="ir.rule">
     <field name="name">Only followers can access a sticky notes</field>
-    <field model="ir.model" ref="model_note_note" name="model_id"/>
+    <field ref="model_note_note" name="model_id"/>
     <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field>
     <field eval="True" name="global"/>
     <field eval="1" name="perm_unlink"/>
@@ -14,7 +14,7 @@
 
   <record id="note_stage_rule_global" model="ir.rule">
     <field name="name">Each user have his stage name</field>
-    <field model="ir.model" ref="model_note_stage" name="model_id"/>
+    <field ref="model_note_stage" name="model_id"/>
     <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
     <field eval="True" name="global"/>
   </record>
diff --git a/addons/note_pad/i18n/lt.po b/addons/note_pad/i18n/lt.po
new file mode 100644
index 00000000000..3c814e3f7eb
--- /dev/null
+++ b/addons/note_pad/i18n/lt.po
@@ -0,0 +1,28 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Užrašinė"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Nuorodą į užrašinę"
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 90f5354054c..4cd9e91b76e 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -42,7 +42,7 @@ class pad_common(osv.osv_memory):
             myPad.createPad(path)
 
             #get attr on the field model
-            model = self.pool.get(context["model"])
+            model = self.pool[context["model"]]
             field = model._all_columns[context['field_name']]
             real_field = field.column.pad_content_field
 
diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
index 6af310b48aa..0db607fe16f 100644
--- a/addons/pad/py_etherpad/__init__.py
+++ b/addons/pad/py_etherpad/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 """Module to talk to EtherpadLite API."""
 
 import json
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index ad47be32b02..a0002ebe97c 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -43,7 +43,7 @@
     z-index: 1000;
 }
 
-.oe_pad.oe_configured .oe_pad_content.oe_editing{
+.oe_pad .oe_pad_content.oe_editing{
     border: solid 1px #c4c4c4;
     height:500px;
     -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
@@ -53,7 +53,7 @@
             box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 }
 
-.oe_pad.oe_configured.oe_pad_fullscreen .oe_pad_content {
+.oe_pad.oe_pad_fullscreen .oe_pad_content {
     height: 100%;
     border: none;
     -webkit-box-shadow: none;
@@ -63,7 +63,7 @@
             box-shadow: none;
 }
 
-.oe_pad.oe_unconfigured > p {
+.oe_pad .oe_unconfigured {
     text-align: center;
     opacity: 0.75;
 }
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index b96047340ad..ba5ee3a3037 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,67 +1,64 @@
 openerp.pad = function(instance) {
     
-    instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
+    instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeWidgetMixin, {
         template: 'FieldPad',
-        configured: false,
         content: "",
-        start: function() {
-            this._super();
-            var self  = this;
-            this.on('change:effective_readonly',this,function(){
-                self.renderElement();
+        init: function() {
+            this._super.apply(this, arguments);
+            this.set("configured", true);
+            this.on("change:configured", this, this.switch_configured);
+        },
+        initialize_content: function() {
+            var self = this;
+            this.switch_configured();
+            this.$('.oe_pad_switch').click(function() {
+                self.$el.toggleClass('oe_pad_fullscreen');
             });
+            this.render_value();
+        },
+        switch_configured: function() {
+            this.$(".oe_unconfigured").toggle(! this.get("configured"));
+            this.$(".oe_configured").toggle(this.get("configured"));
         },
         render_value: function() {
-            var self = this;
-            var _super = _.bind(this._super, this);
-            if (this.get("value") === false || this.get("value") === "") {
-                self.view.dataset.call('pad_generate_url',{context:{
+            var self  = this;
+            if (this.get("configured") && ! this.get("value")) {
+                self.view.dataset.call('pad_generate_url', {
+                    context: {
                         model: self.view.model,
                         field_name: self.name,
                         object_id: self.view.datarecord.id
-                    }}).done(function(data) {
-                    if(data&&data.url){
-                        self.set({value: data.url});
-                        _super(data.url);
-                        self.renderElement();
+                    },
+                }).done(function(data) {
+                    if (! data.url) {
+                        self.set("configured", false);
+                    } else {
+                        self.set("value", data.url);
                     }
                 });
-            } else {
-                self.renderElement();
             }
-            this._dirty_flag = true;
-        },
-        renderElement: function(){
-            var self  = this;
+            this.$('.oe_pad_content').html("");
             var value = this.get('value');
             if (this.pad_loading_request) {
                 this.pad_loading_request.abort();
             }
-            if(!_.str.startsWith(value,'http')){
-                this.configured = false;
-                this.content = "";
-            }else{
-                this.configured = true;
-                if(!this.get('effective_readonly')){
-                    this.content = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+this.session.username+'"></iframe>';
-                }else{
+            if (_.str.startsWith(value, 'http')) {
+                if (! this.get('effective_readonly')) {
+                    var content = '<iframe width="100%" height="100%" frameborder="0" src="' + value + '?showChat=false&userName=' + this.session.username + '"></iframe>';
+                    this.$('.oe_pad_content').html(content);
+                    this._dirty_flag = true;
+                } else {
                     this.content = '<div class="oe_pad_loading">... Loading pad ...</div>';
-                    this.pad_loading_request = $.get(value+'/export/html')
-                    .done(function(data){
+                    this.pad_loading_request = $.get(value + '/export/html').done(function(data) {
                         groups = /\<\s*body\s*\>(.*?)\<\s*\/body\s*\>/.exec(data);
                         data = (groups || []).length >= 2 ? groups[1] : '';
                         self.$('.oe_pad_content').html('<div class="oe_pad_readonly"><div>');
                         self.$('.oe_pad_readonly').html(data);
-                    }).error(function(){
+                    }).fail(function() {
                         self.$('.oe_pad_content').text('Unable to load pad');
                     });
                 }
             }
-            this._super();
-            this.$('.oe_pad_content').html(this.content);
-            this.$('.oe_pad_switch').click(function(){
-                self.$el.toggleClass('oe_pad_fullscreen');
-            });
         },
     });
 
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index bd3e296f9b3..f915e867b35 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -5,32 +5,25 @@
 
     <t t-name="FieldPad">
 
-        <t t-if="!widget.configured">
-            <div class="oe_form_field_text oe_pad oe_unconfigured">
-                <p>
-                    You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company.
-                </p>
-            </div>
-        </t>
-
-        <t t-if="widget.configured">
+        <div class="oe_form_field_text oe_pad">
+            <p class="oe_unconfigured">
+                You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company.
+            </p>
             <t t-if="widget.get('effective_readonly')">
-                <div class="oe_form_field_text oe_pad oe_configured">
-                    <div class="oe_pad_content etherpad_readonly">
-                    </div>
+                <div class="oe_pad_content etherpad_readonly oe_configured">
                 </div>
             </t>
+            <t t-if="! widget.get('effective_readonly')">
+                <div class="oe_pad_switch_positioner oe_configured">
+                    <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
+                </div>
+                <div class="oe_pad_content oe_editing oe_configured">
+                </div>
+            </t>
+        </div>
+
+
 
-            <t t-if="!widget.get('effective_readonly')">
-                <div class="oe_form_field_text oe_pad oe_configured">
-                    <div class="oe_pad_switch_positioner">
-                        <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
-                    </div>
-                    <div class="oe_pad_content oe_editing">
-                    </div>
-                </div>
-            </t>
-        </t>
     </t>
 
 </templates>
diff --git a/addons/pad_project/i18n/lt.po b/addons/pad_project/i18n/lt.po
new file mode 100644
index 00000000000..2f7340a36e2
--- /dev/null
+++ b/addons/pad_project/i18n/lt.po
@@ -0,0 +1,39 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Klaida! Užduotės pabaigos data negali būti ankstesnė nei pradžios data"
+
+#. module: pad_project
+#: field:project.task,description_pad:0
+msgid "Description PAD"
+msgstr ""
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Užduotis"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Klaida! Negalima sukurti rekursinių užduočių."
diff --git a/addons/plugin/i18n/lt.po b/addons/plugin/i18n/lt.po
new file mode 100644
index 00000000000..dc120cadcf2
--- /dev/null
+++ b/addons/plugin/i18n/lt.po
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index f13fc255a6d..fc6c874fab5 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -58,7 +58,7 @@ class plugin_handler(osv.osv_memory):
             res_id = msg.res_id
             model = msg.model
             url = self._make_url(cr, uid, res_id, model)
-            name = self.pool.get(model).name_get(cr, uid, [res_id])[0][1]
+            name =  self.pool[model].name_get(cr, uid, [res_id])[0][1]
         return (model, res_id, url, name)
 
     def document_type(self, cr, uid, context=None):
@@ -82,7 +82,7 @@ class plugin_handler(osv.osv_memory):
             @return : the result of name_search a list of tuple
             [(id, 'name')]
         """
-        return self.pool.get(model).name_search(cr, uid, name)
+        return self.pool[model].name_search(cr, uid, name)
 
     def push_message(self, cr, uid, model, email, res_id=0):
         """
@@ -92,7 +92,7 @@ class plugin_handler(osv.osv_memory):
             @return Dictionary which contain model , url and resource id.
         """
         mail_message = self.pool.get('mail.message')
-        model_obj = self.pool.get(model)
+        model_obj = self.pool[model]
         msg = self.pool.get('mail.thread').message_parse(cr, uid, email)
         message_id = msg.get('message-id')
         mail_ids = mail_message.search(cr, uid, [('message_id', '=', message_id), ('res_id', '=', res_id), ('model', '=', model)])
@@ -110,7 +110,7 @@ class plugin_handler(osv.osv_memory):
             model_obj.message_post(cr, uid, [res_id],
                             body=msg.get('body'),
                             subject=msg.get('subject'),
-                            type='email',
+                            type='comment' if model == 'res.partner' else 'email',
                             parent_id=msg.get('parent_id'),
                             attachments=msg.get('attachments'))
             notify = _("Mail successfully pushed")
diff --git a/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
index e1103b30acf..5ca7a5a934a 100755
--- a/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/install.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 make clean
 make 
 cp ../openerp_plugin.xpi /home/openerp/
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 31415bb847c..9275b975d46 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -34,7 +34,6 @@ class account_journal(osv.osv):
         'self_checkout_payment_method' : False,
     }
 
-account_journal()
 
 class account_cash_statement(osv.osv):
     _inherit = 'account.bank.statement'
@@ -42,6 +41,5 @@ class account_cash_statement(osv.osv):
         'pos_session_id' : fields.many2one('pos.session'),
     }
 
-account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/html/index.html b/addons/point_of_sale/html/index.html
new file mode 100644
index 00000000000..130806ddb11
--- /dev/null
+++ b/addons/point_of_sale/html/index.html
@@ -0,0 +1,244 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">A very friendly Point of Sale</h2>
+            <h3 class="oe_slogan">Set up in a minute, Sell in seconds</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=point_of_sale">
+                    <img src="pos_sc_02.jpg">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                OpenERP's Point of Sale introduces a super clean interface with no installation required
+                that runs online and offline on modern hardwares.
+            </p>
+            <p>
+                It's full integration with the company inventory and accounting, gives you real time statistics and
+                consolidations amongst all shops without the hassle of integrating several applications.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Work with the hardware you already have</h2>
+            <h3 class="oe_slogan">Desktops, laptops, tablets, it runs on everything</h3>
+        </div>
+        <div class="oe_span12">
+            <img class='oe_centered' src="pos_devices.png">
+        </div>
+        <div class="oe_span4">
+            <h3>In your web browser</h3>
+            <p>
+            OpenERP's POS is a web application that can run on any device that can
+            display websites with little to no setup required.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Touchscreen or Keyboard ?</h3>
+            <p>
+            The Point of Sale works perfectly on any kind of touch enabled device, whether it's
+			multi-touch tablets like an iPad or keyboardless resistive touchscreen terminals.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Scales and Printers</h3>
+            <p>
+            Barcode scanners and printers are supported out of the box with no setup required.
+            Scales, cashboxes, and other peripherals can be used with the
+            proxy API.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+
+        <h2 class="oe_slogan">Online and Offline</h2> 
+        <h3 class="oe_slogan">OpenERP's POS stays reliable even if your connection isn't</h3>
+
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img src="pos_offline.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+                Deploy new stores with just an internet connection:
+                <b>no installation, no specific hardware required</b>. It works with any
+                <b>iPad, Tablet PC, laptop</b> or industrial POS machine.
+            </p><p>
+                While an internet connection is required to start the Point of Sale, 
+                it will stay operational even after a complete disconnection.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/manufacturing.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/manufacturing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class='oe_slogan'>A super clean user interface</h2>
+        <h3 class='oe_slogan'>The point of sale software retailers love to use</h3>
+    </div>
+    <div class='oe_row'>
+        <div class='oe_span4'>
+            <img class="oe_picture oe_screenshot" src="pos_ui_03.png">
+            <h3>Simple and beautifull</h3>
+            <p>
+                Say goodbye to ugly, outdated POS software and enjoy the OpenERP
+                web interface designed for modern retailer.
+            </p>
+        </div>
+        <div class='oe_span4 '>
+            <img class="oe_picture oe_screenshot" src="pos_ui_01.png">
+            <h3>Designed for Productivity</h3>
+            <p>
+            Whether it's for a restaurant or a shop, you can activate the multiple
+            tickets in parallel to not make your customers wait.
+            </p>
+        </div>
+        <div class='oe_span4 '>
+            <img class="oe_picture oe_screenshot" src="pos_ui_02.png">
+            <h3>Blasting fast search</h3>
+            <p>
+            Scan products, browse through hyerarchical categories, or get quick
+            information about products with the blasting fast filter accross
+            all your products.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container'>
+    <div class='oe_row'>
+        <h2 class="oe_slogan">Integrated Inventory Management</h2>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_product_form.png">
+        </div>
+        <div class='oe_span6'>
+            <p>
+            Consolidate all your sales channel in real time: stores, ecommerce, sales teams.
+            Get real time control of the inventory and accurate forecasts to manage procurements.
+            </p>
+            <p>
+			A full warehouse management system at your fingertips: get information
+			about products availabilities, trigger procurement requests, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container oe_dark'>
+    <div class='oe_row'>
+		<h2 class='oe_slogan'>Deliver in-store customer services</h2>
+		<h3 class='oe_slogan'>Repairs, warantees, deliveries, etc.</h3>
+        <div class='oe_span6'>
+            <p>
+			Give your shopper a strong experience by integrating in-store
+			customer services. Handle reparations, track warantees, follow
+			customer claims, plan delivery orders, etc.
+            </p>
+        </div>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_customers.png">
+        </div>
+    </div>
+</section>
+
+<section class='oe_container'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Invoicing &amp; Accounting Integration</h2> 
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_invoice.png">
+        </div>
+        <div class='oe_span6'>
+            <p>
+			Produce customer invoices in just a few clicks.  Control sales and
+			cash in real time and use OpenERP's powerful reporting to make
+			smarter decisions to improve your store's efficiency.
+            </p><p>
+			No more hassle of having to integrate softwares: get all your sales
+			and inventory operations automatically posted in your G/L. 
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container oe_dark'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Self-checkout Interface</h2>
+        <div class='oe_span6'>
+            <p>
+            Reduce costs by limitting the number of required cashiers.
+			The self-checkout mode allows customers to scan products and pay by
+			themselves with a dedicated and super easy user interface.
+            </p>
+            <p>
+            Use lights and sounds to control the checkout distantly.
+            </p>
+        </div>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_checkout.jpg">
+        </div>
+    </div>
+</section>
+
+
+<section class='oe_container'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Unified Data Amongst All Shops</h2>
+        <h3 class='oe_slogan'>Sync products, prices, customers with no effort</h3>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_products.png">
+        </div>
+        <div class='oe_span6'>
+            <p>
+            Get new products, pricing strategies and promotions applied automatically to
+            selected stores. Work on a unified customer base. No complex interface is
+            required to pilot a global strategy amongst all your stores.
+            </p>
+            <p>
+			With OpenERP as a backend, you have a system proven to be perfectly
+			suitable for small stores or large multinationals.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class='oe_container oe_dark'>
+    <div class='oe_row'>
+        <h2 class='oe_slogan'>Know your customers - in store and out</h2>
+        <div class='oe_span6'>
+            <p>
+            Successful brands integrates all their customer relationship accross all their
+            channels to develop accurate customer profile and communicate with shoppers
+            as they make buying decisions, in store or online.
+            </p>
+            <p>
+            With OpenERP, you get a 360° customer view, including cross-channel sales,
+            interaction history, profiles, and more.
+            </p>
+        </div>
+        <div class='oe_span6'>
+            <img class="oe_picture oe_screenshot" src="pos_customer_form.png">
+        </div>
+    </div>
+</section>
diff --git a/addons/point_of_sale/html/pos_checkout.jpg b/addons/point_of_sale/html/pos_checkout.jpg
new file mode 100644
index 00000000000..d87e5b8499d
Binary files /dev/null and b/addons/point_of_sale/html/pos_checkout.jpg differ
diff --git a/addons/point_of_sale/html/pos_customer_form.png b/addons/point_of_sale/html/pos_customer_form.png
new file mode 100644
index 00000000000..4e89d43c4c3
Binary files /dev/null and b/addons/point_of_sale/html/pos_customer_form.png differ
diff --git a/addons/point_of_sale/html/pos_customers.png b/addons/point_of_sale/html/pos_customers.png
new file mode 100644
index 00000000000..6448074c3d9
Binary files /dev/null and b/addons/point_of_sale/html/pos_customers.png differ
diff --git a/addons/point_of_sale/html/pos_devices.png b/addons/point_of_sale/html/pos_devices.png
new file mode 100644
index 00000000000..a021a87bfac
Binary files /dev/null and b/addons/point_of_sale/html/pos_devices.png differ
diff --git a/addons/point_of_sale/html/pos_invoice.png b/addons/point_of_sale/html/pos_invoice.png
new file mode 100644
index 00000000000..aae4f6d38a5
Binary files /dev/null and b/addons/point_of_sale/html/pos_invoice.png differ
diff --git a/addons/point_of_sale/html/pos_offline.png b/addons/point_of_sale/html/pos_offline.png
new file mode 100644
index 00000000000..764cda88e87
Binary files /dev/null and b/addons/point_of_sale/html/pos_offline.png differ
diff --git a/addons/point_of_sale/html/pos_product_form.png b/addons/point_of_sale/html/pos_product_form.png
new file mode 100644
index 00000000000..a25c85b6496
Binary files /dev/null and b/addons/point_of_sale/html/pos_product_form.png differ
diff --git a/addons/point_of_sale/html/pos_products.png b/addons/point_of_sale/html/pos_products.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/point_of_sale/html/pos_products.png differ
diff --git a/addons/point_of_sale/html/pos_sc_01.jpg b/addons/point_of_sale/html/pos_sc_01.jpg
new file mode 100644
index 00000000000..8fc97e00672
Binary files /dev/null and b/addons/point_of_sale/html/pos_sc_01.jpg differ
diff --git a/addons/point_of_sale/html/pos_sc_02.jpg b/addons/point_of_sale/html/pos_sc_02.jpg
new file mode 100644
index 00000000000..d26e0504933
Binary files /dev/null and b/addons/point_of_sale/html/pos_sc_02.jpg differ
diff --git a/addons/point_of_sale/html/pos_sc_03.jpg b/addons/point_of_sale/html/pos_sc_03.jpg
new file mode 100644
index 00000000000..8eb7e312791
Binary files /dev/null and b/addons/point_of_sale/html/pos_sc_03.jpg differ
diff --git a/addons/point_of_sale/html/pos_ui_01.png b/addons/point_of_sale/html/pos_ui_01.png
new file mode 100644
index 00000000000..1725f91d6f2
Binary files /dev/null and b/addons/point_of_sale/html/pos_ui_01.png differ
diff --git a/addons/point_of_sale/html/pos_ui_02.png b/addons/point_of_sale/html/pos_ui_02.png
new file mode 100644
index 00000000000..aa0eb51c0f1
Binary files /dev/null and b/addons/point_of_sale/html/pos_ui_02.png differ
diff --git a/addons/point_of_sale/html/pos_ui_03.png b/addons/point_of_sale/html/pos_ui_03.png
new file mode 100644
index 00000000000..f25f2a49c00
Binary files /dev/null and b/addons/point_of_sale/html/pos_ui_03.png differ
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index eac24526afc..4d4efabdec3 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-10-17 00:01+0000\n"
-"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"PO-Revision-Date: 2013-04-18 18:07+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:07+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-19 05:24+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr "Produto No."
+msgstr "Núm. Produto"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
@@ -286,7 +286,7 @@ msgstr "Desconto (%)"
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Total discount"
-msgstr "Total de Desconto"
+msgstr "Desconto total"
 
 #. module: point_of_sale
 #. openerp-web
@@ -354,6 +354,9 @@ msgid ""
 "Check this if this point of sale should open by default in a self checkout "
 "mode. If unchecked, OpenERP uses the normal cashier mode by default."
 msgstr ""
+"Marque esta opção se este ponto de venda deve ser aberto por padrão em modo "
+"de auto atendimento. Se não marcada, o OpenERP irá usar o modo normal por "
+"padrão."
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -444,7 +447,7 @@ msgstr "Você precisa associar um Ponto de Vendas a sua sessão."
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr "Total de Qtd"
+msgstr "Qtd Total"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
@@ -460,6 +463,10 @@ msgid ""
 "close this session, you can update the 'Closing Cash Control' to avoid any "
 "difference."
 msgstr ""
+"Por favor, defina suas contas de lucros e perdas no seu método de pagamento "
+"'%s'. Isso permitirá o OpenERP colocar a diferença de %.2f em seu saldo "
+"final. Para fechar a sessão, você pode atualizar o 'Fechando Controle de "
+"Caixa'para evitar qualquer diferença."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:315
@@ -777,7 +784,7 @@ msgstr "Imprimir Relatório"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_bolognese_product_template
 msgid "Dr. Oetker Ristorante Bolognese"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Bolognese"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pizza
@@ -787,7 +794,7 @@ msgstr "Pizza"
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "= Theoretical Balance"
-msgstr ""
+msgstr "= Balanço Teórico"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
@@ -974,7 +981,7 @@ msgstr "Lista de Caixas Registradoras"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_50cl_product_template
 msgid "Maes 50cl"
-msgstr ""
+msgstr "Maes 50cl"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1030,7 +1037,7 @@ msgstr "Spa Reine 33cl"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add a Global Discount"
-msgstr "Adicionar Desconto Global"
+msgstr "Adicionar um Desconto Global"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -1040,7 +1047,7 @@ msgstr "Diários"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
 msgid "Dr. Oetker Ristorante Prosciutto"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Prosciutto"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
@@ -1126,7 +1133,7 @@ msgstr "Re-impressão"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
 msgid "Chimay Bleu 75cl"
-msgstr ""
+msgstr "Chimay Bleu 75cl"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
@@ -1156,7 +1163,7 @@ msgstr "No. de Linhas"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:89
 #, python-format
 msgid "Disc"
-msgstr "Disco"
+msgstr "Desc."
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1166,7 +1173,7 @@ msgstr "(atualizar)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
 msgid "IJsboerke Vanilla 2.5L"
-msgstr ""
+msgstr "IJsboerke Vanilla 2.5L"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@@ -1177,7 +1184,7 @@ msgstr "Detalhes da Venda"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
 msgid "2L Evian"
-msgstr ""
+msgstr "2L Evian"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:373
@@ -1185,7 +1192,7 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
 #, python-format
 msgid "Start Point Of Sale"
-msgstr ""
+msgstr "Iniciar Ponto de Venda"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pils
@@ -1195,7 +1202,7 @@ msgstr ""
 #. module: point_of_sale
 #: help:pos.session,cash_register_balance_end_real:0
 msgid "Computed using the cash control lines"
-msgstr ""
+msgstr "Calculado usando as linhas de controle de caixa"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1217,7 +1224,7 @@ msgstr "ABC"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
 msgid "IJsboerke 2.5L White Lady"
-msgstr ""
+msgstr "IJsboerke 2.5L White Lady"
 
 #. module: point_of_sale
 #: field:pos.order,lines:0
@@ -1239,7 +1246,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:485
 #, python-format
 msgid "Read Weighting Scale"
-msgstr ""
+msgstr "Lendo a Balança"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1302,7 +1309,7 @@ msgstr "Marcar como Obsoleto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.limon_product_template
 msgid "Stringers"
-msgstr ""
+msgstr "Limões"
 
 #. module: point_of_sale
 #: field:pos.order,pricelist_id:0
@@ -1369,19 +1376,19 @@ msgstr "Stella Artois 33cl"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
 msgid "Lays Natural XXL 300g"
-msgstr ""
+msgstr "Lays Natural XXL 300g"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:479
 #, python-format
 msgid "Scan Item Unrecognized"
-msgstr ""
+msgstr "item Escaneado não Reconhecido"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr "Fechamento de Caixa do dia"
+msgstr "Fechamento de Caixa do Dia"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:897
@@ -1397,7 +1404,7 @@ msgstr "Fatura Provisória"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
 msgid "Oven Baked Lays Paprika 150g"
-msgstr ""
+msgstr "Oven Baked Lays Paprika 150g"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1449,7 +1456,7 @@ msgstr "Coca-Cola Light 2L"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_funghi_product_template
 msgid "Dr. Oetker Ristorante Funghi"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Funghi"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
@@ -1477,7 +1484,7 @@ msgstr "Ean Inválido"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
 msgid "Lindemans Kriek 37.5cl"
-msgstr ""
+msgstr "Lindemans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -1494,7 +1501,7 @@ msgstr "Coca-Cola Zero 33cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:405
 #, python-format
 msgid "&auml;"
-msgstr ""
+msgstr "&auml;"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1523,7 +1530,7 @@ msgstr "Desconhecido"
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Point of Sale Cash In"
-msgstr ""
+msgstr "Colocar dinheiro no Ponto de Venda"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1608,7 +1615,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
 msgid "Boon Framboise 37.5cl"
-msgstr ""
+msgstr "Boon Framboise 37.5cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config
@@ -1627,7 +1634,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Point of Sale Cash Out"
-msgstr ""
+msgstr "Sacar do Ponto de Venda"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -1639,7 +1646,7 @@ msgstr "Novembro"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:267
 #, python-format
 msgid "Please scan an item or your member card"
-msgstr ""
+msgstr "Por favor escaneie um item ou seu cartão de associado"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_verts_product_template
@@ -1649,7 +1656,7 @@ msgstr "Pimentões Verdes"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
 msgid "Timmermans Faro 37.5cl"
-msgstr ""
+msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:410
@@ -1662,7 +1669,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Validate Closing & Post Entries"
-msgstr ""
+msgstr "Validar Encerramento e Lançar Entradas"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -1705,7 +1712,7 @@ msgstr "Cancelar"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:296
 #, python-format
 msgid "Please put your product on the scale"
-msgstr ""
+msgstr "Por favor, coloque seu produto na balança"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -1715,12 +1722,12 @@ msgstr "Vendas(Resumo)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.nectarine_product_template
 msgid "Peach"
-msgstr ""
+msgstr "Pêssego"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
 msgid "Timmermans Kriek 37.5cl"
-msgstr ""
+msgstr "Timmermans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: field:pos.config,sequence_id:0
@@ -1753,7 +1760,7 @@ msgstr "fechar"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.report_user_label
 msgid "User Labels"
-msgstr ""
+msgstr "Etiquetas do Usuário"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
@@ -1897,6 +1904,9 @@ msgid ""
 "complete\n"
 "            your purchase"
 msgstr ""
+"Por favor, insira seu cartão no leitor e aguarde as instruções para "
+"completar\n"
+"            sua compra"
 
 #. module: point_of_sale
 #: help:product.product,income_pdt:0
@@ -1935,6 +1945,8 @@ msgid ""
 "Unable to open the session. You have to assign a sale journal to your point "
 "of sale."
 msgstr ""
+"Não é possível abrir a sessão. Você tem que atribuir um diário de venda para "
+"o seu ponto de venda."
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1988,7 +2000,7 @@ msgstr "Estabelecimento:"
 #. module: point_of_sale
 #: field:account.journal,self_checkout_payment_method:0
 msgid "Self Checkout Payment Method"
-msgstr ""
+msgstr "Forma de Pagamento do Auto Atendimento"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2124,7 +2136,7 @@ msgstr "Produtos"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
 msgid "Dr. Oetker Ristorante Quattro Formaggi"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Quattro Formaggi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
@@ -2654,7 +2666,7 @@ msgstr "Fatura"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:701
 #, python-format
 msgid "shift"
-msgstr ""
+msgstr "shift"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
@@ -2786,7 +2798,7 @@ msgstr "Produto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_pollo_product_template
 msgid "Dr. Oetker Ristorante Pollo"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Pollo"
 
 #. module: point_of_sale
 #: constraint:pos.session:0
@@ -2836,7 +2848,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_margherita_product_template
 msgid "Dr. Oetker La Margherita"
-msgstr ""
+msgstr "Dr. Oetker La Margherita"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2936,7 +2948,7 @@ msgstr "Gerente"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
 msgid "Lays Salt and Pepper Oven Baked 150g"
-msgstr ""
+msgstr "Lays Salt and Pepper Oven Baked 150g"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0
@@ -2993,7 +3005,7 @@ msgstr "Procurar Pedido de Venda"
 #. module: point_of_sale
 #: field:pos.config,iface_self_checkout:0
 msgid "Self Checkout Mode"
-msgstr ""
+msgstr "Modo de Auto Atendimento"
 
 #. module: point_of_sale
 #: field:account.journal,journal_user:0
@@ -3027,7 +3039,7 @@ msgstr "Relatório de Pagamento"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
 msgid "Fanta Orange 25cl"
-msgstr ""
+msgstr "Fanta Laranja 25cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -3063,7 +3075,7 @@ msgstr "Motivo"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_33cl_product_template
 msgid "Orangina 33cl"
-msgstr ""
+msgstr "Orangina 33cl"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -3073,7 +3085,7 @@ msgstr "Definir como Inativo"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
 msgid "Chimay Bleu 33cl"
-msgstr ""
+msgstr "Chimay Bleu 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
@@ -3089,7 +3101,7 @@ msgstr "Fritas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_spinaci_product_template
 msgid "Dr. Oetker Ristorante Spinaci"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Spinaci"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3121,7 +3133,7 @@ msgstr "Colocar dinheiro em"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
 msgid "Fanta Orange Zero 1.5L"
-msgstr ""
+msgstr "Fanta Laranja Zero 1.5L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.boni_orange_product_template
@@ -3234,7 +3246,7 @@ msgstr "Relatório do PDV"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
 msgid "Chaudfontaine 1.5l"
-msgstr ""
+msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1069
@@ -3304,7 +3316,7 @@ msgstr "Coca-Cola Zero 50cl"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_tonno_product_template
 msgid "Dr. Oetker Ristorante Tonno"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Tonno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3346,7 +3358,7 @@ msgstr "cash.box.out"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
 msgid "Fanta Zero Orange 33cl"
-msgstr ""
+msgstr "Fanta Laranja Zero 33cl"
 
 #. module: point_of_sale
 #: help:product.product,available_in_pos:0
@@ -3361,7 +3373,7 @@ msgstr "Dia da data do pedido"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_33cl_product_template
 msgid "Maes 33cl"
-msgstr ""
+msgstr "Maes 33cl"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3378,7 +3390,7 @@ msgstr "Configuração"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orval_33cl_product_template
 msgid "Orval 33cl"
-msgstr ""
+msgstr "Orval 33cl"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3411,7 +3423,7 @@ msgstr "Frutas Frescas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_pecheresse_37,,5cl_product_template
 msgid "Lindemans sinful 37.5cl"
-msgstr ""
+msgstr "Lindemans sinful 37.5cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
@@ -3431,7 +3443,7 @@ msgstr "Imagem"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
 msgid "Spa Barisart 1.5l"
-msgstr ""
+msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:789
@@ -3443,7 +3455,7 @@ msgstr "Retornar Produtos"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_33cl_product_template
 msgid "Jupiler 33cl"
-msgstr ""
+msgstr "Jupiler 33cl"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3551,7 +3563,7 @@ msgstr "Balança Eletrônica"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
 msgid "Spa Barisart 50cl"
-msgstr ""
+msgstr "Spa Barisart 50cl"
 
 #. module: point_of_sale
 #: field:res.users,pos_config:0
@@ -3595,7 +3607,7 @@ msgstr "Pago"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:464
 #, python-format
 msgid "3.141Kg Oranges"
-msgstr ""
+msgstr "3.141Kg de Laranjas"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3611,7 +3623,7 @@ msgstr "Por favor informe um parceiro para a venda"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.fruity_beers
 msgid "Fruity Beers"
-msgstr ""
+msgstr "Cerveja de Frutas"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -3623,7 +3635,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:463
 #, python-format
 msgid "Soda 33cl"
-msgstr ""
+msgstr "Soda 33cl"
 
 #. module: point_of_sale
 #: help:pos.session,cash_register_balance_start:0
@@ -3644,7 +3656,7 @@ msgstr "Vendas do Usuário"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_hawaii_product_template
 msgid "Dr. Oetker Ristorante Hawaii"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Hawaii"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3678,12 +3690,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
 msgid "Chaudfontaine Petillante 33cl"
-msgstr ""
+msgstr "Chaudfontaine Petillante 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
 msgid "Pepsi Max 2L"
-msgstr ""
+msgstr "Pepsi Max 2L"
 
 #. module: point_of_sale
 #: field:pos.session,details_ids:0
@@ -3693,17 +3705,17 @@ msgstr "Controle de Caixa"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_vegetale_product_template
 msgid "Dr. Oetker Ristorante Vegetable"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Vegetable"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda
 msgid "Soda"
-msgstr ""
+msgstr "Soda"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
 msgid "Lays Paprika XXL 300g"
-msgstr ""
+msgstr "Lays Paprika XXL 300g"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3715,7 +3727,7 @@ msgstr "Reembolso"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:417
 #, python-format
 msgid "Your shopping cart is empty"
-msgstr ""
+msgstr "Seu Carrinho de Compras está vazio"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -3726,7 +3738,7 @@ msgstr "Por favor crie uma fatura para esta venda."
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
 msgid "Dr. Oetker Ristorante Mozzarella"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Mozzarella"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -3737,7 +3749,7 @@ msgstr "Desc(%)"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "The session"
-msgstr ""
+msgstr "A sessão"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -3762,7 +3774,7 @@ msgstr "Ordem de Linhas"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "PoS Session Opening"
-msgstr ""
+msgstr "Abrindo Sessão do PDV"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
@@ -3780,7 +3792,7 @@ msgstr "excluir"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_50cl_product_template
 msgid "Spa Reine 50cl"
-msgstr ""
+msgstr "Spa Reine 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chicon_flandria_extra_product_template
@@ -3791,22 +3803,22 @@ msgstr ""
 #: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
 #: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
 msgid "Lays Natural Light 170g"
-msgstr ""
+msgstr "Lays Natural Light 170g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
 msgid "Leffe Blonde 33cl"
-msgstr ""
+msgstr "Leffe Blonde 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "Relatório de Pagamento"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "Diários de  Dinheiro"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -3816,12 +3828,12 @@ msgstr "Sessão:"
 #. module: point_of_sale
 #: field:pos.config,iface_print_via_proxy:0
 msgid "Print via Proxy"
-msgstr ""
+msgstr "Imprimir via Proxy"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Vendas de hoje por Usuário"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3858,7 +3870,7 @@ msgstr "Anotações Internas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
 msgid "IJsboerke Chocolat 2.5L"
-msgstr ""
+msgstr "IJsboerke Chocolat 2.5L"
 
 #. module: point_of_sale
 #: help:pos.category,image_small:0
@@ -3871,7 +3883,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.session.opening,pos_state:0
 msgid "Session Status"
-msgstr ""
+msgstr "Status da Sessão"
 
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
@@ -3915,7 +3927,7 @@ msgstr "Editar"
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Click to continue the session."
-msgstr ""
+msgstr "Clique para continuar a sessão."
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -3930,7 +3942,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Start Selling"
-msgstr ""
+msgstr "Começar a Vender"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -3963,7 +3975,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
 msgid "Leffe Brune \"9\" 33cl"
-msgstr ""
+msgstr "Leffe Brune \"9\" 33cl"
 
 #. module: point_of_sale
 #: help:account.journal,journal_user:0
@@ -4011,7 +4023,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:351
 #, python-format
 msgid "Sorry, we could not create a session for this user."
-msgstr ""
+msgstr "Desculpe, não podemos criar uma sessão para esse usuário."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:98
@@ -4019,7 +4031,7 @@ msgstr ""
 #: selection:pos.session.opening,pos_state:0
 #, python-format
 msgid "Opening Control"
-msgstr ""
+msgstr "Abrindo Controle"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index e4d914ae56e..23dc97f2376 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2013-04-24 06:41+0000\n"
+"Last-Translator: viney <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:07+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.plain_water
 msgid "Plain Water"
-msgstr "白开水"
+msgstr "纯净水"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poire_conference_product_template
@@ -2269,7 +2269,7 @@ msgstr "7月"
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_config_pos
 #: view:pos.session:0
 msgid "Point of Sales"
-msgstr ""
+msgstr "零售"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2303,7 +2303,7 @@ msgstr "打印数"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr "POS付款"
+msgstr "付款"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_50cl_product_template
@@ -2407,7 +2407,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_receipt
 msgid "Point of sale receipt"
-msgstr "POS收银条"
+msgstr "收银条"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 7e8487b2b2b..089c577e940 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -50,7 +50,7 @@ class pos_config(osv.osv):
              required=True, help="An internal identification of the point of sale"),
         'journal_ids' : fields.many2many('account.journal', 'pos_config_journal_rel', 
              'pos_config_id', 'journal_id', 'Available Payment Methods',
-             domain="[('journal_user', '=', True )]",),
+             domain="[('journal_user', '=', True ), ('type', 'in', ['bank', 'cash'])]",),
         'shop_id' : fields.many2one('sale.shop', 'Shop',
              required=True),
         'journal_id' : fields.many2one('account.journal', 'Sale Journal',
@@ -407,7 +407,10 @@ class pos_session(osv.osv):
                     # The pos manager can close statements with maximums.
                     if not self.pool.get('ir.model.access').check_groups(cr, uid, "point_of_sale.group_pos_manager"):
                         raise osv.except_osv( _('Error!'),
-                            _("Your ending balance is too different from the theorical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
+                            _("Your ending balance is too different from the theoretical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
+                if (st.journal_id.type not in ['bank', 'cash']):
+                    raise osv.except_osv(_('Error!'), 
+                        _("The type of the journal for your payment method should be bank or cash "))
                 if st.difference and st.journal_id.cash_control == True:
                     if st.difference > 0.0:
                         name= _('Point of Sale Profit')
@@ -428,7 +431,6 @@ class pos_session(osv.osv):
 
                 if st.journal_id.type == 'bank':
                     st.write({'balance_end_real' : st.balance_end})
-
                 getattr(st, 'button_confirm_%s' % st.journal_id.type)(context=context)
         self._confirm_orders(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state' : 'closed'}, context=context)
@@ -522,10 +524,28 @@ class pos_order(osv.osv):
             self.signal_paid(cr, uid, [order_id])
         return order_ids
 
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(pos_order, self).write(cr, uid, ids, vals, context=context)
+        #If you change the partner of the PoS order, change also the partner of the associated bank statement lines
+        partner_obj = self.pool.get('res.partner')
+        bsl_obj = self.pool.get("account.bank.statement.line")
+        if 'partner_id' in vals:
+            for posorder in self.browse(cr, uid, ids, context=context):
+                if posorder.invoice_id:
+                    raise osv.except_osv( _('Error!'), _("You cannot change the partner of a POS order for which an invoice has already been issued."))
+                if vals['partner_id']:
+                    p_id = partner_obj.browse(cr, uid, vals['partner_id'], context=context)
+                    part_id = partner_obj._find_accounting_partner(p_id).id
+                else:
+                    part_id = False
+                bsl_ids = [x.id for x in posorder.statement_ids]
+                bsl_obj.write(cr, uid, bsl_ids, {'partner_id': part_id}, context=context)
+        return res
+
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state not in ('draft','cancel'):
-                raise osv.except_osv(_('Unable to Delete !'), _('In order to delete a sale, it must be new or cancelled.'))
+                raise osv.except_osv(_('Unable to Delete!'), _('In order to delete a sale, it must be new or cancelled.'))
         return super(pos_order, self).unlink(cr, uid, ids, context=context)
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
@@ -886,6 +906,7 @@ class pos_order(osv.osv):
         account_tax_obj = self.pool.get('account.tax')
         user_proxy = self.pool.get('res.users')
         property_obj = self.pool.get('ir.property')
+        cur_obj = self.pool.get('res.currency')
 
         period = account_period_obj.find(cr, uid, context=context)[0]
 
@@ -948,9 +969,9 @@ class pos_order(osv.osv):
                 })
 
                 if data_type == 'product':
-                    key = ('product', values['product_id'],)
+                    key = ('product', values['partner_id'], values['product_id'])
                 elif data_type == 'tax':
-                    key = ('tax', values['tax_code_id'],)
+                    key = ('tax', values['partner_id'], values['tax_code_id'],)
                 elif data_type == 'counter_part':
                     key = ('counter_part', values['partner_id'], values['account_id'])
                 else:
@@ -981,17 +1002,19 @@ class pos_order(osv.osv):
             #TOFIX: a deep refactoring of this method (and class!) is needed in order to get rid of this stupid hack
             assert order.lines, _('The POS order must have lines when calling this method')
             # Create an move for each order line
+
+            cur = order.pricelist_id.currency_id
             for line in order.lines:
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
                 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)['taxes']
 
                 for tax in computed_taxes:
-                    tax_amount += round(tax['amount'], 2)
+                    tax_amount += cur_obj.round(cr, uid, cur, tax['amount'])
                     group_key = (tax['tax_code_id'], tax['base_code_id'], tax['account_collected_id'], tax['id'])
 
                     group_tax.setdefault(group_key, 0)
-                    group_tax[group_key] += round(tax['amount'], 2)
+                    group_tax[group_key] += cur_obj.round(cr, uid, cur, tax['amount'])
 
                 amount = line.price_subtotal
 
@@ -1026,7 +1049,7 @@ class pos_order(osv.osv):
                     'debit': ((amount<0) and -amount) or 0.0,
                     'tax_code_id': tax_code_id,
                     'tax_amount': tax_amount,
-                    'partner_id': order.partner_id and order.partner_id.id or False
+                    'partner_id': order.partner_id and self.pool.get("res.partner")._find_accounting_partner(order.partner_id).id or False
                 })
 
                 # For each remaining tax with a code, whe create a move line
@@ -1044,6 +1067,7 @@ class pos_order(osv.osv):
                         'debit': 0.0,
                         'tax_code_id': tax_code_id,
                         'tax_amount': tax_amount,
+                        'partner_id': order.partner_id and self.pool.get("res.partner")._find_accounting_partner(order.partner_id).id or False
                     })
 
             # Create a move for each tax group
@@ -1060,6 +1084,7 @@ class pos_order(osv.osv):
                     'debit': ((tax_amount<0) and -tax_amount) or 0.0,
                     'tax_code_id': key[tax_code_pos],
                     'tax_amount': tax_amount,
+                    'partner_id': order.partner_id and self.pool.get("res.partner")._find_accounting_partner(order.partner_id).id or False
                 })
 
             # counterpart
@@ -1068,14 +1093,17 @@ class pos_order(osv.osv):
                 'account_id': order_account,
                 'credit': ((order.amount_total < 0) and -order.amount_total) or 0.0,
                 'debit': ((order.amount_total > 0) and order.amount_total) or 0.0,
-                'partner_id': order.partner_id and order.partner_id.id or False
+                'partner_id': order.partner_id and self.pool.get("res.partner")._find_accounting_partner(order.partner_id).id or False
             })
 
             order.write({'state':'done', 'account_move': move_id})
 
+        all_lines = []
         for group_key, group_data in grouped_data.iteritems():
             for value in group_data:
-                account_move_line_obj.create(cr, uid, value, context=context)
+                all_lines.append((0, 0, value),)
+        if move_id: #In case no order was changed
+            self.pool.get("account.move").write(cr, uid, [move_id], {'line_id':all_lines}, context=context)
 
         return True
 
@@ -1103,7 +1131,6 @@ class account_bank_statement(osv.osv):
     _defaults = {
         'user_id': lambda self,cr,uid,c={}: uid
     }
-account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
@@ -1111,7 +1138,6 @@ class account_bank_statement_line(osv.osv):
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
 
-account_bank_statement_line()
 
 class pos_order_line(osv.osv):
     _name = "pos.order.line"
@@ -1137,7 +1163,7 @@ class pos_order_line(osv.osv):
        if not product_id:
             return {}
        if not pricelist:
-           raise osv.except_osv(_('No Pricelist !'),
+           raise osv.except_osv(_('No Pricelist!'),
                _('You have to select a pricelist in the sale form !\n' \
                'Please set one before choosing a product.'))
 
@@ -1279,7 +1305,7 @@ class ean_wizard(osv.osv_memory):
             ean13 = openerp.addons.product.product.sanitize_ean13(r.ean13_pattern)
             m = context.get('active_model')
             m_id =  context.get('active_id')
-            self.pool.get(m).write(cr,uid,[m_id],{'ean13':ean13})
+            self.pool[m].write(cr,uid,[m_id],{'ean13':ean13})
         return { 'type' : 'ir.actions.act_window_close' }
 
 class product_product(osv.osv):
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 011c6d81bfc..1c61218a4cb 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -430,6 +430,7 @@
           <field name="available_in_pos">True</field>
           <field name="list_price">1.49</field>
           <field name="name">Coca-Cola Regular 1L</field>
+          <field name="ean13">5449000054227</field>
           <field name="pos_categ_id" ref="coke"/>
           <field name="image">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAIgMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHHfEPXNS0W3sjp0zRGUvvKqD0246g+tc+InKNrHqZVhaVdy5+ljlPCfjPxBf65aW1xevLFJOqOCi8gn6cVnGrPnSPRxuW4elRlJLWx65XWfNENusizXJcMFaUFMngjYo4+Y8ZB7L34/iKW7NKjTjG3b9X5L9fXopqozMPX9Kt9YvtPtp9+AZHbbj7oA9fcrUyipbmtGvOldxdjPPhPS9G1PT7q2EiKbkK3Ixkqdp4H97ApKnFO9jWpja1SNpSOsqzlCgAoArwx77mS6JyGUJH7KOSfxP8hSAW9thd2rRZ2tkMjf3WByp/AgUASROZIwxG1v4l9D3FAD6YHLeN/FqeHFsLSMj7VqMxRSULhEAyzFQRnqB17+1IaKUnjCyaBmHiSOHaMk+SqY/wC+gaGmBHY+NLCWUr/wlUE5AztAjb/0FaSuN2J7PxvAfFNnpj3Kzw3yskcyxFMSDkAknnIyBxT2EdnTEeQ/EzzW8eRSNG7Rw6avl4GQCXbd+PSlzJM1jRqShzJNo4TVZlawmRchihzuBH86pmRz+hXH2bUN57rjHryKSA7RLl7i805rdJfNivoJI2CHghx/TNKTRpCnOeyufQtMzPMvH8ck3jWyjQqubQl2Y4CqNxJPsAP0rlrrmkkfSZI4xw1RvuvvOQ1jRb2S58mGzmmQkKD5RBZiM4xzyKy5ZR0R69OthpQvNxKFt4fZIvtV1ss4wCy7kyzD1A9O2TjJ49cP3t2yFKgp8sIJv5HQabZJb+INMiNys7M+4IsZXCkcE5789O1OEUpIxxc+fC1Go2S8/P8AI9rrtPjThvFMFtc+Kmha4SC+axQ2pkfarne+VyQQD909OcVhUScj2MvlOFHmSvHm1t6b/mcnfalqOk2k8F9ptxb3e3y0meMMm3LHgjA6uemRwOOKxcnFao9inh6NealCacd7Xs+nr28iD/hINMnu/Mj0ySaNGjWNTCPljHDLwTzjAB7jPAycnPG+wLA1oxs5pb9evQ07RpNV8R6fcxyQxrEwHkyTqZXy3zPtHT6HFVH3pI5sRy0MJOLTd+ttF2V2epW/2jz7rzs+X5o8jgfc2Lnp/tbuvP4YrojzXd++n3L9bnztTk5Ycu9tfW7/AEtt+Z458X9Xaw8ZRwTQxvFLYIUZs5U73yQR9KmpT5zuy7M3hNLO1+hx8fim5ih2pqF1GmMbUnOPyBrH2NRdT2f7Wy+erhr5pFV9eS4bDzyyn/bJP86n2M2aRznBw2/I2YPFLat4u0JIIFidbi3t9qvnOJBzxxznpWypu6b6Hj1MypqjOnFN8zbu/P7z6Lrc8c8S/aBtNuoaLegf6yKWIn/dKkf+hGkB5ZkGIY9KBobH1pgdJ8NLM6h8SdJTGRHMZT7bFLD9QKQj6epgeQftAzxCy0W3JBmMkrj2UBQf1I/KkB44n+pH0oGgi5NAHafBiWKL4jQLKQGkglVM/wB7Gf5A0CPo6mB4P8ab42/jy286FZol09Aqt2y75IpDOEuZ7CaycwwBJCOMKP6UwKWnNCs5NwhdMdMZ7ikgOi8J3UMnjrQ/sNsIdt/EC4PJBYAj8iaGB9PUxHkXx50Ca4srDXYI2cWxaCcgZ2q3Kk+2cj8RSYHj39najb6d/aD2c62bSeWJmjIRm54DdCeDQncbTTG2lle6iJhY2k0/kx+ZL5SFiq5AycdByKLgdr8H9BuNS8ZwXJhb7PYjzpHK8A4+UZ9SSD9AaSdxuLW59F1RIjKrqVdQykYIIyDQBR1nRNP13SJdL1C3EtrKACg4xjkEEdCKTApeGPBuieEYpk0i2MZuGBkd3LscdBk9vb3oSA2Y4YoQwijSPcdzbVAyfU0wH0AA/9k=</field>
         </record>
@@ -716,6 +717,7 @@
         <record id="chaudfontaine_50cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.44</field>
+          <field name="ean13">5449000111715</field>
           <field name="name">Chaudfontaine 50cl</field>
           <field name="pos_categ_id" ref="plain_water"/>
           <field name="image">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAJAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYHnfj34gaj4a1xdPtYU8vyVkLkckkn1+ld2EwsKsbswq1XF2Oa/4XBqwmUxwqVHVWAwf6/rXQ8DTSIVeVz2KxuGurC3uGXa0sSuR6EjNeVJWbR0rYnpDCgDjvFfhCw8Qaul1PJIJEiEeF6dSR05712Yau6cLW6nLXg5S0ZjS/DLS127pJl7jk5/Umt/rjfQy9jJPc9Ht0WK3jjQ5VVAB9gK8x7neh9AEVxN5SD1PApxVxN2M6Kzja5EsjMxJyd2TWzm7GSpJu5NfWkE6qehHGRkVMJtDnTUh1o/kAQlmYE8Fj0pT11Kh7uheFZllG/fFzChHBBOffitILRkyeqEQ9xxTAVizD5jxRawEEj7GTC7jvUYzzyadrkt2NWsTQp34O6I4yMkGrh1JkInTjiqBDj065pAQMf38YC/xin0F1NIVkWUdVuBbQxOy5UyYJ/u8HmtKUeZsipLlRQj1WFpBGJV3HoCwAP0zWrpSS2M1VVy5HOZc8AAdwwNQ1YtSuRifddQBFMgdyCw6LgHn9KbjowUtUaorA0KGsqr2O1hkFhWtF+8Z1fhOM8Q38+lWEUtoUWR5QnIz8pB/wr08LSjVk1LscdRuK0LHhi9uzqd7b3dzHMsUalWRcA5J/wAKjFwhyRcVbU0otxk02dJFJvvIdvIyc4PHSuGStFnRF3ZrVgaFLVl3WWP9qtKPxGdX4Th/Elk11p8fzJEsEnms7HBAAPAHfqK9TCVFGb63VjkqQukL4fkeTxDqIJP3IhyMdvTJ/nRiElRh8xxbdRnWWg/02PA9ea86psdNPc2KwNSrqS7rNuM4NXS+Iip8JwvimSKKxhMi7gJRhcZ5wSMj0yK9XBpuTt2OOrbQk8NKy+JNRXbjbHFngZ6Z55NTiv4EPVl0v4jOsgx9uiA9D0rz5fCzoW5qViaFe9lSKEbj944qoK7Jk0jkvFGmTahZW4trbzylwruowCVwc9cZ/OvQwdZU5O7toc1aDklZdSPwxp99aahfXN5bvH5qxhS5zkgHOOTxVYurCUIqL2uFGMlJto6W3KLex5IBOQAK4ZX5WbppM1KxNDP1faYUDlQuTkscCtKZnUa6meiyKoUF9o7A5qxaj2LqNyll/wA+9AbDLfbFfRscb5HHfJNNq8WSnaR0Fc5uVdRhaa3wq7sHp61dN2ZM1dGBftLDAipByuemRg4rqppNnJVbtYjmYyuskI81VOMEkD8hjNacqWj0MeZ3utTWsIJXlVzEyqDksx61y1Gl1Oyld62NesDcOtAAQD1FAAFA6AUBYKACgAD/2Q==</field>
@@ -830,6 +832,7 @@
         <record id="jupiler_33cl" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">0.77</field>
+          <field name="ean13">5410228142027</field>
           <field name="name">Jupiler 33cl</field>
           <field name="pos_categ_id" ref="pils"/>
           <field name="image">/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAPQMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGdqet2+myJE6tJK4yFXgAepNACJqrPD5reTEvbc+aVwKU2vyR7mDx7FOCxUj+dMC3Z61bzxF5LuFAOu4hcfnQBZmv444fNSSKVc4+Vuv40gH2l7Hdq20FXX7yt1FMCduq/X+hrCs7Tp6/a/9tf9df1TXUWtxHlnjvxjFDrotYbWG6jiUBw5Iyc+oNc1XEckrI9vA5OsRS5pNrsT6ZrM2q2izw6LdqgGP9HuQR+RIq41m1sYYjK1Slb2i+af/BM+58UwaTcukkWqW7scssipyfzxSdeK3TFDJ681eLi/n/wCH/hOLa/22wtbmY9gIkGfxzmhYiL2uOWT14q7cV/XoQax4pvbWJ3fT3O8/wDLWXp+A/xode3QKWVqb1kbPwv8YG/1G6sL3y0lmw0RGecdsk06VXm3IxuCVGKcT05vvJ9f6GprtKdP/F/7bLz/AM/TqvPWzKmsySQ6PdyRNtdYjg1tLYuik6kU+58838N4buSW5Us7sSWHIry5KV9T7yg6fIlE9M8JXsen+H4kKHcFy2EJH5gV2UmlE+fzCnKdZtHCeM9QF/rDPECwAxjpzWNWze56GB56VKzgzM0afyNRjlcbcHpmpgkpbmuIc50n7up0Wul9TtnjghZnK/KAh6/lW7SaPLp88HrZfMx9K8O+ILO4g1EW0losci/vJPl6kDp170owknew8RiqDg4tpu3Q+homZoYWJySASfXitat+aFv5v/bX56/j3t1Xz3cr60M6Ld/9cjWstmXQ/iR9TxS6P71vrXDI+upbGTqSkBJF4PQkVnJaHXRe6MwmoNGy3owDa7YqwyDcICD3+YVrRXvo4ce2qEj2Hw8Uj8L6YzFUBtYuTxztFejT+Beh8ljP48/8T/Mi190bTmQMCyzRbh6fOKU/hIpb/I7WH/UQf7o/lWVX46f+L/21+f8An6dVK6kGsDOkXQ/6ZGtpbF0vjXqeXaZ4f1K71CC7TTftNoJfnDFQrKDg9T9a5I05N3sfQVcZShTceazsdhqWhaBoqTakdKNwXQQpaxoH3seyqe5/kK6lSgnseJLHYiUbOTOZ8PQ21zo+owaX4PvLO8jjkMU2pxKMyH7qhm5wM+nQeppRpQjsgqY7EVLc02YGl/D3xDY6nZzSwR+XDKjM3nKTgEZNYRoz57nq1cwoPDezTbdkburo1z8MrAQW0106Jb/u4SQxKldwyBkdDz2rpirRR4uIkp1pNbNsWHUtW1Pw9LcarZRWZNxH5KRybyU3DknJ759OlKfwip7v0PUIR+4i/wB0fyqZptxt3/R+a/X06qSDVf8AkFXX/XI/yq5bFU/jXqeY6tPdJHYQQ3j2sCWrSyuHKqo8x8scdew9+BXM1JtJHuUp0qcJzmk9f0RVXSfEGsWC3OnWV89rIuY557tAz88OEJ4/M8d619k0tGcX1+M5WcUtdLLb17nHajNr2l3T292buKVeShmYE/nXLKLT1bR7sainDmjTjJeVv1sbPgDWLyfxbaRS3VwyP5iPHJITg7CeQT64rSkpRqJNnBjJUK+EnKEbNNdLNanRatb3E3w/ms4LaW4KX8kbwxEgui3DZGe3A611vY+e6lLw1Hcx+D5Eu3jEsd1FGIo5Ffy1XbgEgnBPJx71MvhNIbv0PYoT+4i91H8qUpNOPm/0ZJDqn/ILuf8Ark38qp7Dh8SPJ/EsTXel2VvE+17tUtwScLxLITk+nCn8Kzprr5HbjJWjy/3r/gjF/wCElN5pVroOq2Yc2JKQXK3PkFAOMHPB6Y5x0FanCVNZ8aXceiadp+o6ba3v+jbkmuA/nINzAHII4KhSCRzU1KfMjpweKeHldX+T/wCAxvw/lF740tLhE27mAK5zjbERn8cGs7WlFHWqiqUa89rtafM3NY0qLUXurlrPUrsxySukMEmyJs3Eg5O089z7YrZnlFvQ7c23hSbdY21mjXiYjgm80nkZ3NuPze3H0qJfCaQ+J+h69EMwxc9FB/SpnTcpRd9nf8GvluRfcS72/ZJdy7l2HK+taivY8f8AEjJNbQadE2xlvrhY+efu/uxn/eJH41nT6rzO3Gp+4+8UcncPZalCj30/2K8OS8phJSYdmOOQ3XoMHj3NaI4zIuYF1rWb+5UMIHaTyAeMsQxjTH0XAHtincVjp/hParFqF5qk3ENjAzsfQ4I/kT+VRb3jojLloyXdr/M63V4vtPw8s4xazXLS+TI0UOdzksGb6ZyeardGEo8smjI0611Kz0+7VtOj0/TmuIylv5xkkWT5Ov1HPOOtRPYunu/Q9oh/1Ef+6P5VZmNu/wDj0lz/AHDQB5JNHZ3Pis219lYnaZRMT/qpXOFb8MD8zWF46q+7PWUKzcJqN1GK+fcxNa0ud/EHkajClvDZKwIUZLrlm4Hc/Mfr+NNztp1M44duXtOW8fLr8vzMfyZ7283xwt9onYBIkB+QfwoBWdWbbsj08twsKdN1Zqzf4I7O/wDJ8MaTa6CRG2papKkt+V7LkcH3OMe/zHvW6fKknueNVjGtVnOCtFFzUvL/AOEBsvOe8SPyoQfsY/eNwOBVR+FHPW/iS9WZ+nW32XwpdqlhcWSNfRskdy2ZCMKMngdSD2qanwhT3foewwf6iP8A3R/KrM2Nuji0lPohoA8W17jVrv8A67P/AOhGuGp8TPrcD/Bj6I1LTV9L1uyjsPEJaOWJdsN8n3gPRvX/AD9auMozVpfec1bD1cPJzo6p7x/yIZfEPh7w0jjw7aSXt8wx9ruV+VPp0P5AfWrUqdPY55Ucbi/j91djlbFp9R8R29xeytLLNcKXYnk81EZ80zorYRUsO0tEdwNF1XVf7Nt4dWudP08aZE2Lfgu/RhnIxwR611Q+Feh4GI0qy9WR3nhyPw/bTrbSTSQTmAs0r7maQO2SfwIqanwipbv0PUrf/j2i/wBwfyqzNjpE3xsp/iGKAPHfEqyWus3aXNu2Gkcpu9CSQQT1riqpqTPp8DaVGPK+xjEQvKRuKR46kZNZna3NR7spSQQszE3IHJH3fyoKdSaXwk2kRxrq1kwlDN56ZXB45q6fxI5cbKToyTX9XPXNGH/Eh0//AK9Y/wD0EV2w+FHzGJ/jT/xP8yvr1jcajZx2tsm+Rpk/AZ5NE1dEUmk36HXRp5capnO0AZpkjqAKt/p1tqEJjuIY5R6SKGFJpMuFSUHeLaOUvvAmkuWJtJ4Ae9vJkfrmsnRh2O2nmuIj1T9TDn+H+kBj/p92nsyg/wBKn2MfM6Fndb+VDLXwZpFldxXC3t5K8ThgoQDJH4U404p31M6+bVasHFxSudbYwXn2WG1tLORYoY1jWS5O3gDAPv8AhWqemh5s5OcnJ9Wb9naC1j+Zt8h+82MfkPSqJLFABQAUAFAAQD1GaACgAoAKACgA/9k=</field>
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index 62250f11e17..f4df5f0f5f6 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -84,6 +84,5 @@ class pos_order_report(osv.osv):
                 having
                     sum(l.qty * u.factor) != 0)""")
 
-pos_order_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/pos_report.py b/addons/point_of_sale/report/pos_report.py
index 0179c7bcf45..96b056fb0fc 100644
--- a/addons/point_of_sale/report/pos_report.py
+++ b/addons/point_of_sale/report/pos_report.py
@@ -74,7 +74,6 @@ class report_transaction_pos(osv.osv):
         """)
                     #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
                     #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
-report_transaction_pos()
 
 class report_sales_by_user_pos(osv.osv):
     _name = "report.sales.by.user.pos"
@@ -107,7 +106,6 @@ class report_sales_by_user_pos(osv.osv):
 
                 )
         """)
-report_sales_by_user_pos()
 
 class report_sales_by_user_pos_month(osv.osv):
     _name = "report.sales.by.user.pos.month"
@@ -140,7 +138,6 @@ class report_sales_by_user_pos_month(osv.osv):
 
                 )
         """)
-report_sales_by_user_pos_month()
 
 class report_sales_by_margin_pos(osv.osv):
     _name = "report.sales.by.margin.pos"
@@ -187,7 +184,6 @@ class report_sales_by_margin_pos(osv.osv):
 
                 )
         """)
-report_sales_by_margin_pos()
 
 class report_sales_by_margin_pos_month(osv.osv):
     _name = "report.sales.by.margin.pos.month"
@@ -233,6 +229,5 @@ class report_sales_by_margin_pos_month(osv.osv):
 
                 )
         """)
-report_sales_by_margin_pos_month()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/res_partner.py b/addons/point_of_sale/res_partner.py
index 81a0f6083be..d7969b0e21a 100644
--- a/addons/point_of_sale/res_partner.py
+++ b/addons/point_of_sale/res_partner.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import math
 
diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py
index 05e49a5545d..ed2c6fae598 100644
--- a/addons/point_of_sale/res_users.py
+++ b/addons/point_of_sale/res_users.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import math
 
diff --git a/addons/point_of_sale/static/lib/mousewheel/jquery.mousewheel-3.0.6.js b/addons/point_of_sale/static/lib/mousewheel/jquery.mousewheel-3.0.6.js
old mode 100755
new mode 100644
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index a79b111b5c5..e47ce66f648 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -204,8 +204,8 @@ function openerp_pos_db(instance, module){
                     this.packagings_by_product_id[pack.product_id[0]] = [];
                 }
                 this.packagings_by_product_id[pack.product_id[0]].push(pack);
-                if(pack.ean13){
-                    this.packagings_by_ean13[pack.ean13] = pack;
+                if(pack.ean){
+                    this.packagings_by_ean13[pack.ean] = pack;
                 }
             }
         },
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 660434ba53e..13003bcf19f 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1,24 +1,8 @@
 function openerp_pos_models(instance, module){ //module is instance.point_of_sale
     var QWeb = instance.web.qweb;
 
-    // rounds a value with a fixed number of decimals.
-    // round(3.141492,2) -> 3.14
-    function round(value,decimals){
-        var mult = Math.pow(10,decimals || 0);
-        return Math.round(value*mult)/mult;
-    }
-    window.round = round;
-
-    // rounds a value with decimal form precision
-    // round(3.141592,0.025) ->3.125
-    function round_pr(value,precision){
-        if(!precision || precision < 0){
-            throw new Error('round_pr(): needs a precision greater than zero, got '+precision+' instead');
-        }
-        return Math.round(value / precision) * precision;
-    }
-    window.round_pr = round_pr;
-
+    var round_di = instance.web.round_decimals;
+    var round_pr = instance.web.round_precision
     
     // The PosModel contains the Point Of Sale's representation of the backend.
     // Since the PoS must work in standalone ( Without connection to the server ) 
@@ -339,7 +323,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
     module.Product = Backbone.Model.extend({
         get_image_url: function(){
-            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image', id: this.get('id')});
+            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image_medium', id: this.get('id')});
         },
     });
 
@@ -391,7 +375,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 var quant = Math.max(parseFloat(quantity) || 0, 0);
                 var unit = this.get_unit();
                 if(unit){
-                    this.quantity    = Math.max(unit.rounding, Math.round(quant / unit.rounding) * unit.rounding);
+                    this.quantity    = Math.max(unit.rounding, round_pr(quant, unit.rounding));
                     this.quantityStr = this.quantity.toFixed(Math.max(0,Math.ceil(Math.log(1.0 / unit.rounding) / Math.log(10))));
                 }else{
                     this.quantity    = quant;
@@ -484,7 +468,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         },
         // changes the base price of the product for this orderline
         set_unit_price: function(price){
-            this.price = round(parseFloat(price) || 0, 2);
+            this.price = round_di(parseFloat(price) || 0, 2);
             this.trigger('change');
         },
         get_unit_price: function(){
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index eca4a3c5915..0bd399428ed 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -983,7 +983,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             }
                 
             if(this.pos_widget.action_bar){
-                this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
+                this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0.000001);
             }
         },
         set_numpad_state: function(numpadState) {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index cec48dbe72f..a533f0a8ee6 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -319,6 +319,14 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 this.payment_line.set_amount(amount);
             }
         },
+        checkAmount: function(e){
+            if (e.which !== 0 && e.charCode !== 0) {
+                if(isNaN(String.fromCharCode(e.charCode))){
+                    return (String.fromCharCode(e.charCode) === "." && e.currentTarget.value.toString().split(".").length < 2)?true:false;
+                }
+            }
+            return true
+        },
         changedAmount: function() {
         	if (this.amount !== this.payment_line.get_amount()){
         		this.renderElement();
@@ -328,7 +336,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var self = this;
             this.name =   this.payment_line.get_cashregister().get('journal_id')[1];
             this._super();
-            this.$('input').keyup(function(event){
+            this.$('input').keypress(_.bind(this.checkAmount, this))
+			.keyup(function(event){
                 self.changeAmount(event);
             });
             this.$('.delete-payment-line').click(function() {
@@ -498,7 +507,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
 
         get_image_url: function(category){
-            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image', id: category.id});
+            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image_medium', id: category.id});
         },
 
         renderElement: function(){
diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index 776d962a3a8..e1fa90844d7 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
@@ -16,7 +15,7 @@ class PosBox(CashBox):
         active_ids = context.get('active_ids', []) or []
 
         if active_model == 'pos.session':
-            records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
+            records = self.pool[active_model].browse(cr, uid, active_ids, context=context)
             bank_statements = [record.cash_register_id for record in records if record.cash_register_id]
 
             if not bank_statements:
@@ -41,7 +40,7 @@ class PosBoxIn(PosBox):
         active_ids = context.get('active_ids', []) or []
 
         if active_model == 'pos.session':
-            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            session = self.pool[active_model].browse(cr, uid, active_ids, context=context)[0]
             values['ref'] = session.name
 
         return values
@@ -57,7 +56,7 @@ class PosBoxOut(PosBox):
         active_ids = context.get('active_ids', []) or []
 
         if active_model == 'pos.session':
-            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            session = self.pool[active_model].browse(cr, uid, active_ids, context=context)[0]
             values['ref'] = session.name
 
         return values
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index ff6af8e1f62..8ca4f01b006 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -141,7 +141,6 @@ class pos_box_entries(osv.osv_memory):
             bank_statement.create(cr, uid, vals, context=context)
         return {}
 
-pos_box_entries()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_box_out.py b/addons/point_of_sale/wizard/pos_box_out.py
index 6b0b9ee4755..51c3993183b 100644
--- a/addons/point_of_sale/wizard/pos_box_out.py
+++ b/addons/point_of_sale/wizard/pos_box_out.py
@@ -100,7 +100,6 @@ class pos_box_out(osv.osv_memory):
             statement_line_obj.create(cr, uid, vals, context=context)
         return {}
 
-pos_box_out()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_confirm.py b/addons/point_of_sale/wizard/pos_confirm.py
index f37bdd9f8b8..6a031f54f61 100644
--- a/addons/point_of_sale/wizard/pos_confirm.py
+++ b/addons/point_of_sale/wizard/pos_confirm.py
@@ -48,7 +48,6 @@ class pos_confirm(osv.osv_memory):
                     data_lines += [x.id for x in move.line_id if x.account_id.id == invoice.account_id.id]
                     self.pool.get('account.move.line').reconcile(cr, uid, data_lines, context=context)
         return {}
-pos_confirm()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 3f06dc57a46..bfd6e7c4ca7 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -60,7 +60,6 @@ class pos_details(osv.osv_memory):
             'datas': datas,
         }
 
-pos_details()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index d2703b21ad7..d60b2766644 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -68,6 +68,5 @@ class pos_discount(osv.osv_memory):
             order_line_ref.write(cr, uid, [x.id for x in order.lines], {'discount':this.discount}, context=context)
         return {}
 
-pos_discount()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 750a5519865..30e407d2ad0 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -46,7 +46,7 @@ class pos_open_statement(osv.osv_memory):
         st_ids = []
         j_ids = journal_obj.search(cr, uid, [('journal_user','=',1)], context=context)
         if not j_ids:
-            raise osv.except_osv(_('No Cash Register Defined !'), _('You have to define which payment method must be available in the point of sale by reusing existing bank and cash through "Accounting / Configuration / Journals / Journals". Select a journal and check the field "PoS Payment Method" from the "Point of Sale" tab. You can also create new payment methods directly from menu "PoS Backend / Configuration / Payment Methods".'))
+            raise osv.except_osv(_('No Cash Register Defined!'), _('You have to define which payment method must be available in the point of sale by reusing existing bank and cash through "Accounting / Configuration / Journals / Journals". Select a journal and check the field "PoS Payment Method" from the "Point of Sale" tab. You can also create new payment methods directly from menu "PoS Backend / Configuration / Payment Methods".'))
 
         for journal in journal_obj.browse(cr, uid, j_ids, context=context):
             ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context)
@@ -86,6 +86,5 @@ class pos_open_statement(osv.osv_memory):
             'search_view_id': search_id,
         }
 
-pos_open_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 47814761b20..02223153290 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -128,7 +128,6 @@ class pos_make_payment(osv.osv_memory):
         'amount': _default_amount,
     }
 
-pos_make_payment()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 3b1cde3e488..2e828521757 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -15,7 +15,7 @@
                 <footer>
                     <button name="check" string="Make Payment" type="object" class="oe_highlight"/>
                     or 
-                    <button icon="gtk-stop" special="cancel" string="Cancel" class="oe_link"/>
+                    <button special="cancel" string="Cancel" class="oe_link"/>
                 </footer>
             </form>
             </field>
diff --git a/addons/point_of_sale/wizard/pos_payment_report.py b/addons/point_of_sale/wizard/pos_payment_report.py
index b28af5a3fff..a591fd4ce5f 100644
--- a/addons/point_of_sale/wizard/pos_payment_report.py
+++ b/addons/point_of_sale/wizard/pos_payment_report.py
@@ -43,7 +43,6 @@ class pos_payment_report(osv.osv_memory):
             'datas': datas,
        }
 
-pos_payment_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.py b/addons/point_of_sale/wizard/pos_payment_report_user.py
index 06e224f39bc..37a62783ed2 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.py
@@ -49,7 +49,6 @@ class pos_payment_report_user(osv.osv_memory):
         'user_id': fields.many2many('res.users', 'res_user_sale', 'user_id', 'sale_id', 'Salesperson')
     }
 
-pos_payment_report_user()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index 2a62b74bb30..3e6714f3ac7 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -55,6 +55,5 @@ class pos_receipt(osv.osv_memory):
             'datas': datas,
         }
 
-pos_receipt()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index b4e0e7b2041..f0624948ed5 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -171,7 +171,6 @@ class pos_return(osv.osv_memory):
             }
         return act
 
-pos_return()
 
 class add_product(osv.osv_memory):
     _inherit = 'pos.add.product'
@@ -321,5 +320,4 @@ class add_product(osv.osv_memory):
             }
         return True
 
-add_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_sales_user.py b/addons/point_of_sale/wizard/pos_sales_user.py
index f2f56d6e35c..e8ece7a7953 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user.py
@@ -55,7 +55,6 @@ class pos_sale_user(osv.osv_memory):
             'datas': datas,
        }
 
-pos_sale_user()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.py b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
index d3da6a9ad42..d6178ff6a50 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_current_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
@@ -53,7 +53,6 @@ class pos_sales_user_today_current_user(osv.osv_memory):
             'datas': datas,
        }
 
-pos_sales_user_today_current_user()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
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 dfc40c863b0..65e4182daed 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -52,7 +52,6 @@ class pos_sales_user_today(osv.osv_memory):
             'datas': datas,
        }
 
-pos_sales_user_today()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index e0135de0cdb..39e7c564831 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
@@ -115,4 +114,3 @@ class pos_session_opening(osv.osv_memory):
             'pos_config_id' : result,
             'show_config' : show_config,
         }
-pos_session_opening()
diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 0045a557a49..1f60accc83d 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -20,7 +20,9 @@
 ##############################################################################
 
 import portal
+import mail_thread
 import mail_mail
+import mail_message
 import wizard
 import acquirer
 
diff --git a/addons/portal/i18n/ko.po b/addons/portal/i18n/ko.po
new file mode 100644
index 00000000000..b1d03cc0e7e
--- /dev/null
+++ b/addons/portal/i18n/ko.po
@@ -0,0 +1,497 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-14 01:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-15 05:15+0000\n"
+"X-Generator: Launchpad (build 16617)\n"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Mako"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:50
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid ""
+"Select which contacts should belong to the portal in the list below.\n"
+"                        The email address of each selected contact must be "
+"valid and unique.\n"
+"                        If necessary, you can fix any contact's email "
+"address directly in the list."
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard.user:0
+msgid "Contacts"
+msgstr "연락처"
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr "기존 그룹"
+
+#. module: portal
+#: view:res.groups:0
+msgid "Portal Groups"
+msgstr "포털 그룹"
+
+#. module: portal
+#: field:portal.wizard,welcome_message:0
+msgid "Invitation Message"
+msgstr "초대 메시지"
+
+#. module: portal
+#: view:res.groups:0
+msgid "Non-Portal Groups"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+msgid "Details"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_orders
+msgid "Quotations and Sales Orders"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "reference: the reference number of the document to pay"
+msgstr ""
+
+#. module: portal
+#: help:portal.payment.acquirer,visible:0
+msgid ""
+"Make this payment acquirer available in portal forms (Customer invoices, "
+"etc.)"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,email:0
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_news
+msgid ""
+"<p>\n"
+"                    Youd don't have unread company's news.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_jobs
+#: model:ir.ui.menu,name:portal.portal_jobs
+msgid "Jobs"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:82
+#, python-format
+msgid "Pay safely online"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"kind: the kind of document on which the payment form is rendered (translated "
+"to user language, e.g. \"Invoice\")"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,portal_id:0
+msgid "The portal that users can be added in or removed from."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:38
+#, python-format
+msgid "Users you already shared with"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_jobs
+msgid ""
+"<p>\n"
+"                    Youd don't have unread job offers.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+", so it may use Mako expressions.\n"
+"                                The Mako evaluation context provides:"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_menu
+#: field:portal.wizard,portal_id:0
+#: field:res.groups,is_portal:0
+#: model:res.groups,name:portal.group_portal
+msgid "Portal"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:34
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,in_portal:0
+msgid "In Portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_news
+#: model:ir.ui.menu,name:portal.portal_company_news
+msgid "News"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_after_sales
+msgid "After Sale Services"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal
+msgid ""
+"Portal members have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.action_acquirer_list
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirers"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_projects
+msgid "Projects"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,name:portal.action_mail_inbox_feeds_portal
+#: model:ir.ui.menu,name:portal.portal_inbox
+msgid "Inbox"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "uid: the current user id"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"quote(): a method to quote special string character to make them suitable "
+"for inclusion in a URL"
+msgstr ""
+
+#. module: portal
+#: help:res.groups,is_portal:0
+msgid "If checked, this group is usable as a portal."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,form_template:0
+msgid "Payment form template (HTML)"
+msgstr ""
+
+#. module: portal
+#: field:portal.wizard.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:193
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_messages
+msgid "Messaging"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_anonymous
+msgid ""
+"Anonymous users have specific access rights (such as record rules and "
+"restricted menus).\n"
+"                They usually do not belong to the usual OpenERP groups."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_payment_acquirer
+msgid "Online Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid ""
+"You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "cr: the current database cursor"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.client,help:portal.action_mail_inbox_feeds_portal
+msgid ""
+"<p>\n"
+"                    <b>Good Job!</b> Your inbox is empty.\n"
+"                </p><p>\n"
+"                    Your inbox contains private messages or emails sent to "
+"you\n"
+"                    as well as information related to documents or people "
+"you\n"
+"                    follow.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"object: the document on which the payment form is rendered (usually an "
+"invoice or sales order record)"
+msgstr ""
+
+#. module: portal
+#: help:portal.wizard,welcome_message:0
+msgid "This text is included in the email sent to new users of the portal."
+msgstr ""
+
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_company
+msgid "About Us"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"currency: the currency record in which the document is issued (e.g. "
+"currency.name could be EUR)"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Payment Acquirer"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been given access to %(portal)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"Username: %(login)s\n"
+"\n"
+"In order to complete the signin process, click on the following url:\n"
+"%(url)s\n"
+"\n"
+"%(welcome_message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: portal
+#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
+msgid ""
+"\n"
+"% if object.company_id.paypal_account:\n"
+"<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" "
+"target=\"_blank\">\n"
+"  <input type=\"hidden\" name=\"cmd\" value=\"_xclick\"/>\n"
+"  <input type=\"hidden\" name=\"business\" "
+"value=\"${object.company_id.paypal_account}\"/>\n"
+"  <input type=\"hidden\" name=\"item_name\" "
+"value=\"${object.company_id.name} ${kind.title()} ${reference}\"/>\n"
+"  <input type=\"hidden\" name=\"amount\" value=\"${amount}\"/>\n"
+"  <input type=\"hidden\" name=\"currency_code\" "
+"value=\"${currency.name}\"/>\n"
+"  <input type=\"image\" name=\"submit\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"</form>\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"If the template renders to an empty result in a certain context it will be "
+"ignored, as if it was inactive."
+msgstr ""
+
+#. module: portal
+#: field:portal.payment.acquirer,visible:0
+msgid "Visible"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:39
+#, python-format
+msgid "Existing Groups (e.g Portal Groups)"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:portal.wizard:0
+msgid "Apply"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "ctx: the current context dictionary"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid ""
+"This is an HTML form template to submit a payment through this acquirer.\n"
+"                                The template will be rendered with"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/mail_mail.py:42
+#, python-format
+msgid ""
+"Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Form Template"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: model:ir.model,name:portal.model_portal_wizard
+#: view:portal.wizard:0
+msgid "Portal Access Management"
+msgstr ""
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index 3810ddd2540..e412732fdc9 100644
--- a/addons/portal/mail_mail.py
+++ b/addons/portal/mail_mail.py
@@ -21,7 +21,6 @@
 
 from openerp import SUPERUSER_ID
 from openerp.osv import osv
-from openerp.osv.orm import except_orm
 from openerp.tools.translate import _
 
 
@@ -29,27 +28,19 @@ class mail_mail(osv.Model):
     """ Update of mail_mail class, to add the signin URL to notifications. """
     _inherit = 'mail.mail'
 
-    def send_get_mail_body_footer(self, cr, uid, mail, partner=None, context=None):
-        """ add a signin link inside the body of a mail.mail
-            :param mail: mail.mail browse_record
-            :param partner: browse_record of the specific recipient partner
-            :return: the resulting body_html
+    def _get_partner_access_link(self, cr, uid, mail, partner=None, context=None):
+        """ Generate URLs for links in mails:
+            - partner is not an user: signup_url
+            - partner is an user: fallback on classic URL
         """
+        if context is None:
+            context = {}
         partner_obj = self.pool.get('res.partner')
-        if partner:
-            contex_signup = dict(context or {}, signup_valid=True)
-            partner = partner_obj.browse(cr, SUPERUSER_ID, partner.id, context=contex_signup)
-            body_footer = _("""<small>Access your messages and documents through <a style='color:inherit' href="%s">our Customer Portal</a></small>""") % partner.signup_url
-            # partner is an user: add a link to the document if read access
-            if partner.user_ids and mail.model and mail.res_id \
-                    and self.check_access_rights(cr, partner.user_ids[0].id, 'read', raise_exception=False):
-                related_user = partner.user_ids[0]
-                try:
-                    self.pool.get(mail.model).check_access_rule(cr, related_user.id, [mail.res_id], 'read', context=context)
-                    url = partner_obj._get_signup_url_for_action(cr, related_user.id, [partner.id], action='', res_id=mail.res_id, model=mail.model, context=context)[partner.id]
-                    text = _("""<small>Access this document <a style='color:inherit' href="%s">directly in OpenERP</a></small>""") % url
-                except except_orm, e:
-                    pass
-            return body_footer
+        if partner and not partner.user_ids:
+            contex_signup = dict(context, signup_valid=True)
+            signup_url = partner_obj._get_signup_url_for_action(cr, SUPERUSER_ID, [partner.id],
+                                                                    action='login', model=mail.model, res_id=mail.res_id,
+                                                                    context=contex_signup)[partner.id]
+            return _("""<small>Access your messages and documents through <a style='color:inherit' href="%s">our Customer Portal</a></small>""") % signup_url
         else:
-            return super(mail_mail, self).send_get_mail_body_footer(cr, uid, mail, partner=partner, context=context)
+            return super(mail_mail, self)._get_partner_access_link(cr, uid, mail, partner=partner, context=context)
diff --git a/addons/portal/mail_message.py b/addons/portal/mail_message.py
new file mode 100644
index 00000000000..d6a38f27378
--- /dev/null
+++ b/addons/portal/mail_message.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, orm
+from openerp.tools.translate import _
+
+
+class mail_message(osv.Model):
+    """ Update of mail_message class, to restrict mail access. """
+    _inherit = 'mail.message'
+
+    def _search(self, cr, uid, args, offset=0, limit=None, order=None,
+        context=None, count=False, access_rights_uid=None):
+        """ Override that adds specific access rights of mail.message, to remove
+            all internal notes if uid is a non-employee
+        """
+        group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
+        group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
+        if group_user_id not in [group.id for group in group_ids]:
+            args = ['&', '|', ('type', '!=', 'comment'), ('subtype_id', '!=', False)] + list(args)
+
+        return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
+            context=context, count=False, access_rights_uid=access_rights_uid)
+
+    def check_access_rule(self, cr, uid, ids, operation, context=None):
+        """ Add Access rules of mail.message for non-employee user:
+            - read:
+                - raise if the type is comment and subtype NULL (internal note)
+        """
+        group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
+        group_user_id = self.pool.get("ir.model.data").get_object_reference(cr, uid, 'base', 'group_user')[1]
+        if group_user_id not in [group.id for group in group_ids]:
+            cr.execute('SELECT DISTINCT id FROM "%s" WHERE type = %%s AND subtype_id IS NULL AND id = ANY (%%s)' % (self._table), ('comment', ids,))
+            if cr.fetchall():
+                raise orm.except_orm(_('Access Denied'),
+                        _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
+                        (self._description, operation))
+
+        return super(mail_message, self).check_access_rule(cr, uid, ids=ids, operation=operation, context=context)
diff --git a/addons/portal/mail_thread.py b/addons/portal/mail_thread.py
new file mode 100644
index 00000000000..44bc4d0bde8
--- /dev/null
+++ b/addons/portal/mail_thread.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-TODAY OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import SUPERUSER_ID
+from openerp.osv import osv
+
+
+class mail_thread(osv.AbstractModel):
+    """ Update of mail_mail class, to add the signin URL to notifications. """
+    _inherit = 'mail.thread'
+
+    def _get_inbox_action_xml_id(self, cr, uid, context=None):
+        """ For a given message, return an action that either
+            - opens the form view of the related document if model, res_id, and
+              read access to the document
+            - opens the Inbox with a default search on the conversation if model,
+              res_id
+            - opens the Inbox with context propagated
+        """
+        cur_user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+        # if uid is a portal user -> action is different
+        if any(group.is_portal for group in cur_user.groups_id):
+            return ('portal', 'action_mail_inbox_feeds_portal')
+        else:
+            return super(mail_thread, self)._get_inbox_action_xml_id(cr, uid, context=context)
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index c05189fd2ab..3660754b4ad 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -40,7 +40,7 @@ Mr Demo Portal</field>
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
+            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index 31bd7332c2f..26b0b4895e8 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -3,7 +3,7 @@ access_mail_message_portal,mail.message.portal,mail.model_mail_message,group_por
 access_mail_mail_portal,mail.mail.portal,mail.model_mail_mail,group_portal,1,1,1,0
 access_mail_notification_portal,mail.notification.portal,mail.model_mail_notification,group_portal,1,1,1,0
 access_mail_followers_portal,mail.followers.portal,mail.model_mail_followers,group_portal,1,1,0,0
-access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
+access_res_partner_portal,res.partner.portal,base.model_res_partner,portal.group_portal,1,0,0,0
 access_acquirer,portal.payment.acquirer,portal.model_portal_payment_acquirer,,1,0,0,0
 access_acquirer_all,portal.payment.acquirer,portal.model_portal_payment_acquirer,base.group_system,1,1,1,1
 access_ir_attachment_group_portal,ir.attachment group_portal,base.model_ir_attachment,portal.group_portal,1,0,1,0
\ No newline at end of file
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index b2a76800023..02080bdc0ab 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_read_own_res_partner" model="ir.rule">
             <field name="name">res_partner: read access on my partner</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="domain_force">[('user_ids', 'in', user.id)]</field>
+            <field name="domain_force">[('id', 'child_of', user.commercial_partner_id.id)]</field>
             <field name="groups" eval="[(4, ref('group_portal')), (4, ref('group_anonymous'))]"/>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 07becf5cdd9..e2b66e65af6 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -40,7 +40,9 @@ class test_portal(TestMailBase):
         self.partner_chell_id = self.user_chell.partner_id.id
 
         # Create a PigsPortal group
-        self.group_port_id = self.mail_group.create(cr, uid, {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id})
+        self.group_port_id = self.mail_group.create(cr, uid,
+                        {'name': 'PigsPortal', 'public': 'groups', 'group_public_id': self.group_portal_id},
+                        {'mail_create_nolog': True})
 
         # Set an email address for the user running the tests, used as Sender for outgoing mails
         self.res_users.write(cr, uid, uid, {'email': 'test@localhost'})
@@ -130,3 +132,94 @@ class test_portal(TestMailBase):
                             'invite: body of invitation email is incorrect')
             self.assertTrue(partner_carine.signup_url in sent_email.get('body'),
                             'invite: body of invitation email does not contain signup url')
+
+    def test_20_notification_url(self):
+        """ Tests designed to test the URL added in notification emails. """
+        cr, uid, group_pigs = self.cr, self.uid, self.group_pigs
+
+        # Partner data
+        partner_raoul = self.res_partner.browse(cr, uid, self.partner_raoul_id)
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'bert'})
+        partner_bert = self.res_partner.browse(cr, uid, partner_bert_id)
+        # Mail data
+        mail_mail_id = self.mail_mail.create(cr, uid, {'state': 'exception'})
+        mail = self.mail_mail.browse(cr, uid, mail_mail_id)
+
+        # Test: link for nobody -> None
+        url = self.mail_mail._get_partner_access_link(cr, uid, mail)
+        self.assertEqual(url, None,
+                        'notification email: mails not send to a specific partner should not have any URL')
+
+        # Test: link for partner -> signup URL
+        url = self.mail_mail._get_partner_access_link(cr, uid, mail, partner=partner_bert)
+        self.assertIn(partner_bert.signup_url, url,
+                        'notification email: mails send to a not-user partner should contain the signup URL')
+
+        # Test: link for user -> signin
+        url = self.mail_mail._get_partner_access_link(cr, uid, mail, partner=partner_raoul)
+        self.assertIn('action=mail.action_mail_redirect', url,
+                        'notification email: link should contain the redirect action')
+        self.assertIn('login=%s' % partner_raoul.user_ids[0].login, url,
+                        'notification email: link should contain the user login')
+
+    @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
+    def test_21_inbox_redirection(self):
+        """ Tests designed to test the inbox redirection of emails notification URLs. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        model, act_id = self.ir_model_data.get_object_reference(cr, uid, 'mail', 'action_mail_inbox_feeds')
+        model, port_act_id = self.ir_model_data.get_object_reference(cr, uid, 'portal', 'action_mail_inbox_feeds_portal')
+        # Data: post a message on pigs
+        msg_id = self.group_pigs.message_post(body='My body', partner_ids=[self.partner_bert_id, self.partner_chell_id], type='comment', subtype='mail.mt_comment')
+
+        # No specific parameters -> should redirect to Inbox
+        action = self.mail_thread.message_redirect_action(cr, self.user_raoul_id, {'params': {}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+        # Bert has read access to Pigs -> should redirect to form view of Pigs
+        action = self.mail_thread.message_redirect_action(cr, self.user_raoul_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.act_window',
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+        self.assertEqual(action.get('res_id'), group_pigs.id,
+                        'URL redirection: action with message_id for read-accredited user should redirect to Pigs')
+
+        # Bert has no read access to Pigs -> should redirect to Inbox
+        action = self.mail_thread.message_redirect_action(cr, self.user_bert_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+        # Chell has no read access to pigs -> should redirect to Portal Inbox
+        action = self.mail_thread.message_redirect_action(cr, self.user_chell_id, {'params': {'message_id': msg_id}})
+        self.assertEqual(action.get('type'), 'ir.actions.client',
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+        self.assertEqual(action.get('id'), port_act_id,
+                        'URL redirection: action without parameters should redirect to client action Inbox')
+
+    def test_30_message_read(self):
+        cr, uid, group_port_id = self.cr, self.uid, self.group_port_id
+
+        # Data: custom subtypes
+        mt_group_public_id = self.mail_message_subtype.create(cr, uid, {'name': 'group_public', 'description': 'Group changed'})
+        self.ir_model_data.create(cr, uid, {'name': 'mt_group_public', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_group_public_id})
+        # Data: post messages with various subtypes
+        msg1_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body1', type='comment', subtype='mail.mt_comment')
+        msg2_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body2', type='comment', subtype='mail.mt_group_public')
+        msg3_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body3', type='comment', subtype='mail.mt_comment')
+        msg4_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body4', type='comment')
+        msg5_id = self.mail_group.message_post(cr, uid, group_port_id, body='Body5', type='notification')
+
+        # Do: Chell search messages: should not see internal notes (comment without subtype)
+        msg_ids = self.mail_message.search(cr, self.user_chell_id, [('model', '=', 'mail.group'), ('res_id', '=', group_port_id)])
+        self.assertEqual(set(msg_ids), set([msg1_id, msg2_id, msg3_id, msg5_id]),
+                        'mail_message: portal user has access to messages he should not read')
+
+        # Do: Chell read messages she can read
+        self.mail_message.read(cr, self.user_chell_id, msg_ids, ['body', 'type', 'subtype_id'])
+
+        # Do: Chell read a message she should not be able to read
+        with self.assertRaises(except_orm):
+            self.mail_message.read(cr, self.user_chell_id, [msg4_id], ['body', 'type', 'subtype_id'])
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index e3047cd5edb..3ec2850b4aa 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import logging
-import random
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -34,14 +33,15 @@ _logger = logging.getLogger(__name__)
 WELCOME_EMAIL_SUBJECT = _("Your OpenERP account at %(company)s")
 WELCOME_EMAIL_BODY = _("""Dear %(name)s,
 
-You have been given access to %(portal)s.
+You have been given access to %(company)s's %(portal)s.
 
 Your login account data is:
-Database: %(db)s
-Username: %(login)s
+  Username: %(login)s
+  Portal: %(portal_url)s
+  Database: %(db)s 
 
-In order to complete the signin process, click on the following url:
-%(url)s
+You can set or change your password via the following url:
+   %(signup_url)s
 
 %(welcome_message)s
 
@@ -116,24 +116,57 @@ class wizard_user(osv.osv_memory):
     _description = 'Portal User Config'
 
     _columns = {
-        'wizard_id': fields.many2one('portal.wizard', string='Wizard', required=True),
+        'wizard_id': fields.many2one('portal.wizard', string='Wizard', required=True, ondelete='cascade'),
         'partner_id': fields.many2one('res.partner', string='Contact', required=True, readonly=True),
         'email': fields.char(size=240, string='Email'),
         'in_portal': fields.boolean('In Portal'),
     }
 
-    def create(self, cr, uid, values, context=None):
-        """ overridden to update the partner's email (if necessary) """
-        id = super(wizard_user, self).create(cr, uid, values, context)
-        wuser = self.browse(cr, uid, id, context)
-        if wuser.partner_id.email != wuser.email:
-            wuser.partner_id.write({'email': wuser.email})
-        return id
+    def get_error_messages(self, cr, uid, ids, context=None):
+        res_users = self.pool.get('res.users')
+        emails = []
+        error_empty = []
+        error_emails = []
+        error_user = []
+        ctx = dict(context or {}, active_test=False)
+        for wizard_user in self.browse(cr, SUPERUSER_ID, ids, context):
+            if wizard_user.in_portal and not self._retrieve_user(cr, SUPERUSER_ID, wizard_user, context):
+                email = extract_email(wizard_user.email)
+                if not email:
+                    error_empty.append(wizard_user.partner_id)
+                elif email in emails and email not in error_emails:
+                    error_emails.append(wizard_user.partner_id)
+                user = res_users.search(cr, SUPERUSER_ID, [('login', '=', email)], context=ctx)
+                if user:
+                    error_user.append(wizard_user.partner_id)
+                emails.append(email)
+
+        error_msg = []
+        if error_empty:
+            error_msg.append("%s\n- %s" % (_("Some contacts don't have a valid email: "),
+                                '\n- '.join(['%s' % (p.display_name,) for p in error_empty])))
+        if error_emails:
+            error_msg.append("%s\n- %s" % (_("Several contacts have the same email: "),
+                                '\n- '.join([p.email for p in error_emails])))
+        if error_user:
+            error_msg.append("%s\n- %s" % (_("Some contacts have the same email as an existing portal user:"),
+                                '\n- '.join(['%s <%s>' % (p.display_name, p.email) for p in error_user])))
+        if error_msg:
+            error_msg.append(_("To resolve this error, you can: \n"
+                "- Correct the emails of the relevant contacts\n"
+                "- Grant access only to contacts with unique emails"))
+        return error_msg
 
     def action_apply(self, cr, uid, ids, context=None):
+        error_msg = self.get_error_messages(cr, uid, ids, context=context)
+        if error_msg:
+            raise osv.except_osv(_('Contacts Error'), "\n\n".join(error_msg))
+
         for wizard_user in self.browse(cr, SUPERUSER_ID, ids, context):
             portal = wizard_user.wizard_id.portal_id
             user = self._retrieve_user(cr, SUPERUSER_ID, wizard_user, context)
+            if wizard_user.partner_id.email != wizard_user.email:
+                wizard_user.partner_id.write({'email': wizard_user.email})
             if wizard_user.in_portal:
                 # create a user if necessary, and make sure it is in the portal group
                 if not user:
@@ -142,8 +175,8 @@ class wizard_user(osv.osv_memory):
                     user.write({'active': True, 'groups_id': [(4, portal.id)]})
                     # prepare for the signup process
                     user.partner_id.signup_prepare()
-                    wizard_user = self.browse(cr, SUPERUSER_ID, wizard_user.id, context)
-                    self._send_email(cr, uid, wizard_user, context)
+                wizard_user.refresh()
+                self._send_email(cr, uid, wizard_user, context)
             else:
                 # remove the user (if it exists) from the portal group
                 if user and (portal in user.groups_id):
@@ -158,13 +191,11 @@ class wizard_user(osv.osv_memory):
             @param wizard_user: browse record of model portal.wizard.user
             @return: browse record of model res.users
         """
-        if wizard_user.partner_id.user_ids:
-            return wizard_user.partner_id.user_ids[0]
-        # the user may be inactive, search for it
+        context = dict(context or {}, active_test=False)
         res_users = self.pool.get('res.users')
-        domain = [('partner_id', '=', wizard_user.partner_id.id), ('active', '=', False)]
-        user_ids = res_users.search(cr, uid, domain)
-        return user_ids and res_users.browse(cr, uid, user_ids[0], context) or False
+        domain = [('partner_id', '=', wizard_user.partner_id.id)]
+        user_ids = res_users.search(cr, uid, domain, context=context)
+        return user_ids and res_users.browse(cr, uid, user_ids[0], context=context) or False
 
     def _create_user(self, cr, uid, wizard_user, context=None):
         """ create a new user for wizard_user.partner_id
@@ -172,8 +203,9 @@ class wizard_user(osv.osv_memory):
             @return: browse record of model res.users
         """
         res_users = self.pool.get('res.users')
-        create_context = dict(context or {}, noshortcut=True)       # to prevent shortcut creation
+        create_context = dict(context or {}, noshortcut=True, no_reset_password=True)       # to prevent shortcut creation
         values = {
+            'email': extract_email(wizard_user.email),
             'login': extract_email(wizard_user.email),
             'partner_id': wizard_user.partner_id.id,
             'groups_id': [(6, 0, [])],
@@ -187,15 +219,22 @@ class wizard_user(osv.osv_memory):
             @param wizard_user: browse record of model portal.wizard.user
             @return: the id of the created mail.mail record
         """
+        res_partner = self.pool['res.partner']
         this_context = context
         this_user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context)
         if not this_user.email:
-            raise osv.except_osv(_('Email required'),
+            raise osv.except_osv(_('Email Required'),
                 _('You must have an email address in your User Preferences to send emails.'))
 
         # determine subject and body in the portal user's language
         user = self._retrieve_user(cr, SUPERUSER_ID, wizard_user, context)
         context = dict(this_context or {}, lang=user.lang)
+        ctx_portal_url = dict(context, signup_force_type_in_url='')
+        portal_url = res_partner._get_signup_url_for_action(cr, uid,
+                                                            [user.partner_id.id],
+                                                            context=ctx_portal_url)[user.partner_id.id]
+        res_partner.signup_prepare(cr, uid, [user.partner_id.id], context=context)
+
         data = {
             'company': this_user.company_id.name,
             'portal': wizard_user.wizard_id.portal_id.name,
@@ -203,7 +242,8 @@ class wizard_user(osv.osv_memory):
             'db': cr.dbname,
             'name': user.name,
             'login': user.login,
-            'url': user.signup_url,
+            'signup_url': user.signup_url,
+            'portal_url': portal_url,
         }
         mail_mail = self.pool.get('mail.mail')
         mail_values = {
diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py
index d983bf11ee1..0ffae804f07 100644
--- a/addons/portal/wizard/share_wizard.py
+++ b/addons/portal/wizard/share_wizard.py
@@ -179,7 +179,6 @@ class share_wizard_portal(osv.TransientModel):
         super(share_wizard_portal,self)._finish_result_lines(cr, uid, wizard_data, share_group_id, context=context)
         self.copy_share_group_access_and_delete(cr, wizard_data, share_group_id, context=context)
 
-share_wizard_portal()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_anonymous/i18n/lt.po b/addons/portal_anonymous/i18n/lt.po
new file mode 100644
index 00000000000..60643c7f356
--- /dev/null
+++ b/addons/portal_anonymous/i18n/lt.po
@@ -0,0 +1,25 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-24 18:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Prisijungti"
diff --git a/addons/portal_anonymous/i18n/ru.po b/addons/portal_anonymous/i18n/ru.po
new file mode 100644
index 00000000000..5ae80dfe490
--- /dev/null
+++ b/addons/portal_anonymous/i18n/ru.po
@@ -0,0 +1,25 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-09 13:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-10 05:21+0000\n"
+"X-Generator: Launchpad (build 16550)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Вход"
diff --git a/addons/portal_crm/i18n/fr.po b/addons/portal_crm/i18n/fr.po
new file mode 100644
index 00000000000..a0633c60306
--- /dev/null
+++ b/addons/portal_crm/i18n/fr.po
@@ -0,0 +1,546 @@
+# French translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 16:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/portal_crm/i18n/lt.po b/addons/portal_crm/i18n/lt.po
new file mode 100644
index 00000000000..b2b223c6124
--- /dev/null
+++ b/addons/portal_crm/i18n/lt.po
@@ -0,0 +1,546 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/portal_event/i18n/fr.po b/addons/portal_event/i18n/fr.po
new file mode 100644
index 00000000000..81c0a603fc6
--- /dev/null
+++ b/addons/portal_event/i18n/fr.po
@@ -0,0 +1,59 @@
+# French translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 16:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_event
+#: view:event.event:0
+msgid "Portal Settings"
+msgstr ""
+
+#. module: portal_event
+#: model:ir.actions.act_window,help:portal_event.action_event_view
+msgid "There are no public events."
+msgstr ""
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Private"
+msgstr ""
+
+#. module: portal_event
+#: model:ir.model,name:portal_event.model_event_event
+msgid "Event"
+msgstr ""
+
+#. module: portal_event
+#: model:ir.actions.act_window,name:portal_event.action_event_view
+#: model:ir.ui.menu,name:portal_event.portal_company_events
+msgid "Events"
+msgstr ""
+
+#. module: portal_event
+#: field:event.event,visibility:0
+msgid "Visibility"
+msgstr ""
+
+#. module: portal_event
+#: help:event.event,visibility:0
+msgid "Event's visibility in the portal's contact page"
+msgstr ""
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Public"
+msgstr ""
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
old mode 100755
new mode 100644
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index a3182cd5b1c..eca13258ff9 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -33,13 +33,38 @@
         </record>
 
         <record model="ir.ui.view" id="portal_hr_kanban_view_employees">
-            <field name="name">HR - Employess Kanban</field>
+            <field name="name">HR - Employees Kanban</field>
             <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.hr_kanban_view_employees"/>
+            <field name="inherit_id" eval="False"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@class='oe_employee_details']" position="inside">
-                    <t t-if="record.public_info.raw_value"><field name="public_info"/></t>
-                </xpath>
+                <kanban>
+                    <field name="last_login"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_employee_vignette">
+                                <div class="oe_employee_image">
+                                    <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
+                                </div>
+                                <div class="oe_employee_details">
+                                    <h4>
+                                        <a type="open"><field name="name"/></a>
+                                    </h4>
+                                    <ul>
+                                        <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
+                                        <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
+                                        <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
+                                        <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
+                                        <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
+                                        <li t-if="record.public_info.raw_value"><field name="public_info"/></li>
+                                    </ul>
+                                </div>
+                            </div>
+                            <script>
+                                $('.oe_employee_picture').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_employee_picture_wide') } });
+                            </script>
+                        </t>
+                    </templates>
+                </kanban>
             </field>
         </record>
 
diff --git a/addons/portal_hr_employees/i18n/fr.po b/addons/portal_hr_employees/i18n/fr.po
new file mode 100644
index 00000000000..3fdc48a35de
--- /dev/null
+++ b/addons/portal_hr_employees/i18n/fr.po
@@ -0,0 +1,95 @@
+# French translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-05-22 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Coach"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.actions.act_window,name:portal_hr_employees.action_team
+#: view:portal_crm.crm_contact_us:0
+msgid "Our Team"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Group By..."
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Public"
+msgstr ""
+
+#. module: portal_hr_employees
+#: help:hr.employee,visibility:0
+msgid "Employee's visibility in the portal's contact page"
+msgstr ""
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Private"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Manager"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Job"
+msgstr ""
+
+#. module: portal_hr_employees
+#: field:hr.employee,visibility:0
+msgid "Visibility"
+msgstr ""
+
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Department"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+#: field:portal_crm.crm_contact_us,employee_ids:0
+msgid "Employees"
+msgstr ""
diff --git a/addons/portal_hr_employees/i18n/lt.po b/addons/portal_hr_employees/i18n/lt.po
new file mode 100644
index 00000000000..50a5a872eac
--- /dev/null
+++ b/addons/portal_hr_employees/i18n/lt.po
@@ -0,0 +1,95 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-04-29 15:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Coach"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.actions.act_window,name:portal_hr_employees.action_team
+#: view:portal_crm.crm_contact_us:0
+msgid "Our Team"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Group By..."
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Public"
+msgstr ""
+
+#. module: portal_hr_employees
+#: help:hr.employee,visibility:0
+msgid "Employee's visibility in the portal's contact page"
+msgstr ""
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Private"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Manager"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Job"
+msgstr ""
+
+#. module: portal_hr_employees
+#: field:hr.employee,visibility:0
+msgid "Visibility"
+msgstr ""
+
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+msgid "Department"
+msgstr ""
+
+#. module: portal_hr_employees
+#: view:hr.employee:0
+#: field:portal_crm.crm_contact_us,employee_ids:0
+msgid "Employees"
+msgstr ""
diff --git a/addons/portal_project/__init__.py b/addons/portal_project/__init__.py
index 26c654db9dd..164c7826e47 100644
--- a/addons/portal_project/__init__.py
+++ b/addons/portal_project/__init__.py
@@ -19,3 +19,4 @@
 #
 ##############################################################################
 
+import project
diff --git a/addons/portal_project/project.py b/addons/portal_project/project.py
new file mode 100644
index 00000000000..fb783c8a531
--- /dev/null
+++ b/addons/portal_project/project.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-TODAY OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv
+
+
+class portal_project(osv.Model):
+    """ Update of mail_mail class, to add the signin URL to notifications. """
+    _inherit = 'project.project'
+
+    def _get_visibility_selection(self, cr, uid, context=None):
+        """ Override to add portal option. """
+        selection = super(portal_project, self)._get_visibility_selection(cr, uid, context=context)
+        idx = [item[0] for item in selection].index('public')
+        selection.insert((idx + 1), ('portal', 'Portal Users and Employees'))
+        return selection
+        # return [('public', 'All Users'),
+        #         ('portal', 'Portal Users and Employees'),
+        #         ('employees', 'Employees Only'),
+        #         ('followers', 'Followers Only')]
diff --git a/addons/portal_project/security/ir.model.access.csv b/addons/portal_project/security/ir.model.access.csv
index 0e743050568..a999f5555d9 100644
--- a/addons/portal_project/security/ir.model.access.csv
+++ b/addons/portal_project/security/ir.model.access.csv
@@ -5,3 +5,9 @@ access_task_type,task_type,project.model_project_task_type,portal.group_portal,1
 access_task_work,task_work,project.model_project_task_work,portal.group_portal,1,0,0,0
 access_project_category,project_category,project.model_project_category,portal.group_portal,1,0,0,0
 access_account_analytic_account,account_analytic_account,analytic.model_account_analytic_account,portal.group_portal,1,0,0,0
+access_project_anonymous,project,project.model_project_project,portal.group_anonymous,1,0,0,0
+access_task_anonymous,task,project.model_project_task,portal.group_anonymous,1,0,0,0
+access_task_type_anonymous,task_type,project.model_project_task_type,portal.group_anonymous,1,0,0,0
+access_task_work_anonymous,task_work,project.model_project_task_work,portal.group_anonymous,1,0,0,0
+access_project_category_anonymous,project_category,project.model_project_category,portal.group_anonymous,1,0,0,0
+access_account_analytic_account_anonymous,account_analytic_account,analytic.model_account_analytic_account,portal.group_anonymous,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index 0d995cfd70b..67e57766ebd 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -2,19 +2,67 @@
 <openerp>
     <data noupdate="1">
 
+        <record model="ir.rule" id="project.project_public_members_rule">
+            <field name="name">Project: employees: public, portal, employees or following</field>
+            <field name="domain_force">['|',
+                                            ('privacy_visibility', 'in', ['public', 'portal', 'employees']),
+                                            '&amp;',
+                                                ('privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+
         <record id="portal_project_rule" model="ir.rule">
-            <field name="name">Portal Projects</field>
-            <field ref="project.model_project_project" name="model_id"/>
-            <field name="domain_force">['|', ('privacy_visibility', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id])]</field>
+            <field name="name">Project: portal users: public, portal or following</field>
+            <field name="model_id" ref="project.model_project_project"/>
+            <field name="domain_force">['|',
+                                            ('privacy_visibility', 'in', ['public', 'portal']),
+                                            '&amp;',
+                                                ('privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                            ]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
+        <record model="ir.rule" id="project_anonymous_rule">
+            <field name="name">Project: anonymous users: public only</field>
+            <field name="model_id" ref="project.model_project_project"/>
+            <field name="domain_force">[('privacy_visibility', '=', 'public')]</field>
+            <field name="groups" eval="[(4, ref('portal.group_anonymous'))]"/>
+        </record>
+
+        <record model="ir.rule" id="project.task_visibility_rule">
+            <field name="name">Project/Task: employees: public, portal, employee or (followers and following)</field>
+            <field name="domain_force">['|',
+                                            ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
+        </record>
+
         <record id="portal_task_rule" model="ir.rule">
-            <field name="name">Portal Tasks</field>
-            <field ref="project.model_project_task" name="model_id"/>
-            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
+            <field name="name">Project/Task: portal users: public or (portal and colleagues following) or (followers and following)</field>
+            <field name="model_id" ref="project.model_project_task"/>
+            <field name="domain_force">['|', '|',
+                                            ('project_id.privacy_visibility', 'in', ['public']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'portal'),
+                                                ('message_follower_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
+        <record model="ir.rule" id="task_anonymous_rule">
+            <field name="name">Project/Task: anonymous users: public only</field>
+            <field name="model_id" ref="project.model_project_task"/>
+            <field name="domain_force">[('project_id.privacy_visibility', '=', 'public')]</field>
+            <field name="groups" eval="[(4, ref('portal.group_anonymous'))]"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm_claim/res_config.py b/addons/portal_project/tests/__init__.py
similarity index 63%
rename from addons/crm_claim/res_config.py
rename to addons/portal_project/tests/__init__.py
index aa0cb7ffa20..c79181f7710 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/portal_project/tests/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,14 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from . import test_access_rights
 
-class crm_claim_settings(osv.osv_memory):
-    _name = 'sale.config.settings'
-    _inherit = ['sale.config.settings', 'fetchmail.config.settings']
+checks = [
+    test_access_rights,
+]
 
-    _columns = {
-        'fetchmail_claim': fields.boolean("Create claims from incoming mails",
-            fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
-            help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
-    }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project/tests/test_access_rights.py b/addons/portal_project/tests/test_access_rights.py
new file mode 100644
index 00000000000..a7d56cb3895
--- /dev/null
+++ b/addons/portal_project/tests/test_access_rights.py
@@ -0,0 +1,300 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv.orm import except_orm
+from openerp.tests import common
+from openerp.tools import mute_logger
+
+
+class TestPortalProject(common.TransactionCase):
+
+    def setUp(self):
+        super(TestPortalProject, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Useful models
+        self.project_project = self.registry('project.project')
+        self.project_task = self.registry('project.task')
+        self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # Find Employee group
+        group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        self.group_employee_id = group_employee_ref and group_employee_ref[1] or False
+
+        # Find Project User group
+        group_project_user_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'project', 'group_project_user')
+        self.group_project_user_id = group_project_user_ref and group_project_user_ref[1] or False
+
+        # Find Project Manager group
+        group_project_manager_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'project', 'group_project_manager')
+        self.group_project_manager_id = group_project_manager_ref and group_project_manager_ref[1] or False
+
+        # Find Portal group
+        group_portal_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')
+        self.group_portal_id = group_portal_ref and group_portal_ref[1] or False
+
+        # Find Anonymous group
+        group_anonymous_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_anonymous')
+        self.group_anonymous_id = group_anonymous_ref and group_anonymous_ref[1] or False
+
+        # Test users to use through the various tests
+        self.user_alfred_id = self.res_users.create(cr, uid, {
+                        'name': 'Alfred EmployeeUser',
+                        'login': 'alfred',
+                        'alias_name': 'alfred',
+                        'groups_id': [(6, 0, [self.group_employee_id, self.group_project_user_id])]
+                    })
+        self.user_bert_id = self.res_users.create(cr, uid, {
+                        'name': 'Bert Nobody',
+                        'login': 'bert',
+                        'alias_name': 'bert',
+                        'groups_id': [(6, 0, [])]
+                    })
+        self.user_chell_id = self.res_users.create(cr, uid, {
+                        'name': 'Chell Portal',
+                        'login': 'chell',
+                        'alias_name': 'chell',
+                        'groups_id': [(6, 0, [self.group_portal_id])]
+                    })
+        self.user_donovan_id = self.res_users.create(cr, uid, {
+                        'name': 'Donovan Anonymous',
+                        'login': 'donovan',
+                        'alias_name': 'donovan',
+                        'groups_id': [(6, 0, [self.group_anonymous_id])]
+                    })
+        self.user_ernest_id = self.res_users.create(cr, uid, {
+                        'name': 'Ernest Manager',
+                        'login': 'ernest',
+                        'alias_name': 'ernest',
+                        'groups_id': [(6, 0, [self.group_project_manager_id])]
+                    })
+
+        # Test 'Pigs' project
+        self.project_pigs_id = self.project_project.create(cr, uid,
+            {'name': 'Pigs', 'privacy_visibility': 'public'},
+            {'mail_create_nolog': True})
+        # Various test tasks
+        self.task_1_id = self.project_task.create(cr, uid,
+            {'name': 'Test1', 'user_id': False, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.task_2_id = self.project_task.create(cr, uid,
+            {'name': 'Test2', 'user_id': False, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.task_3_id = self.project_task.create(cr, uid,
+            {'name': 'Test3', 'user_id': False, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.task_4_id = self.project_task.create(cr, uid,
+            {'name': 'Test4', 'user_id': self.user_alfred_id, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.task_5_id = self.project_task.create(cr, uid,
+            {'name': 'Test5', 'user_id': self.user_chell_id, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.task_6_id = self.project_task.create(cr, uid,
+            {'name': 'Test6', 'user_id': self.user_donovan_id, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    def test_00_project_access_rights(self):
+        """ Test basic project access rights, for project and portal_project """
+        cr, uid, pigs_id = self.cr, self.uid, self.project_pigs_id
+
+        # ----------------------------------------
+        # CASE1: public project
+        # ----------------------------------------
+
+        # Do: Alfred reads project -> ok (employee ok public)
+        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        # Test: all project tasks visible
+        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_task_ids = set([self.task_1_id, self.task_2_id, self.task_3_id, self.task_4_id, self.task_5_id, self.task_6_id])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: project user cannot see all tasks of a public project')
+        # Test: all project tasks readable
+        self.project_task.read(cr, self.user_alfred_id, task_ids, ['name'])
+        # Test: all project tasks writable
+        self.project_task.write(cr, self.user_alfred_id, task_ids, {'description': 'TestDescription'})
+
+        # Do: Bert reads project -> crash, no group
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_bert_id, pigs_id, ['name'])
+        # Test: no project task visible
+        self.assertRaises(except_orm, self.project_task.search,
+            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+        # Test: no project task readable
+        self.assertRaises(except_orm, self.project_task.read,
+            cr, self.user_bert_id, task_ids, ['name'])
+        # Test: no project task writable
+        self.assertRaises(except_orm, self.project_task.write,
+            cr, self.user_bert_id, task_ids, {'description': 'TestDescription'})
+
+        # Do: Chell reads project -> ok (portal ok public)
+        self.project_project.read(cr, self.user_chell_id, pigs_id, ['name'])
+        # Test: all project tasks visible
+        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: project user cannot see all tasks of a public project')
+        # Test: all project tasks readable
+        self.project_task.read(cr, self.user_chell_id, task_ids, ['name'])
+        # Test: no project task writable
+        self.assertRaises(except_orm, self.project_task.write,
+            cr, self.user_chell_id, task_ids, {'description': 'TestDescription'})
+
+        # Do: Donovan reads project -> ok (anonymous ok public)
+        self.project_project.read(cr, self.user_donovan_id, pigs_id, ['name'])
+        # Test: all project tasks visible
+        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: anonymous user cannot see all tasks of a public project')
+        # Test: all project tasks readable
+        self.project_task.read(cr, self.user_donovan_id, task_ids, ['name'])
+        # Test: no project task writable
+        self.assertRaises(except_orm, self.project_task.write,
+            cr, self.user_donovan_id, task_ids, {'description': 'TestDescription'})
+
+        # ----------------------------------------
+        # CASE2: portal project
+        # ----------------------------------------
+        self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'portal'})
+
+        # Do: Alfred reads project -> ok (employee ok public)
+        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        # Test: all project tasks visible
+        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: project user cannot see all tasks of a portal project')
+
+        # Do: Bert reads project -> crash, no group
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_bert_id, pigs_id, ['name'])
+        # Test: no project task searchable
+        self.assertRaises(except_orm, self.project_task.search,
+            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+
+        # Data: task follower
+        self.project_task.message_subscribe_users(cr, self.user_alfred_id, [self.task_1_id, self.task_3_id], [self.user_chell_id])
+
+        # Do: Chell reads project -> ok (portal ok public)
+        self.project_project.read(cr, self.user_chell_id, pigs_id, ['name'])
+        # Test: only followed project tasks visible + assigned
+        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        test_task_ids = set([self.task_1_id, self.task_3_id, self.task_5_id])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: portal user should see the followed tasks of a portal project')
+
+        # Do: Donovan reads project -> ko (anonymous ko portal)
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_donovan_id, pigs_id, ['name'])
+        # Test: no project task visible
+        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of a portal project')
+
+        # Data: task follower cleaning
+        self.project_task.message_unsubscribe_users(cr, self.user_alfred_id, [self.task_1_id, self.task_3_id], [self.user_chell_id])
+
+        # ----------------------------------------
+        # CASE3: employee project
+        # ----------------------------------------
+        self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'employees'})
+
+        # Do: Alfred reads project -> ok (employee ok employee)
+        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        # Test: all project tasks visible
+        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_task_ids = set([self.task_1_id, self.task_2_id, self.task_3_id, self.task_4_id, self.task_5_id, self.task_6_id])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: project user cannot see all tasks of an employees project')
+
+        # Do: Bert reads project -> crash, no group
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_bert_id, pigs_id, ['name'])
+
+        # Do: Chell reads project -> ko (portal ko employee)
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_chell_id, pigs_id, ['name'])
+        # Test: no project task visible + assigned
+        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        self.assertFalse(task_ids, 'access rights: portal user should not see tasks of an employees project, even if assigned')
+
+        # Do: Donovan reads project -> ko (anonymous ko employee)
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_donovan_id, pigs_id, ['name'])
+        # Test: no project task visible
+        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of an employees project')
+
+        # ----------------------------------------
+        # CASE4: followers project
+        # ----------------------------------------
+        self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'followers'})
+
+        # Do: Alfred reads project -> ko (employee ko followers)
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_alfred_id, pigs_id, ['name'])
+        # Test: no project task visible
+        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_task_ids = set([self.task_4_id])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: employee user should not see tasks of a not-followed followers project, only assigned')
+
+        # Do: Bert reads project -> crash, no group
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_bert_id, pigs_id, ['name'])
+
+        # Do: Chell reads project -> ko (portal ko employee)
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_chell_id, pigs_id, ['name'])
+        # Test: no project task visible
+        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        test_task_ids = set([self.task_5_id])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: portal user should not see tasks of a not-followed followers project, only assigned')
+
+        # Do: Donovan reads project -> ko (anonymous ko employee)
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_donovan_id, pigs_id, ['name'])
+        # Test: no project task visible
+        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of a followers project')
+
+        # Data: subscribe Alfred, Chell and Donovan as follower
+        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_alfred_id, self.user_chell_id, self.user_donovan_id])
+        self.project_task.message_subscribe_users(cr, self.user_alfred_id, [self.task_1_id, self.task_3_id], [self.user_chell_id, self.user_alfred_id])
+
+        # Do: Alfred reads project -> ok (follower ok followers)
+        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        # Test: followed + assigned tasks visible
+        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_task_ids = set([self.task_1_id, self.task_3_id, self.task_4_id])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: employee user should not see followed + assigned tasks of a follower project')
+
+        # Do: Chell reads project -> ok (follower ok follower)
+        self.project_project.read(cr, self.user_chell_id, pigs_id, ['name'])
+        # Test: followed + assigned tasks visible
+        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        test_task_ids = set([self.task_1_id, self.task_3_id, self.task_5_id])
+        self.assertEqual(set(task_ids), test_task_ids,
+                        'access rights: employee user should not see followed + assigned tasks of a follower project')
+
+        # Do: Donovan reads project -> ko (anonymous ko follower even if follower)
+        self.assertRaises(except_orm, self.project_project.read,
+            cr, self.user_donovan_id, pigs_id, ['name'])
diff --git a/addons/portal_project_issue/i18n/fr.po b/addons/portal_project_issue/i18n/fr.po
new file mode 100644
index 00000000000..48fc9e2ea59
--- /dev/null
+++ b/addons/portal_project_issue/i18n/fr.po
@@ -0,0 +1,40 @@
+# French translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-05-22 08:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-23 05:19+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr ""
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                You can track your issues from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+msgid "Issues"
+msgstr ""
diff --git a/addons/portal_project_issue/security/ir.model.access.csv b/addons/portal_project_issue/security/ir.model.access.csv
index 80a38366b51..7355f7a9b1d 100644
--- a/addons/portal_project_issue/security/ir.model.access.csv
+++ b/addons/portal_project_issue/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_issues,project_issue,project_issue.model_project_issue,portal.group_portal,1,0,0,0
 access_case_section,crm_case_section,crm.model_crm_case_section,portal.group_portal,1,0,0,0
+access_issues_anonymous,project_issue,project_issue.model_project_issue,portal.group_anonymous,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index a121eeb593e..598c1620a82 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -3,14 +3,35 @@
     <data noupdate="1">
 
         <record id="portal_issue_rule" model="ir.rule">
-            <field name="name">Portal Personal Issues</field>
-            <field ref="project_issue.model_project_issue" name="model_id"/>
-            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
+            <field name="name">Project/Issue: portal users: public or (portal and colleagues following) or (followers and following)</field>
+            <field name="model_id" ref="project_issue.model_project_issue"/>
+            <field name="domain_force">['|', '|',
+                                            ('project_id.privacy_visibility', 'in', ['public']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'portal'),
+                                                ('message_follower_ids', 'child_of', [user.partner_id.commercial_partner_id.id]),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="0" name="perm_create"/>
+        </record>
+
+        <record model="ir.rule" id="project_issue.issue_user_rule">
+            <field name="name">Project/Issue: employees: public, portal, employee or (followers and following)</field>
+            <field name="domain_force">['|',
+                                            ('project_id.privacy_visibility', 'in', ['public', 'portal', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.partner_id.id]),
+                                        ]</field>
+        </record>
+
+        <record model="ir.rule" id="issue_anonymous_rule">
+            <field name="name">Project/Issue: anonymous users: public only</field>
+            <field name="model_id" ref="project_issue.model_project_issue"/>
+            <field name="domain_force">[('project_id.privacy_visibility', '=', 'public')]</field>
+            <field name="groups" eval="[(4, ref('portal.group_anonymous'))]"/>
         </record>
 
     </data>
diff --git a/addons/portal_project_issue/tests/__init__.py b/addons/portal_project_issue/tests/__init__.py
new file mode 100644
index 00000000000..fa5b47ac535
--- /dev/null
+++ b/addons/portal_project_issue/tests/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_access_rights
+
+checks = [
+    test_access_rights,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project_issue/tests/test_access_rights.py b/addons/portal_project_issue/tests/test_access_rights.py
new file mode 100644
index 00000000000..28d337a4965
--- /dev/null
+++ b/addons/portal_project_issue/tests/test_access_rights.py
@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.portal_project.tests.test_access_rights import TestPortalProject
+from openerp.osv.orm import except_orm
+from openerp.tools import mute_logger
+
+
+class TestPortalIssueProject(TestPortalProject):
+
+    def setUp(self):
+        super(TestPortalIssueProject, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Useful models
+        self.project_issue = self.registry('project.issue')
+
+        # Various test issues
+        self.issue_1_id = self.project_issue.create(cr, uid,
+            {'name': 'Test1', 'user_id': False, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.issue_2_id = self.project_issue.create(cr, uid,
+            {'name': 'Test2', 'user_id': False, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.issue_3_id = self.project_issue.create(cr, uid,
+            {'name': 'Test3', 'user_id': False, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.issue_4_id = self.project_issue.create(cr, uid,
+            {'name': 'Test4', 'user_id': self.user_alfred_id, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.issue_5_id = self.project_issue.create(cr, uid,
+            {'name': 'Test5', 'user_id': self.user_chell_id, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+        self.issue_6_id = self.project_issue.create(cr, uid,
+            {'name': 'Test6', 'user_id': self.user_donovan_id, 'project_id': self.project_pigs_id},
+            {'mail_create_nolog': True})
+
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    def test_00_project_access_rights(self):
+        """ Test basic project access rights, for project and portal_project """
+        cr, uid, pigs_id = self.cr, self.uid, self.project_pigs_id
+
+        # ----------------------------------------
+        # CASE1: public project
+        # ----------------------------------------
+
+        # Do: Alfred reads project -> ok (employee ok public)
+        # Test: all project issues visible
+        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_issue_ids = set([self.issue_1_id, self.issue_2_id, self.issue_3_id, self.issue_4_id, self.issue_5_id, self.issue_6_id])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: project user cannot see all issues of a public project')
+        # Test: all project issues readable
+        self.project_issue.read(cr, self.user_alfred_id, issue_ids, ['name'])
+        # Test: all project issues writable
+        self.project_issue.write(cr, self.user_alfred_id, issue_ids, {'description': 'TestDescription'})
+
+        # Do: Bert reads project -> crash, no group
+        # Test: no project issue visible
+        self.assertRaises(except_orm, self.project_issue.search,
+            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+        # Test: no project issue readable
+        self.assertRaises(except_orm, self.project_issue.read,
+            cr, self.user_bert_id, issue_ids, ['name'])
+        # Test: no project issue writable
+        self.assertRaises(except_orm, self.project_issue.write,
+            cr, self.user_bert_id, issue_ids, {'description': 'TestDescription'})
+
+        # Do: Chell reads project -> ok (portal ok public)
+        # Test: all project issues visible
+        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: project user cannot see all issues of a public project')
+        # Test: all project issues readable
+        self.project_issue.read(cr, self.user_chell_id, issue_ids, ['name'])
+        # Test: no project issue writable
+        self.assertRaises(except_orm, self.project_issue.write,
+            cr, self.user_chell_id, issue_ids, {'description': 'TestDescription'})
+
+        # Do: Donovan reads project -> ok (anonymous ok public)
+        # Test: all project issues visible
+        issue_ids = self.project_issue.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: project user cannot see all issues of a public project')
+
+        # ----------------------------------------
+        # CASE2: portal project
+        # ----------------------------------------
+        self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'portal'})
+
+        # Do: Alfred reads project -> ok (employee ok public)
+        # Test: all project issues visible
+        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: project user cannot see all issues of a portal project')
+
+        # Do: Bert reads project -> crash, no group
+        # Test: no project issue searchable
+        self.assertRaises(except_orm, self.project_issue.search,
+            cr, self.user_bert_id, [('project_id', '=', pigs_id)])
+
+        # Data: issue follower
+        self.project_issue.message_subscribe_users(cr, self.user_alfred_id, [self.issue_1_id, self.issue_3_id], [self.user_chell_id])
+
+        # Do: Chell reads project -> ok (portal ok public)
+        # Test: only followed project issues visible + assigned
+        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        test_issue_ids = set([self.issue_1_id, self.issue_3_id, self.issue_5_id])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: portal user should see the followed issues of a portal project')
+
+        # Data: issue follower cleaning
+        self.project_issue.message_unsubscribe_users(cr, self.user_alfred_id, [self.issue_1_id, self.issue_3_id], [self.user_chell_id])
+
+        # ----------------------------------------
+        # CASE3: employee project
+        # ----------------------------------------
+        self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'employees'})
+
+        # Do: Alfred reads project -> ok (employee ok employee)
+        # Test: all project issues visible
+        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_issue_ids = set([self.issue_1_id, self.issue_2_id, self.issue_3_id, self.issue_4_id, self.issue_5_id, self.issue_6_id])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: project user cannot see all issues of an employees project')
+
+        # Do: Chell reads project -> ko (portal ko employee)
+        # Test: no project issue visible + assigned
+        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        self.assertFalse(issue_ids, 'access rights: portal user should not see issues of an employees project, even if assigned')
+
+        # ----------------------------------------
+        # CASE4: followers project
+        # ----------------------------------------
+        self.project_project.write(cr, uid, [pigs_id], {'privacy_visibility': 'followers'})
+
+        # Do: Alfred reads project -> ko (employee ko followers)
+        # Test: no project issue visible
+        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_issue_ids = set([self.issue_4_id])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: employee user should not see issues of a not-followed followers project, only assigned')
+
+        # Do: Chell reads project -> ko (portal ko employee)
+        # Test: no project issue visible
+        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        test_issue_ids = set([self.issue_5_id])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: portal user should not see issues of a not-followed followers project, only assigned')
+
+        # Data: subscribe Alfred, Chell and Donovan as follower
+        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_alfred_id, self.user_chell_id, self.user_donovan_id])
+        self.project_issue.message_subscribe_users(cr, self.user_alfred_id, [self.issue_1_id, self.issue_3_id], [self.user_chell_id, self.user_alfred_id])
+
+        # Do: Alfred reads project -> ok (follower ok followers)
+        # Test: followed + assigned issues visible
+        issue_ids = self.project_issue.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        test_issue_ids = set([self.issue_1_id, self.issue_3_id, self.issue_4_id])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: employee user should not see followed + assigned issues of a follower project')
+
+        # Do: Chell reads project -> ok (follower ok follower)
+        # Test: followed + assigned issues visible
+        issue_ids = self.project_issue.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        test_issue_ids = set([self.issue_1_id, self.issue_3_id, self.issue_5_id])
+        self.assertEqual(set(issue_ids), test_issue_ids,
+                        'access rights: employee user should not see followed + assigned issues of a follower project')
diff --git a/addons/portal_project_long_term/security/ir.model.access.csv b/addons/portal_project_long_term/security/ir.model.access.csv
index 738c264a71c..efbc4fc2418 100644
--- a/addons/portal_project_long_term/security/ir.model.access.csv
+++ b/addons/portal_project_long_term/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_issues,project_phase,project_long_term.model_project_phase,portal.group_portal,1,0,0,0
+access_issues_anonymous,project_phase_anonymous,project_long_term.model_project_phase,portal.group_anonymous,1,0,0,0
diff --git a/addons/portal_project_long_term/security/portal_security.xml b/addons/portal_project_long_term/security/portal_security.xml
index b46d277e4ee..d8aec542847 100644
--- a/addons/portal_project_long_term/security/portal_security.xml
+++ b/addons/portal_project_long_term/security/portal_security.xml
@@ -3,14 +3,17 @@
     <data>
 
         <record id="portal_project_long_term_rule" model="ir.rule">
-            <field name="name">Portal Personal Long term project</field>
-            <field ref="project_long_term.model_project_phase" name="model_id"/>
-            <field name="domain_force">['|',('project_id.message_follower_ids','in', [user.partner_id.id]),('task_ids.message_follower_ids','in', [user.partner_id.id])]</field>
+            <field name="name">Project/Phase: portal users: public or (portal and colleagues following) or (followers and following)</field>
+            <field name="model_id" ref="project_long_term.model_project_phase"/>
+            <field name="domain_force">[('project_id.privacy_visibility', 'in', ['public', 'portal'])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="0" name="perm_create"/>
+        </record>
+
+        <record model="ir.rule" id="project_phase_anonymous_rule">
+            <field name="name">Project/Phase: anonymous users: public only</field>
+            <field name="model_id" ref="project_long_term.model_project_phase"/>
+            <field name="domain_force">[('project_id.privacy_visibility', '=', 'public')]</field>
+            <field name="groups" eval="[(4, ref('portal.group_anonymous'))]"/>
         </record>
 
     </data>
diff --git a/addons/portal_sale/i18n/lt.po b/addons/portal_sale/i18n/lt.po
new file mode 100644
index 00000000000..92db39babce
--- /dev/null
+++ b/addons/portal_sale/i18n/lt.po
@@ -0,0 +1,344 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-29 15:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "We haven't sent you any invoice."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "We haven't sent you any quotation."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sales Orders"
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr ""
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <% set signup_url = object.get_signup_url() %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        % endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+msgid "Sale Orders"
+msgstr ""
diff --git a/addons/portal_sale/portal_sale.py b/addons/portal_sale/portal_sale.py
index cd3b702d3c5..07300c5d463 100644
--- a/addons/portal_sale/portal_sale.py
+++ b/addons/portal_sale/portal_sale.py
@@ -104,25 +104,6 @@ class account_invoice(osv.Model):
             pass
         return action_dict
 
-    def invoice_validate(self, cr, uid, ids, context=None):
-        # fetch the partner's id and subscribe the partner to the invoice
-        document = self.browse(cr, uid, ids[0], context=context)
-        partner = document.partner_id
-        # TDE note: this code should be improved: used a real invite wizard instead of an ugly email
-        if partner.id not in document.message_follower_ids:
-            self.message_subscribe(cr, uid, ids, [partner.id], context=context)
-            mail_values = {
-                'recipient_ids': [(4, partner.id)],
-                'subject': 'Invitation to follow %s' % document.name_get()[0][1],
-                'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
-                'auto_delete': True,
-                'type': 'email',
-            }
-            mail_obj = self.pool.get('mail.mail')
-            mail_id = mail_obj.create(cr, uid, mail_values, context=context)
-            mail_obj.send(cr, uid, [mail_id], context=context)
-        return super(account_invoice, self).invoice_validate(cr, uid, ids, context=context)
-
     def get_signup_url(self, cr, uid, ids, context=None):
         assert len(ids) == 1
         document = self.browse(cr, uid, ids[0], context=context)
diff --git a/addons/portal_stock/security/portal_security.xml b/addons/portal_stock/security/portal_security.xml
index 154a7fc9ddd..c5587453e40 100644
--- a/addons/portal_stock/security/portal_security.xml
+++ b/addons/portal_stock/security/portal_security.xml
@@ -17,19 +17,5 @@
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
-        <record id="portal_stock_move_user_rule" model="ir.rule">
-            <field name="name">Portal Personal Stock Moves</field>
-            <field name="model_id" ref="stock.model_stock_move"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
-        <record id="portal_stock_warehouse_orderpoint_user_rule" model="ir.rule">
-            <field name="name">Portal Personal Stock Warehouse Orderpoints</field>
-            <field name="model_id" ref="procurement.model_stock_warehouse_orderpoint"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/process/process.py b/addons/process/process.py
index 30a1865af4b..d6a72148fa6 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -288,7 +288,6 @@ class process_process(osv.osv):
         })
         return super(process_process, self).copy(cr, uid, id, default, context)
 
-process_process()
 
 class process_node(osv.osv):
     _name = 'process.node'
@@ -323,7 +322,6 @@ class process_node(osv.osv):
         })
         return super(process_node, self).copy_data(cr, uid, id, default, context=context)
 
-process_node()
 
 class process_node_condition(osv.osv):
     _name = 'process.condition'
@@ -334,7 +332,6 @@ class process_node_condition(osv.osv):
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'model_states': fields.char('Expression', required=True, size=128)
     }
-process_node_condition()
 
 class process_transition(osv.osv):
     _name = 'process.transition'
@@ -348,7 +345,6 @@ class process_transition(osv.osv):
         'group_ids': fields.many2many('res.groups', 'process_transition_group_rel', 'tid', 'rid', string='Required Groups'),
         'note': fields.text('Description', translate=True),
     }
-process_transition()
 
 class process_transition_action(osv.osv):
     _name = 'process.transition.action'
@@ -381,6 +377,5 @@ class process_transition_action(osv.osv):
 
         return super(process_transition_action, self).copy_data(cr, uid, id, default, context)
 
-process_transition_action()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index 60e2db873e2..1fd08d967f1 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -33,6 +33,5 @@ class company(osv.osv):
         'schedule_range': 730.0,
     }
 
-company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/i18n/lt.po b/addons/procurement/i18n/lt.po
new file mode 100644
index 00000000000..6b2ac1a24be
--- /dev/null
+++ b/addons/procurement/i18n/lt.po
@@ -0,0 +1,1005 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-29 15:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"required quantities are always\n"
+"                           available"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"If there are not enough quantities available, the delivery order\n"
+"                           will wait for new products. To fulfill the "
+"inventory, you should\n"
+"                           create others rules like orderpoints."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+#: field:product.template,procure_method:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: procurement
+#: selection:product.template,supply_method:0
+msgid "Manufacture"
+msgstr ""
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Reason"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Minimum Quantity"
+msgstr ""
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "Products"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "Stockable products"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"<p>\n"
+"                Procurement Orders represent the need for a certain quantity "
+"of products, at a given time, in a given location. Sales Orders are one "
+"typical source of Procurement Orders (but these are distinct documents). "
+"Depending on the procurement parameters and the product configuration, the "
+"procurement engine will attempt to satisfy the need by reserving products "
+"from stock, ordering products from a supplier, or passing a manufacturing "
+"order, etc. A Procurement Exception occurs when the system cannot find a way "
+"to fulfill a procurement. Some exceptions will resolve themselves "
+"automatically, but others require manual intervention (those are identified "
+"by a specific error message).\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Procurement '%s' is in exception: "
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Reordering Rules Search"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:110
+#, python-format
+msgid "PROC %d: from stock - %3.2f %-5s - %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:365
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+#: view:procurement.order:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+#: selection:product.template,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a procurement order. \n"
+"              </p><p>\n"
+"                A procurement order is used to record a need for a specific\n"
+"                product at a specific location.  Procurement orders are "
+"usually\n"
+"                created automatically from sales orders, pull logistic rules "
+"or\n"
+"                minimum stock rules.\n"
+"              </p><p>\n"
+"                When the procurement order is confirmed, it automatically\n"
+"                creates the necessary operations to fullfil the need: "
+"purchase\n"
+"                order proposition, manufacturing order, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"use the available\n"
+"                           inventory"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the status is set to 'Draft'.\n"
+" If the procurement is confirmed, the status is set to 'Confirmed'.          "
+"  \n"
+"After confirming the status is set to 'Running'.\n"
+" If any exception arises in the order then the status is set to "
+"'Exception'.\n"
+" Once the exception is removed the status becomes 'Ready'.\n"
+" It is in 'Waiting'. status when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"When you sell this service, nothing special will be triggered\n"
+"                           to deliver the customer, as you set the "
+"procurement method as\n"
+"                           'Make to Stock'."
+msgstr ""
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: procurement
+#: constraint:stock.warehouse.orderpoint:0
+msgid ""
+"You have to select a product unit of measure in the same category than the "
+"default unit of measure of the product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"as it's a consumable (as a result of this, the quantity\n"
+"                           on hand may become negative)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes below the Min Quantity specified for this field, "
+"OpenERP generates a procurement to bring the forecasted quantity to the Max "
+"Quantity."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Run Schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "Status"
+msgstr ""
+
+#. module: procurement
+#: selection:product.template,supply_method:0
+msgid "Buy"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "for the delivery order."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: procurement
+#: help:product.template,supply_method:0
+msgid ""
+"Manufacture: When procuring the product, a manufacturing order or a task "
+"will be generated, depending on the product type. \n"
+"Buy: When procuring the product, a purchase order will be generated."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:367
+#, python-format
+msgid "Not enough stock."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:312
+#, python-format
+msgid ""
+"Please check the quantity in procurement order(s) for the product \"%s\", it "
+"should not be 0 or less!"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid ""
+"When you sell this product, a delivery order will be created.\n"
+"                           OpenERP will consider that the"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:133
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will be rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr ""
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "Logistics"
+msgstr ""
+
+#. module: procurement
+#: help:product.template,procure_method:0
+msgid ""
+"Make to Stock: When needed, the product is taken from the stock or we wait "
+"for replenishment. \n"
+"Make to Order: When needed, the product is purchased or produced."
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:311
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr ""
+
+#. module: procurement
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes below the Min Quantity, OpenERP generates a "
+"procurement to bring the forecasted quantity to the Quantity specified as "
+"Max Quantity."
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: field:product.product,orderpoint_ids:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"Fill is this for to launch a procurement request for this\n"
+"                        product. According to the product configuration, "
+"this may\n"
+"                        trigger a draft purchase order, a manufacturing "
+"order or\n"
+"                        a new task."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_product_product
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+#: selection:procurement.order,procure_method:0
+#: selection:product.template,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: field:product.template,supply_method:0
+msgid "Supply Method"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "When you sell this product, OpenERP will"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Reordering Rules"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:139
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s state."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement started late"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "or"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:134
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
+
+#. module: procurement
+#: view:product.product:0
+msgid "Request Procurement"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:87
+#, python-format
+msgid "PROC %d: on order - %3.2f %-5s - %s"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:339
+#, python-format
+msgid "Products reserved from stock."
+msgstr ""
diff --git a/addons/procurement/i18n/pt_BR.po b/addons/procurement/i18n/pt_BR.po
index 626e66dc827..9e425149ee3 100644
--- a/addons/procurement/i18n/pt_BR.po
+++ b/addons/procurement/i18n/pt_BR.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-21 00:27+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2013-04-18 17:42+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:43+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-04-19 05:24+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -57,7 +56,7 @@ msgid ""
 "                           available"
 msgstr ""
 "quantidades necessárias estão sempre\n"
-"                            disponíveis"
+"                           disponíveis"
 
 #. module: procurement
 #: view:product.product:0
@@ -68,9 +67,9 @@ msgid ""
 "                           create others rules like orderpoints."
 msgstr ""
 "Se não houver quantidade suficiente disponível, a ordem de entrega\n"
-"                            vai esperar por novos produtos. Para cumprir o "
+"                           vai esperar por novos produtos. Para cumprir o "
 "inventário, você deve\n"
-"                            criar outras regras como ponto de compra."
+"                           criar outras regras como ponto de compra."
 
 #. module: procurement
 #: field:procurement.order,procure_method:0
@@ -632,7 +631,7 @@ msgstr "Provisório"
 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Run Schedulers"
-msgstr "executar Agendadores"
+msgstr "Executar Agendadores"
 
 #. module: procurement
 #: view:procurement.order.compute:0
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 672859db909..93b9417bded 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -307,7 +307,7 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Data Insufficient !'),
+                raise osv.except_osv(_('Data Insufficient!'),
                     _('Please check the quantity in procurement order(s) for the product "%s", it should not be 0 or less!' % procurement.product_id.name))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 7f0a28d94dc..76432157555 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -18,6 +18,7 @@
                     <field name="product_uom" string="Unit of Measure"/>
                     <field name="procure_method"/>
                     <field name="state"/>
+                    <field name="name" invisible="1"/>
                     <field name="message"/>
                 </tree>
             </field>
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 1009873beb2..7c9d5ec3290 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -155,7 +155,7 @@ class procurement_order(osv.osv):
         warehouse_obj = self.pool.get('stock.warehouse')
 
         warehouse_ids = warehouse_obj.search(cr, uid, [], context=context)
-        products_ids = product_obj.search(cr, uid, [('purchase_ok', '=', True)], order='id', context=context)
+        products_ids = product_obj.search(cr, uid, [], order='id', context=context)
 
         for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
             context['warehouse'] = warehouse
diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml
index 31c48046d64..67d610c65c9 100644
--- a/addons/procurement/stock_orderpoint.xml
+++ b/addons/procurement/stock_orderpoint.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
 
@@ -7,50 +6,50 @@
         <record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">25.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_dozen"/>
+            <field name="product_uom" ref="product.product_uom_dozen"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_36"/>
+            <field name="product_id" ref="product.product_product_36"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_1" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">10.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_28"/>
+            <field name="product_id" ref="product.product_product_28"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_2" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">12.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_20"/>
+            <field name="product_id" ref="product.product_product_20"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_3" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">50.0</field>
             <field name="product_min_qty">10.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_46"/>
+            <field name="product_id" ref="product.product_product_46"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_4" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">15.0</field>
             <field name="product_min_qty">5.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_23"/>
+            <field name="product_id" ref="product.product_product_23"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
         <record id="stock_warehouse_orderpoint_5" model="stock.warehouse.orderpoint">
             <field name="product_max_qty">5.0</field>
             <field name="product_min_qty">3.0</field>
-            <field model="product.uom" name="product_uom" ref="product.product_uom_unit"/>
+            <field name="product_uom" ref="product.product_uom_unit"/>
             <field model="stock.warehouse" name="warehouse_id" search="[]"/>
-            <field model="product.product" name="product_id" ref="product.product_product_48"/>
+            <field name="product_id" ref="product.product_product_48"/>
             <field name="location_id" ref="stock.stock_location_stock"/>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/procurement/wizard/make_procurement_product.py b/addons/procurement/wizard/make_procurement_product.py
index aab49bf8e80..bf83bc73f1a 100644
--- a/addons/procurement/wizard/make_procurement_product.py
+++ b/addons/procurement/wizard/make_procurement_product.py
@@ -126,6 +126,5 @@ class make_procurement(osv.osv_memory):
 
         return res
 
-make_procurement()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/procurement/wizard/mrp_procurement.py b/addons/procurement/wizard/mrp_procurement.py
index 56386bf234e..fd5a9b530b6 100644
--- a/addons/procurement/wizard/mrp_procurement.py
+++ b/addons/procurement/wizard/mrp_procurement.py
@@ -46,7 +46,6 @@ class procurement_compute(osv.osv_memory):
         threaded_calculation.start()
         return {}
 
-procurement_compute()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index 2d5b91d4c81..afc8e2a721f 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -68,6 +68,5 @@ class procurement_compute(osv.osv_memory):
         threaded_calculation.start()
         return {'type': 'ir.actions.act_window_close'}
 
-procurement_compute()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index c60ac989274..aab9657ae5d 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -65,6 +65,5 @@ class procurement_compute_all(osv.osv_memory):
         threaded_calculation.start()
         return {'type': 'ir.actions.act_window_close'}
 
-procurement_compute_all()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/partner.py b/addons/product/partner.py
index 1d11e909346..fbfee76d0b2 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -36,7 +36,9 @@ class res_partner(osv.osv):
             help="This pricelist will be used, instead of the default one, for sales to the current partner"),
     }
 
-res_partner()
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist']
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index acb087533ac..5117da6044e 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -8,9 +8,12 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <group>
-                        <group name="pricelists" groups="product.group_sale_pricelist">
+                        <group name="pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                             <field name="property_product_pricelist"/>
                         </group>
+                        <div name="parent_pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': ['|',('is_company','=',True),('parent_id','=',False)]}">
+                            <p>Pricelists are managed on <button name="open_commercial_entity" type="object" string="the parent company" class="oe_link"/></p>
+                        </div>
                     </group>
                 </page>
             </field>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 757cce2ae95..6fc926980dd 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -64,7 +64,6 @@ class price_type(osv.osv):
         "currency_id": _get_currency
     }
 
-price_type()
 
 #----------------------------------------------------------
 # Price lists
@@ -77,7 +76,6 @@ class product_pricelist_type(osv.osv):
         'name': fields.char('Name',size=64, required=True, translate=True),
         'key': fields.char('Key', size=64, required=True, help="Used in the code to select specific prices based on the context. Keep unchanged."),
     }
-product_pricelist_type()
 
 
 class product_pricelist(osv.osv):
@@ -236,7 +234,10 @@ class product_pricelist(osv.osv):
                                         qty, context=context)[res['base_pricelist_id']]
                                 ptype_src = self.browse(cr, uid, res['base_pricelist_id']).currency_id.id
                                 uom_price_already_computed = True
-                                price = currency_obj.compute(cr, uid, ptype_src, res['currency_id'], price_tmp, round=False)
+                                price = currency_obj.compute(cr, uid,
+                                        ptype_src, res['currency_id'],
+                                        price_tmp, round=False,
+                                        context=context)
                         elif res['base'] == -2:
                             # this section could be improved by moving the queries outside the loop:
                             where = []
@@ -305,7 +306,6 @@ class product_pricelist(osv.osv):
         res.update({'item_id': {ids[-1]: res_multi.get('item_id', ids[-1])}})
         return res
 
-product_pricelist()
 
 
 class product_pricelist_version(osv.osv):
@@ -363,7 +363,6 @@ class product_pricelist_version(osv.osv):
             ['date_start', 'date_end'])
     ]
 
-product_pricelist_version()
 
 class product_pricelist_item(osv.osv):
     def _price_field_get(self, cr, uid, context=None):
@@ -443,7 +442,6 @@ class product_pricelist_item(osv.osv):
         if prod[0]['code']:
             return {'value': {'name': prod[0]['code']}}
         return {}
-product_pricelist_item()
 
 
 
diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml
index 03ce904abad..652710fac94 100644
--- a/addons/product/process/product_process.xml
+++ b/addons/product/process/product_process.xml
@@ -43,8 +43,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Supplier of the product&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;1 or several supplier(s) can be linked to a product. All information stands in the product form.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplier0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_product0"/>
+            <field name="target_node_id" ref="process_node_supplier0"/>
+            <field name="source_node_id" ref="process_node_product0"/>
         </record>
 
     </data>
diff --git a/addons/product/product.py b/addons/product/product.py
index 82b37f7b9e8..656812bebbb 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -84,7 +84,6 @@ class product_uom_categ(osv.osv):
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
-product_uom_categ()
 
 class product_uom(osv.osv):
     _name = 'product.uom'
@@ -208,7 +207,6 @@ class product_uom(osv.osv):
                     raise osv.except_osv(_('Warning!'),_("Cannot change the category of existing Unit of Measure '%s'.") % (uom.name,))
         return super(product_uom, self).write(cr, uid, ids, vals, context=context)
 
-product_uom()
 
 
 class product_ul(osv.osv):
@@ -218,7 +216,6 @@ class product_ul(osv.osv):
         'name' : fields.char('Name', size=64,select=True, required=True, translate=True),
         'type' : fields.selection([('unit','Unit'),('pack','Pack'),('box', 'Box'), ('pallet', 'Pallet')], 'Type', required=True),
     }
-product_ul()
 
 
 #----------------------------------------------------------
@@ -283,7 +280,6 @@ class product_category(osv.osv):
     def child_get(self, cr, uid, ids):
         return [ids]
 
-product_category()
 
 
 #----------------------------------------------------------
@@ -296,9 +292,14 @@ class product_template(osv.osv):
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=True, select=True),
         'product_manager': fields.many2one('res.users','Product Manager'),
-        'description': fields.text('Description',translate=True),
-        'description_purchase': fields.text('Purchase Description',translate=True),
-        'description_sale': fields.text('Sale Description',translate=True),
+        'description': fields.text('Description',translate=True,
+            help="A precise description of the Product, used only for internal information purposes."),
+        'description_purchase': fields.text('Purchase Description',translate=True,
+            help="A description of the Product that you want to communicate to your suppliers. "
+                 "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."),
+        'description_sale': fields.text('Sale Description',translate=True,
+            help="A description of the Product that you want to communicate to your customers. "
+                 "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
         'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
         'rental': fields.boolean('Can be Rent'),
@@ -401,7 +402,6 @@ class product_template(osv.osv):
             pass
         return super(product_template, self).name_get(cr, user, ids, context)
 
-product_template()
 
 class product_product(osv.osv):
     def view_header_get(self, cr, uid, view_id, view_type, context=None):
@@ -523,6 +523,13 @@ class product_product(osv.osv):
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
+    def _get_name_template_ids(self, cr, uid, ids, context=None):
+        result = set()
+        template_ids = self.pool.get('product.product').search(cr, uid, [('product_tmpl_id', 'in', ids)])
+        for el in template_ids:
+            result.add(el)
+        return list(result)
+
     _defaults = {
         'active': lambda *a: 1,
         'price_extra': lambda *a: 0.0,
@@ -554,7 +561,11 @@ class product_product(osv.osv):
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
-        'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', size=128, store=True, select=True),
+        'name_template': fields.related('product_tmpl_id', 'name', string="Template Name", type='char', size=128, store={
+            'product.template': (_get_name_template_ids, ['name'], 10),
+            'product.product': (lambda self, cr, uid, ids, c=None: ids, [], 10),
+
+            }, select=True),
         'color': fields.integer('Color Index'),
         # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
@@ -753,7 +764,6 @@ class product_product(osv.osv):
             args.append((('categ_id', 'child_of', context['search_default_categ_id'])))
         return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False)
 
-product_product()
 
 class product_packaging(osv.osv):
     _name = "product.packaging"
@@ -819,7 +829,6 @@ class product_packaging(osv.osv):
         return (10 - (sum % 10)) % 10
     checksum = staticmethod(checksum)
 
-product_packaging()
 
 
 class product_supplierinfo(osv.osv):
@@ -893,7 +902,6 @@ class product_supplierinfo(osv.osv):
             res[supplier.id] = price
         return res
     _order = 'sequence'
-product_supplierinfo()
 
 
 class pricelist_partnerinfo(osv.osv):
@@ -905,7 +913,6 @@ class pricelist_partnerinfo(osv.osv):
         'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Product Price'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"),
     }
     _order = 'min_quantity asc'
-pricelist_partnerinfo()
 
 class res_currency(osv.osv):
     _inherit = 'res.currency'
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 00e925fd6a0..bcc0ae838ae 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -88,6 +88,7 @@
                                         <div name="ean">
                                             <field name="ean13" placeholder="e.g. 5901234123457"/>
                                         </div>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                     </group>
                                 </group>
                                 <field name="description" placeholder="describe the product characteristics..."/>
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 641db73ea7d..5dbb2d64a28 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -67,7 +67,7 @@
                         <para style="nospace"><xsl:value-of select="code"/></para>
                     </td>
                     <td>
-                        <para style="nospace" t="1"><xsl:value-of select="price"/> <xsl:value-of select="currency"/></para>
+                        <para style="nospace" t="1"><xsl:value-of select="price"/><xsl:text>  </xsl:text><xsl:value-of select="currency"/></para>
                     </td>
                 </tr>
                 <tr>
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index 8989e97d656..5b5c4ccd834 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -60,6 +60,5 @@ class product_price_list(osv.osv_memory):
             'report_name': 'product.pricelist',
             'datas': datas,
        }
-product_price_list()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index 457b4428522..4d8fd49ec4f 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -74,7 +74,6 @@ class stock_production_lot(osv.osv):
         'removal_date': _get_date('removal_time'),
         'alert_date': _get_date('alert_time'),
     }
-stock_production_lot()
 
 class product_product(osv.osv):
     _inherit = 'product.product'
@@ -88,5 +87,4 @@ class product_product(osv.osv):
         'alert_time': fields.integer('Product Alert Time',
             help='When a new a Serial Number is issued, this is the number of days before an alert should be notified.'),
     }
-product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_manufacturer/product_manufacturer.py b/addons/product_manufacturer/product_manufacturer.py
index fdd25133433..ea7acf66670 100644
--- a/addons/product_manufacturer/product_manufacturer.py
+++ b/addons/product_manufacturer/product_manufacturer.py
@@ -28,7 +28,6 @@ class product_product(osv.osv):
         'manufacturer_pref' : fields.char('Manufacturer Product Code', size=64),
         'attribute_ids': fields.one2many('product.manufacturer.attribute', 'product_id', 'Attributes'),
     }
-product_product()
 
 class product_attribute(osv.osv):
     _name = "product.manufacturer.attribute"
@@ -38,6 +37,5 @@ class product_attribute(osv.osv):
         'value' : fields.char('Value', size=64),
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'),
     }
-product_attribute()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index f9187647f35..1bbfe8c285b 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -128,6 +128,5 @@ class product_product(osv.osv):
             help="Expected margin * 100 / Expected Sale"),
     }
 
-product_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index 6c54bd72be3..7a56ed2e13d 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -81,6 +81,5 @@ class product_margin(osv.osv_memory):
             'search_view_id': id['res_id']
         }
 
-product_margin()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 3928c2e4676..4f8a7b0b9cc 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -33,7 +33,6 @@ class product_pricelist(osv.osv):
          'visible_discount': True,
     }
 
-product_pricelist()
 
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
@@ -95,7 +94,6 @@ class sale_order_line(osv.osv):
                 result['discount'] = 0.0
         return res
 
-sale_order_line()
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
@@ -161,6 +159,5 @@ class account_invoice_line(osv.osv):
                     result['discount']=0.0
         return res
 
-account_invoice_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/company.py b/addons/project/company.py
index 459c24e7b8a..19f40436070 100644
--- a/addons/project/company.py
+++ b/addons/project/company.py
@@ -31,7 +31,6 @@ class res_company(osv.osv):
 "forget to setup the right unit of measure in your employees.",
         ),
     }
-res_company()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/html/Mario-Riva.png b/addons/project/html/Mario-Riva.png
new file mode 100644
index 00000000000..35b030a4265
Binary files /dev/null and b/addons/project/html/Mario-Riva.png differ
diff --git a/addons/project/html/Yoshi-Tashiro.png b/addons/project/html/Yoshi-Tashiro.png
new file mode 100644
index 00000000000..f3457a9088e
Binary files /dev/null and b/addons/project/html/Yoshi-Tashiro.png differ
diff --git a/addons/project/html/index.html b/addons/project/html/index.html
new file mode 100644
index 00000000000..93f1be8a41d
--- /dev/null
+++ b/addons/project/html/index.html
@@ -0,0 +1,197 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Project Management</h2>
+        <h3 class="oe_slogan">Infinitely flexible. Incredibly easy to use. </h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=project">
+                    <img src="project_01.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+OpenERP's collaborative and realtime project management helps your team get
+work done. Keep track of everything, from the big picture to the minute
+details, from the customer contract to the billing.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>  
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_padded">
+        <h2 class="oe_slogan">Designed to fit your own process</h2>
+        <div class="oe_span12">
+            <p>
+Organize projects around your own processes. Work on tasks and issues using the kanban view, schedule tasks using the gantt chart
+and control deadlines in the calendar view. Every project may have it's own stages
+allowing teams to optimize their job.
+            </p>
+        </div>
+        <div class="oe_span4">
+            <h3>Kanban</h3>
+            <div class="oe_row_img oe_centered">
+            <img class="oe_picture oe_screenshot" src="project_kanban.png">
+            </div>
+        </div>
+        <div class="oe_span4 ">
+            <h3>Gantt Charts</h3>
+            <img class="oe_picture oe_screenshot" src="project_gantt.png">
+            </p>
+        </div>
+        <div class="oe_span4 ">
+            <h3>Calendar</h3>
+            <img class="oe_picture oe_screenshot" src="project_calendar.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Easy to use</h2>
+        <div class="oe_span6">
+                <img class="oe_picture oe_screenshot" src="project_easy.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get organized as fast as you can think. The easy-to-use interface takes no time
+to learn, and every action is instantaneous, so there’s nothing standing
+between you and your sweet productive flow.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <h2 class="oe_slogan">Work Together</h2>
+    <h3 class="oe_slogan">Real time chats, document sharing, email integration</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Use open chatter to communicate with your team or customers and share comments
+and documents on tasks and issues. Integrate discussion fast with the email
+integration.
+            </p><p>
+Talk to others users or customers with the live chat feature.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="project_chat.png">
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Collaborative Writing</h2>
+        <h3 class="oe_slogan">The power of etherpad, inside your tasks</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="project_etherpad.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Collaboratively edit the same specifications or meeting minutes right inside the
+application. The incorporated etherpad feature allows several people to work
+on the same tasks, at the same time.
+            </p>
+            <p>
+This is very efficient for scrum meetings, meeting minutes or complex
+specifications. Every user has their own color and you can replay the whole
+creation of the content.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Get Work Done</h2>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get alerts on followed events to stay up to date with what interests you. Use
+instant green/red visual indicators to scan through what has been done and what
+requires your attention.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="project_kpi.png">
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Timesheets, Contracts &amp; Invoicing</h2>
+        <div class="oe_span6">
+            <img class="oe_screenshot oe_picture" src="project_timesheet.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Projects are automatically integrated with customer contracts allowing you to
+invoice based on time &amp; materials and record timesheets easily.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Track Issues</h2>
+        <h3 class="oe_slogan">Support services, helpdesk, bug tracker, etc.</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Single out the issues that arise in a project in order to have a better focus
+on resolving them. Integrate customer interaction on every issue and get
+accurate reports on your team's performance.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="project_illu_01.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP provides essential platform for our project management.
+                    Things are better organized and much more visible with it.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Yoshi-Tashiro.png">
+                    <div class="oe_author">Yoshi Tashiro</div>
+                    <div class="oe_job">Managing Director, <a href="http://www.roomsfor.hk" target="_blank">RoomsFor (Hong Kong)</a></div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    The possibility to link the Project Management to Sales and Manufacturing widely
+                    extends the range of possible applications beyond the needs of service companies.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Mario-Riva.png">
+                    <div class="oe_author">Mario Riva</div>
+                    <div class="oe_job">COO, <a href="http://www.agilebg.com" target="_blank">Agile Business Group</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/project/html/project_01.png b/addons/project/html/project_01.png
new file mode 100644
index 00000000000..0c86a2965d5
Binary files /dev/null and b/addons/project/html/project_01.png differ
diff --git a/addons/project/html/project_calendar.png b/addons/project/html/project_calendar.png
new file mode 100644
index 00000000000..f8c8fca7662
Binary files /dev/null and b/addons/project/html/project_calendar.png differ
diff --git a/addons/project/html/project_chat.png b/addons/project/html/project_chat.png
new file mode 100644
index 00000000000..8cb771e876f
Binary files /dev/null and b/addons/project/html/project_chat.png differ
diff --git a/addons/project/html/project_easy.png b/addons/project/html/project_easy.png
new file mode 100644
index 00000000000..4ffde14b42b
Binary files /dev/null and b/addons/project/html/project_easy.png differ
diff --git a/addons/project/html/project_etherpad.png b/addons/project/html/project_etherpad.png
new file mode 100644
index 00000000000..038b210ee18
Binary files /dev/null and b/addons/project/html/project_etherpad.png differ
diff --git a/addons/project/html/project_gantt.png b/addons/project/html/project_gantt.png
new file mode 100644
index 00000000000..34486b98558
Binary files /dev/null and b/addons/project/html/project_gantt.png differ
diff --git a/addons/project/html/project_illu_01.png b/addons/project/html/project_illu_01.png
new file mode 100644
index 00000000000..4fff4837faa
Binary files /dev/null and b/addons/project/html/project_illu_01.png differ
diff --git a/addons/project/html/project_kanban.png b/addons/project/html/project_kanban.png
new file mode 100644
index 00000000000..c541d3b5d08
Binary files /dev/null and b/addons/project/html/project_kanban.png differ
diff --git a/addons/project/html/project_kpi.png b/addons/project/html/project_kpi.png
new file mode 100644
index 00000000000..c58f8176098
Binary files /dev/null and b/addons/project/html/project_kpi.png differ
diff --git a/addons/project/html/project_timesheet.png b/addons/project/html/project_timesheet.png
new file mode 100644
index 00000000000..d06c3a924ec
Binary files /dev/null and b/addons/project/html/project_timesheet.png differ
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 1743d66e55d..b64662f916b 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-14 06:44+0000\n"
+"PO-Revision-Date: 2013-05-28 06:22+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 04:56+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
+"X-Generator: Launchpad (build 16640)\n"
 
 #. module: project
 #: view:project.project:0
@@ -27,6 +27,8 @@ msgid ""
 "If checked, this contract will be available in the project menu and you will "
 "be able to manage tasks or track issues"
 msgstr ""
+"Если выбрано, этот контракт станет активным в меню проекта, и вы сможете "
+"редактировать задачи или отслеживать проблемы"
 
 #. module: project
 #: field:project.project,progress_rate:0
@@ -217,7 +219,7 @@ msgstr "Предложение контакта"
 #. module: project
 #: help:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Allows you to compute Time Estimation on tasks."
-msgstr ""
+msgstr "Позволяет вычислить расход времени на задачи."
 
 #. module: project
 #: field:report.project.task.user,user_id:0
@@ -913,6 +915,8 @@ msgid ""
 "Provides management of issues/bugs in projects.\n"
 "                This installs the module project_issue."
 msgstr ""
+"Обеспечивает управление проблем / ошибок в проектах.\n"
+"                 Устанавливает модуль project_issue."
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -927,7 +931,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "10"
-msgstr ""
+msgstr "10"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -953,7 +957,7 @@ msgstr "Отменить"
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
-msgstr ""
+msgstr "Прочая информация"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -981,6 +985,8 @@ msgid ""
 "Follow this project to automatically track the events associated to tasks "
 "and issues of this project."
 msgstr ""
+"Позволяет проекту автоматически отслеживать события, связанные с задачами и "
+"проблемами этого проекта."
 
 #. module: project
 #: view:project.task:0
@@ -990,7 +996,7 @@ msgstr "Исполнитель"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Стадия изменена"
 
 #. module: project
 #: view:project.project:0
@@ -1006,7 +1012,7 @@ msgstr "Важное"
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1033,7 +1039,7 @@ msgstr "Общие"
 #: help:project.project,message_ids:0
 #: help:project.task,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: project
 #: view:project.project:0
@@ -1041,6 +1047,8 @@ msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
 msgstr ""
+"Для выставления счета или изменения счета и обновления вариантов, перейти к "
+"соответствующему контракту:"
 
 #. module: project
 #: field:project.task.delegate,state:0
@@ -1097,7 +1105,7 @@ msgstr "Порученные задания"
 #: view:project.task:0
 #: field:project.task,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"
 
 #. module: project
 #: view:project.task:0
@@ -1139,7 +1147,7 @@ msgstr "Показывать только срочные задания"
 #. module: project
 #: model:project.category,name:project.project_category_04
 msgid "Usability"
-msgstr ""
+msgstr "Удобство использования"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1156,7 +1164,7 @@ msgstr "Выполнил(а)"
 #: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"
 
 #. module: project
 #: help:project.task.type,state:0
@@ -1165,6 +1173,9 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"Статус документа автоматически изменяется по выбранному этапу. Например, "
+"если стадия связана со статусом «Закрыть» , когда ваш документ достигает "
+"этой стадии, оно автоматически закрывается."
 
 #. module: project
 #: view:project.task:0
@@ -1174,7 +1185,7 @@ msgstr "Доп. информация"
 #. module: project
 #: view:project.task:0
 msgid "Edit..."
-msgstr ""
+msgstr "Изменить..."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1185,7 +1196,7 @@ msgstr "№ задачи"
 #. module: project
 #: field:project.project,doc_count:0
 msgid "Number of documents attached"
-msgstr ""
+msgstr "Количество прикрепленных документов"
 
 #. module: project
 #: field:project.task,priority:0
@@ -1205,6 +1216,9 @@ msgid ""
 "automatically synchronizedwith Tasks (or optionally Issues if the Issue "
 "Tracker module is installed)."
 msgstr ""
+"Внутренние e-mail, связанный с этим проектом. Входящие письма автоматически "
+"синхронизируются с заданиями (или проблемами, если модуль Issue Tracker "
+"установлен)."
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -1237,7 +1251,7 @@ msgstr "%s (копия)"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_stage
 msgid "Task Stage Changed"
-msgstr ""
+msgstr "Этап задачи изменен"
 
 #. module: project
 #: view:project.task:0
@@ -1269,12 +1283,12 @@ msgstr "Время отсрочки"
 #. module: project
 #: view:project.project:0
 msgid "Team"
-msgstr ""
+msgstr "Группа"
 
 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
-msgstr ""
+msgstr "Установить единицу измерения, используемую в проектах и задачах."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1328,7 +1342,7 @@ msgstr "Заголовок вашего проверочного задания"
 #. module: project
 #: field:project.config.settings,time_unit:0
 msgid "Working time unit"
-msgstr ""
+msgstr "Единица рабочего времени"
 
 #. module: project
 #: view:project.project:0
@@ -1344,7 +1358,7 @@ msgstr "Низкий"
 #. module: project
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #. module: project
 #: view:project.project:0
@@ -1366,7 +1380,7 @@ msgstr "В ожидании"
 #: view:project.category:0
 #: field:project.task,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Теги"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@@ -1386,7 +1400,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,group_manage_delegation_task:0
 msgid "Allows you to delegate tasks to other users."
-msgstr ""
+msgstr "Позволяет делегировать задачи другим пользователям."
 
 #. module: project
 #: field:project.project,active:0
@@ -1415,7 +1429,7 @@ msgstr ""
 #. module: project
 #: view:project.config.settings:0
 msgid "Helpdesk & Support"
-msgstr ""
+msgstr "Поддержка"
 
 #. module: project
 #: help:report.project.task.user,opening_days:0
@@ -1441,7 +1455,7 @@ msgstr ""
 #: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
-msgstr ""
+msgstr "Вложения"
 
 #. module: project
 #: view:project.task:0
@@ -1464,6 +1478,8 @@ msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
 "project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
+"Вы не можете удалить проект, содержащий задачи. Вы можете либо удалить все "
+"задачи проекта, а затем удалить проект или просто сделать проект неактивным."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1474,7 +1490,7 @@ msgstr "Открытые"
 #. module: project
 #: field:project.project,privacy_visibility:0
 msgid "Privacy / Visibility"
-msgstr ""
+msgstr "Безопасность/Видимость"
 
 #. module: project
 #: view:project.task:0
@@ -1488,7 +1504,7 @@ msgstr "Оставшееся время"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Этап изменен"
 
 #. module: project
 #: constraint:project.task:0
@@ -1521,7 +1537,7 @@ msgstr "Общее время"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1586,12 +1602,12 @@ msgstr "Назначить на"
 #. module: project
 #: model:res.groups,name:project.group_time_work_estimation_tasks
 msgid "Time Estimation on Tasks"
-msgstr ""
+msgstr "Оценка времени на задачи"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total"
-msgstr ""
+msgstr "Всего"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1601,7 +1617,7 @@ msgstr "Поручить ваше задание другому пользова
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_started
 msgid "Task started"
-msgstr ""
+msgstr "Задание начато"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -1614,6 +1630,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей на этой стадии для отображения."
 
 #. module: project
 #: view:project.task:0
@@ -1643,7 +1661,7 @@ msgstr "Проекты в ожидании"
 #. module: project
 #: view:project.task:0
 msgid "Remaining"
-msgstr ""
+msgstr "Осталось"
 
 #. module: project
 #: field:project.task,progress:0
@@ -1672,17 +1690,17 @@ msgstr ""
 #. module: project
 #: field:project.config.settings,module_project_issue:0
 msgid "Track issues and bugs"
-msgstr ""
+msgstr "Отслеживание проблем и ошибок"
 
 #. module: project
 #: field:project.config.settings,module_project_mrp:0
 msgid "Generate tasks from sale orders"
-msgstr ""
+msgstr "Создание задач из заказов"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Task Stages"
-msgstr ""
+msgstr "Этапы задач"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -1693,7 +1711,7 @@ msgstr "Определить требования и установить зап
 #: field:project.project,message_ids:0
 #: field:project.task,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: project
 #: field:project.project,color:0
@@ -1752,17 +1770,17 @@ msgstr "Дата окончания"
 #. module: project
 #: field:project.task.type,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Связанный статус"
 
 #. module: project
 #: view:project.project:0
 msgid "Documents"
-msgstr ""
+msgstr "Документы"
 
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_new
 msgid "Task created"
-msgstr ""
+msgstr "Задача создана"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1774,7 +1792,7 @@ msgstr "# дней"
 #: field:project.project,message_follower_ids:0
 #: field:project.task,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: project
 #: selection:project.project,state:0
@@ -1812,7 +1830,7 @@ msgstr "Проверка задания"
 #. module: project
 #: field:project.config.settings,module_project_long_term:0
 msgid "Manage resources planning on gantt view"
-msgstr ""
+msgstr "Управление планированием ресурсов на диаграмме Ганта"
 
 #. module: project
 #: view:project.task:0
@@ -1871,7 +1889,7 @@ msgstr "Проекты"
 #. module: project
 #: model:res.groups,name:project.group_tasks_work_on_tasks
 msgid "Task's Work on Tasks"
-msgstr ""
+msgstr "Задачи, работающие на задачи"
 
 #. module: project
 #: help:project.task.delegate,name:0
@@ -1914,7 +1932,7 @@ msgstr "Декабрь"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: project
 #: help:project.config.settings,module_project_mrp:0
@@ -1938,7 +1956,7 @@ msgstr ""
 #. module: project
 #: model:project.category,name:project.project_category_03
 msgid "Experiment"
-msgstr ""
+msgstr "Эксперимент"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1998,7 +2016,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_config_settings
 #: view:project.config.settings:0
 msgid "Configure Project"
-msgstr ""
+msgstr "Настроить проект"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -2030,7 +2048,7 @@ msgstr "Пожалуйста, сначала удалите проект, ссы
 #: model:mail.message.subtype,name:project.mt_project_task_new
 #: model:mail.message.subtype,name:project.mt_task_new
 msgid "Task Created"
-msgstr ""
+msgstr "Задание создано"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -2048,12 +2066,12 @@ msgstr "Проекты, в которых я менеджер"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready for next stage"
-msgstr ""
+msgstr "Готово к следующей стадии"
 
 #. module: project
 #: field:project.task.type,case_default:0
 msgid "Default for New Projects"
-msgstr ""
+msgstr "По умолчанию для нового проекта"
 
 #. module: project
 #: view:project.task:0
@@ -2098,7 +2116,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_closed
 msgid "Task closed"
-msgstr ""
+msgstr "Задание закрыто"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -2130,13 +2148,13 @@ msgstr ""
 #. module: project
 #: selection:project.project,privacy_visibility:0
 msgid "Followers Only"
-msgstr ""
+msgstr "Только для подписчиков"
 
 #. module: project
 #: view:board.board:0
 #: field:project.project,task_count:0
 msgid "Open Tasks"
-msgstr ""
+msgstr "Открытые задачи"
 
 #. module: project
 #: field:project.project,priority:0
diff --git a/addons/project/i18n/th.po b/addons/project/i18n/th.po
new file mode 100644
index 00000000000..7dfd58eee63
--- /dev/null
+++ b/addons/project/i18n/th.po
@@ -0,0 +1,2109 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2013-05-15 07:02+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: project
+#: view:project.project:0
+msgid "Email Interface"
+msgstr ""
+
+#. module: project
+#: help:account.analytic.account,use_tasks:0
+msgid ""
+"If checked, this contract will be available in the project menu and you will "
+"be able to manage tasks or track issues"
+msgstr ""
+
+#. module: project
+#: field:project.project,progress_rate:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_taskbydelegate0
+msgid "Task by delegate"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Parent"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.dblc_proj
+msgid "Project's tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_openpendingtask0
+msgid "Set pending"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "New Project Based on Template"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,day:0
+msgid "Day"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_merge
+msgid "Merge"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "Start Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:932
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_unread:0
+#: help:project.task,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_donetask0
+msgid "Done task"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_donetask0
+msgid "Task is Completed"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_testing
+msgid "Testing"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Manage time estimation on tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_summary:0
+#: help:project.task,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1318
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_manage_delegation_task:0
+msgid "Allow task delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_planned:0
+msgid "Planned Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Reset as Project"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,progress_rate:0
+msgid "Percent of tasks closed according to the total of tasks todo."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.client,name:project.action_client_project_menu
+msgid "Open Project Menu"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.action_project_task_user_tree
+msgid ""
+"This report allows you to analyse the performance of your projects and "
+"users. You can analyse the quantities of tasks, the hours spent compared to "
+"the planned hours, the average number of days to open or close a task, etc."
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task Title"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_delegate_task
+msgid "Task Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.project,planned_hours:0
+#: field:project.task.history,planned_hours:0
+#: field:project.task.history.cumulative,planned_hours:0
+msgid "Planned Time"
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Public"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_01
+msgid "Contact's suggestion"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_time_work_estimation_tasks:0
+msgid "Allows you to compute Time Estimation on tasks."
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_delegate0
+#: view:project.task:0
+msgid "Delegate"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_view_template_project
+#: view:project.project:0
+msgid "Templates of Projects"
+msgstr ""
+
+#. module: project
+#: field:project.project,analytic_account_id:0
+msgid "Contract/Analytic"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Project Management"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_delegate
+#: view:project.task.delegate:0
+msgid "Project Task Delegate"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Support"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Member"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Cancel Task"
+msgstr ""
+
+#. module: project
+#: help:project.project,members:0
+msgid ""
+"Project's members are users who can have an access to the tasks related to "
+"this project."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.task,manager_id:0
+msgid "Project Manager"
+msgstr ""
+
+#. module: project
+#: field:project.project,state:0
+#: field:project.task,state:0
+#: field:project.task.history,state:0
+#: field:project.task.history.cumulative,state:0
+#: field:report.project.task.user,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "August"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,complete_name:0
+msgid "Project Name"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "June"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "October"
+msgstr ""
+
+#. module: project
+#: help:project.project,total_hours:0
+msgid ""
+"Sum of total hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: help:project.project,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the project "
+"without removing it."
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_opendonetask0
+msgid "When task is completed, it will come into the done state."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_summary:0
+#: field:project.task,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Append this project to another one using analytic accounts hierarchy"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "In Progress Tasks"
+msgstr ""
+
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid ""
+"This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), "
+"don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
+#. module: project
+#: field:project.task,user_id:0
+#: view:report.project.task.user:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1021
+#, python-format
+msgid "Delegated User should be specified"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project(s) Manager"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Reactivate"
+msgstr ""
+
+#. module: project
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_reevaluate
+msgid "Re-evaluate Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Validate planned time"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_pad:0
+msgid "Use integrated collaborative note pads on task"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_opentask0
+msgid "Encode your working hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "oe_kanban_text_red"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegation"
+msgstr ""
+
+#. module: project
+#: field:project.task,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to open state"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_delegate
+msgid "Task Delegate"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Project Settings"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My tasks"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_opendonetask0
+msgid "Open Done Task"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,planned_hours_me:0
+msgid "Hours to Validate"
+msgstr ""
+
+#. module: project
+#: help:project.task,remaining_hours:0
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "March"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: model:ir.actions.act_window,name:project.my_open_tasks_action
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "My Tasks"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Pending tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "_Evaluate"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,opening_days:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Very urgent"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,project_id:0
+#: help:project.task.delegate,user_id:0
+msgid "User you want to delegate this task to"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Set as Template"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task
+#: view:project.config.settings:0
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,task_id:0
+#: field:project.task.history.cumulative,task_id:0
+#: field:project.task.work,task_id:0
+#: view:report.project.task.user:0
+msgid "Task"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Allows you to compute work on tasks."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Administration"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,group_tasks_work_on_tasks:0
+msgid "Log work activities on tasks"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_analysis
+msgid "Analysis"
+msgstr ""
+
+#. module: project
+#: field:project.task,name:0
+#: field:report.project.task.user,name:0
+msgid "Task Summary"
+msgstr ""
+
+#. module: project
+#: field:project.task,active:0
+msgid "Not a Template Task"
+msgstr ""
+
+#. module: project
+#: field:project.task,planned_hours:0
+msgid "Initially Planned Hours"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_delegate0
+msgid "Delegates tasks to the other user"
+msgstr ""
+
+#. module: project
+#: help:project.task,effective_hours:0
+msgid "Computed using the sum of the task work done."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  Click to start a new project.\n"
+"                </p><p>\n"
+"                  Projects are used to organize your activities; plan\n"
+"                  tasks, track issues, invoice timesheets. You can define\n"
+"                  internal projects (R&amp;D, Improve Sales Process),\n"
+"                  private projects (My Todos) or customer ones.\n"
+"                </p><p>\n"
+"                  You will be able collaborate with internal users on\n"
+"                  projects or invite customers to share your activities.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Planning"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,date_deadline:0
+#: field:report.project.task.user,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Ready"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "New Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue_sheet:0
+msgid "Invoice working time on issues"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_specification
+msgid "Specification"
+msgstr ""
+
+#. module: project
+#: model:process.transition,note:project.process_transition_draftopentask0
+msgid "From draft state, it will come into the open state."
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Task's Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
+msgstr ""
+
+#. module: project
+#: field:report.project.task.user,delay_endings_days:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "New tasks"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Medium"
+msgstr ""
+
+#. module: project
+#: field:project.project,total_hours:0
+msgid "Total Time"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,stage_id:0
+#: field:project.task.history,type_id:0
+#: field:project.task.history.cumulative,type_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project
+#: model:process.transition,name:project.process_transition_draftopentask0
+msgid "Draft Open task"
+msgstr ""
+
+#. module: project
+#: field:project.project,alias_model:0
+msgid "Alias Model"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,closing_days:0
+msgid "Number of Days to close the task"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_task_type_form
+msgid "Stages"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "Delete"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "In progress"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "September"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,priority:0
+msgid "Urgent"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_02
+msgid "Feature request"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Delegated tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_work
+msgid "Project Task Work"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:81
+#, python-format
+msgid "CHECK: %s"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Close Project"
+msgstr ""
+
+#. module: project
+#: field:project.project,tasks:0
+msgid "Task Activities"
+msgstr ""
+
+#. module: project
+#: field:project.project,effective_hours:0
+#: field:project.task.work,hours:0
+msgid "Time Spent"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+msgid "í"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,company_uom_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_is_follower:0
+#: field:project.task,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_tasks_config
+msgid "GTD"
+msgstr ""
+
+#. module: project
+#: help:project.task,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,date:0
+#: field:project.task.history.cumulative,date:0
+#: field:project.task.work,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue:0
+msgid ""
+"Provides management of issues/bugs in projects.\n"
+"                This installs the module project_issue."
+msgstr ""
+
+#. module: project
+#: help:project.task,kanban_state:0
+msgid ""
+"A task's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this task\n"
+" * Ready for next stage indicates the task is ready to be pulled to the next "
+"stage"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "10"
+msgstr ""
+
+#. module: project
+#: help:project.project,analytic_account_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftcanceltask0
+#: model:process.transition.action,name:project.process_transition_action_opencanceltask0
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Other Info"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "_Delegate"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Very Low"
+msgstr ""
+
+#. module: project
+#: help:project.project,effective_hours:0
+msgid ""
+"Sum of spent hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"Follow this project to automatically track the events associated to tasks "
+"and issues of this project."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Users"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_task_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Important"
+msgstr ""
+
+#. module: project
+#: field:project.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "November"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluate Task"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_type
+#: view:project.task.type:0
+msgid "Task Stage"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Common"
+msgstr ""
+
+#. module: project
+#: help:project.project,message_ids:0
+#: help:project.task,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid ""
+"To invoice or setup invoicing and renewal options, go to the related "
+"contract:"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,state:0
+msgid "Validation State"
+msgstr ""
+
+#. module: project
+#: field:project.task.work,name:0
+msgid "Work summary"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: view:report.project.task.user:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+msgid "Template"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Re-open project"
+msgstr ""
+
+#. module: project
+#: help:project.project,priority:0
+msgid "Gives the sequence order when displaying the list of projects"
+msgstr ""
+
+#. module: project
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project
+#: field:project.project,members:0
+msgid "Project Members"
+msgstr ""
+
+#. module: project
+#: field:project.task,child_ids:0
+msgid "Delegated Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: field:project.project,message_unread:0
+#: view:project.task:0
+#: field:project.task,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,parent_ids:0
+msgid "Parent Tasks"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_opentask0
+msgid "Open task"
+msgstr ""
+
+#. module: project
+#: view:project.task.type:0
+msgid "Stages common to all projects"
+msgstr ""
+
+#. module: project
+#: model:process.node,name:project.process_node_drafttask0
+msgid "Draft task"
+msgstr ""
+
+#. module: project
+#: field:project.task,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Pending Tasks"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Show only tasks having a deadline"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_04
+msgid "Usability"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr ""
+
+#. module: project
+#: field:project.task.work,user_id:0
+msgid "Done by"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:181
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: project
+#: help:project.task.type,state:0
+msgid ""
+"The status of your document is automatically changed regarding the selected "
+"stage. For example, if a stage is related to the status 'Close', when your "
+"document reaches this stage, it is automatically closed."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Edit..."
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,nbr:0
+msgid "# of tasks"
+msgstr ""
+
+#. module: project
+#: field:project.project,doc_count:0
+msgid "Number of documents attached"
+msgstr ""
+
+#. module: project
+#: field:project.task,priority:0
+#: field:report.project.task.user,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Open Projects"
+msgstr ""
+
+#. module: project
+#: help:project.project,alias_id:0
+msgid ""
+"Internal email associated with this project. Incoming emails are "
+"automatically synchronizedwith Tasks (or optionally Issues if the Issue "
+"Tracker module is installed)."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a stage in the task pipeline.\n"
+"              </p><p>\n"
+"                Define the steps that will be used in the project from the\n"
+"                creation of the task, up to the closing of the task or "
+"issue.\n"
+"                You will use these stages in order to track the progress in\n"
+"                solving a task or an issue.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: help:project.task,total_hours:0
+msgid "Computed as: Time Spent + Remaining Time."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task.history,remaining_hours:0
+#: field:project.task.history.cumulative,remaining_hours:0
+msgid "Remaining Time"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,name:0
+msgid "Delegated Title"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "July"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_reevaluate
+msgid "project.task.reevaluate"
+msgstr ""
+
+#. module: project
+#: field:project.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Team"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,time_unit:0
+msgid "This will set the unit of measure used in projects and tasks."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_design
+msgid "Design"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Start Date"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: view:project.task.history.cumulative:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: project
+#: help:project.task,progress:0
+msgid ""
+"If the task has a progress of 99.99% you should close the task if it's "
+"finished or reevaluate the time"
+msgstr ""
+
+#. module: project
+#: field:project.task,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,prefix:0
+msgid "Title for your validation task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,time_unit:0
+msgid "Working time unit"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a member."
+msgstr ""
+
+#. module: project
+#: selection:project.task,priority:0
+#: selection:report.project.task.user,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.project_category_action
+#: model:ir.ui.menu,name:project.menu_project_category_act
+#: view:project.category:0
+#: field:project.task,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_task_history
+#: model:ir.model,name:project.model_project_task_history_cumulative
+msgid "History of Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,state:0
+msgid ""
+"New state of your own task. Pending will be reopened automatically when the "
+"delegated task is closed"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,group_manage_delegation_task:0
+msgid "Allows you to delegate tasks to other users."
+msgstr ""
+
+#. module: project
+#: field:project.project,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_category
+msgid "Category of project's task, issue, ..."
+msgstr ""
+
+#. module: project
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project
+#: help:project.task,delay_hours:0
+msgid ""
+"Computed as difference between planned hours by the project manager and the "
+"total hours of the task."
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+msgid "Helpdesk & Support"
+msgstr ""
+
+#. module: project
+#: help:report.project.task.user,opening_days:0
+msgid "Number of Days to Open the task"
+msgstr ""
+
+#. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: project
+#: help:project.task,planned_hours:0
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:220
+#, python-format
+msgid "Attachments"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.delegate,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_deployment
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+#: selection:report.project.task.user,state:0
+#: view:res.partner:0
+msgid "Done"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:182
+#, python-format
+msgid ""
+"You cannot delete a project containing tasks. You can either delete all the "
+"project's tasks and then delete the project or simply deactivate the project."
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_draftopentask0
+#: view:project.project:0
+msgid "Open"
+msgstr ""
+
+#. module: project
+#: field:project.project,privacy_visibility:0
+msgid "Privacy / Visibility"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,remaining_hours:0
+#: field:project.task.reevaluate,remaining_hours:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,remaining_hours:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
+#. module: project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+
+#. module: project
+#: field:project.task.history,user_id:0
+#: field:project.task.history.cumulative,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Search Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Delegated Task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,total_hours:0
+msgid "Total Hours"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: project
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
+msgstr ""
+
+#. module: project
+#: help:project.task,active:0
+msgid ""
+"This field is computed automatically and have the same behavior than the "
+"boolean 'active' field: if the task is linked to a template or unactivated "
+"project, it will be hidden unless specifically asked."
+msgstr ""
+
+#. module: project
+#: model:res.request.link,name:project.req_link_task
+msgid "Project task"
+msgstr ""
+
+#. module: project
+#: field:project.task,effective_hours:0
+msgid "Hours Spent"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_pad:0
+msgid ""
+"Lets the company customize which Pad installation should be used to link to "
+"new pads\n"
+"                (by default, http://ietherpad.com/).\n"
+"                This installs the module pad."
+msgstr ""
+
+#. module: project
+#: field:project.task,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft
+msgid "Overpassed Tasks"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:932
+#, python-format
+msgid ""
+"Child task still open.\n"
+"Please cancel or complete child task first."
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_time_work_estimation_tasks
+msgid "Time Estimation on Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.task,total_hours:0
+msgid "Total"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_taskbydelegate0
+msgid "Delegate your task to the other user"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
+#. module: project
+#: help:project.task.reevaluate,remaining_hours:0
+msgid "Put here the remaining hours required to close the task."
+msgstr ""
+
+#. module: project
+#: help:project.task.type,fold:0
+msgid ""
+"This stage is not visible, for example in status bar or kanban view, when "
+"there are no records in that stage to display."
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Deadlines"
+msgstr ""
+
+#. module: project
+#: code:addons/project/wizard/project_task_delegate.py:69
+#: code:addons/project/wizard/project_task_delegate.py:70
+#: code:addons/project/wizard/project_task_delegate.py:77
+#: code:addons/project/wizard/project_task_delegate.py:78
+#, python-format
+msgid "CHECK: "
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:432
+#, python-format
+msgid "You must assign members on the project '%s' !"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Pending Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Remaining"
+msgstr ""
+
+#. module: project
+#: field:project.task,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project
+#: field:project.task,company_id:0
+#: field:project.task.work,company_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_timesheet:0
+msgid ""
+"This allows you to transfer the entries under tasks defined for Project "
+"Management to\n"
+"                the timesheet line entries for particular date and user, "
+"with the effect of creating,\n"
+"                editing and deleting either ways.\n"
+"                This installs the module project_timesheet."
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_issue:0
+msgid "Track issues and bugs"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_mrp:0
+msgid "Generate tasks from sale orders"
+msgstr ""
+
+#. module: project
+#: model:ir.ui.menu,name:project.menu_task_types_view
+msgid "Task Stages"
+msgstr ""
+
+#. module: project
+#: model:process.node,note:project.process_node_drafttask0
+msgid "Define the Requirements and Set Planned Hours."
+msgstr ""
+
+#. module: project
+#: field:project.project,message_ids:0
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project
+#: field:project.project,color:0
+#: field:project.task,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.open_board_project
+#: model:ir.model,name:project.model_project_project
+#: model:ir.ui.menu,name:project.menu_project_dashboard
+#: model:ir.ui.menu,name:project.menu_project_management
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task,project_id:0
+#: field:project.task.delegate,project_id:0
+#: field:project.task.history.cumulative,project_id:0
+#: view:report.project.task.user:0
+#: field:report.project.task.user,project_id:0
+#: model:res.request.link,name:project.req_link_project
+msgid "Project"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: model:project.task.type,name:project.project_tt_cancel
+#: selection:project.task.type,state:0
+#: selection:report.project.task.user,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,help:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new task.\n"
+"              </p><p>\n"
+"                OpenERP's project management allows you to manage the "
+"pipeline\n"
+"                of tasks in order to get things done efficiently. You can\n"
+"                track progress, discuss on tasks, attach documents, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project
+#: field:project.task,date_end:0
+#: field:report.project.task.user,date_end:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,state:0
+msgid "Related Status"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Documents"
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,no_of_days:0
+msgid "# of Days"
+msgstr ""
+
+#. module: project
+#: field:project.project,message_follower_ids:0
+#: field:project.task,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: project
+#: selection:project.project,state:0
+#: view:project.task:0
+#: selection:project.task,state:0
+#: selection:project.task.history,state:0
+#: selection:project.task.history.cumulative,state:0
+#: selection:project.task.type,state:0
+#: view:report.project.task.user:0
+msgid "New"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_view_task_history_cumulative
+#: model:ir.ui.menu,name:project.menu_action_view_task_history_cumulative
+msgid "Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "OverPass delay"
+msgstr ""
+
+#. module: project
+#: view:project.task.delegate:0
+msgid "Validation Task"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_long_term:0
+msgid "Manage resources planning on gantt view"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Unassigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.project,planned_hours:0
+msgid ""
+"Sum of planned hours of all tasks related to this project and its child "
+"projects."
+msgstr ""
+
+#. module: project
+#: view:res.partner:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "My Task"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+#: view:report.project.task.user:0
+msgid "My Projects"
+msgstr ""
+
+#. module: project
+#: help:project.task,sequence:0
+msgid "Gives the sequence order when displaying a list of tasks."
+msgstr ""
+
+#. module: project
+#: field:project.task,date_start:0
+#: field:report.project.task.user,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:398
+#: model:ir.actions.act_window,name:project.open_view_project_all
+#: model:ir.ui.menu,name:project.menu_projects
+#: view:project.project:0
+#: field:project.task.type,project_ids:0
+#: view:res.company:0
+#, python-format
+msgid "Projects"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_tasks_work_on_tasks
+msgid "Task's Work on Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,name:0
+msgid "New title of the task delegated to the user"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_project_task_user_tree
+#: model:ir.ui.menu,name:project.menu_project_task_user_tree
+#: view:report.project.task.user:0
+msgid "Tasks Analysis"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.history.cumulative:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: project
+#: field:account.analytic.account,use_tasks:0
+#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
+#: model:ir.actions.act_window,name:project.action_view_task
+#: model:ir.ui.menu,name:project.menu_action_view_task
+#: model:process.process,name:project.process_process_tasksprocess0
+#: view:project.project:0
+#: view:project.task:0
+#: view:res.partner:0
+#: field:res.partner,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "December"
+msgstr ""
+
+#. module: project
+#: view:project.config.settings:0
+#: view:project.task.delegate:0
+#: view:project.task.reevaluate:0
+msgid "or"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_mrp:0
+msgid ""
+"This feature automatically creates project tasks from service products in "
+"sale orders.\n"
+"                More precisely, tasks are created for procurement lines with "
+"product of type 'Service',\n"
+"                procurement method 'Make to Order', and supply method "
+"'Manufacture'.\n"
+"                This installs the module project_mrp."
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours:0
+msgid "Estimated time to close this task by the delegated user"
+msgstr ""
+
+#. module: project
+#: model:project.category,name:project.project_category_03
+msgid "Experiment"
+msgstr ""
+
+#. module: project
+#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
+#: selection:report.project.task.user,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project
+#: field:project.task,kanban_state:0
+#: field:project.task.history,kanban_state:0
+#: field:project.task.history.cumulative,kanban_state:0
+msgid "Kanban State"
+msgstr ""
+
+#. module: project
+#: field:project.config.settings,module_project_timesheet:0
+msgid "Record timesheet lines per tasks"
+msgstr ""
+
+#. module: project
+#: model:ir.model,name:project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr ""
+
+#. module: project
+#: field:res.company,project_time_mode_id:0
+msgid "Project Time Unit"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Normal"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,closing_days:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project
+#: model:res.groups,name:project.group_project_user
+msgid "User"
+msgstr ""
+
+#. module: project
+#: help:project.project,alias_model:0
+msgid ""
+"The kind of document created when an email is received on this project's "
+"email alias"
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.action_config_settings
+#: view:project.config.settings:0
+msgid "Configure Project"
+msgstr ""
+
+#. module: project
+#: view:project.task.history.cumulative:0
+msgid "Tasks's Cumulative Flow"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "January"
+msgstr ""
+
+#. module: project
+#: field:project.task.delegate,prefix:0
+msgid "Your Task Title"
+msgstr ""
+
+#. module: project
+#: view:project.task.reevaluate:0
+msgid "Reevaluation Task"
+msgstr ""
+
+#. module: project
+#: code:addons/project/project.py:1318
+#, python-format
+msgid "Please delete the project linked with this account first."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+msgid "Non Assigned Tasks to users"
+msgstr ""
+
+#. module: project
+#: view:project.project:0
+msgid "Projects in which I am a manager"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: selection:project.task,kanban_state:0
+#: selection:project.task.history,kanban_state:0
+#: selection:project.task.history.cumulative,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
+
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: field:project.task,description:0
+#: field:project.task.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "May"
+msgstr ""
+
+#. module: project
+#: help:project.task.type,case_default:0
+msgid ""
+"If you check this field, this stage will be proposed by default on each new "
+"project. It will not assign this stage to existing projects."
+msgstr ""
+
+#. module: project
+#: field:project.task,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_long_term:0
+msgid ""
+"A long term project management module that tracks planning, scheduling, and "
+"resource allocation.\n"
+"                This installs the module project_long_term."
+msgstr ""
+
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
+#. module: project
+#: selection:report.project.task.user,month:0
+msgid "April"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Spent Hours"
+msgstr ""
+
+#. module: project
+#: help:project.project,sequence:0
+msgid "Gives the sequence order when displaying a list of Projects."
+msgstr ""
+
+#. module: project
+#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
+msgid "Assigned Tasks"
+msgstr ""
+
+#. module: project
+#: help:project.config.settings,module_project_issue_sheet:0
+msgid ""
+"Provides timesheet support for the issues/bugs management in project.\n"
+"                This installs the module project_issue_sheet."
+msgstr ""
+
+#. module: project
+#: selection:project.project,privacy_visibility:0
+msgid "Followers Only"
+msgstr ""
+
+#. module: project
+#: view:board.board:0
+#: field:project.project,task_count:0
+msgid "Open Tasks"
+msgstr ""
+
+#. module: project
+#: field:project.project,priority:0
+#: field:project.project,sequence:0
+#: field:project.task,sequence:0
+#: field:project.task.type,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+#: view:project.task.work:0
+msgid "Task Work"
+msgstr ""
+
+#. module: project
+#: help:project.task.delegate,planned_hours_me:0
+msgid ""
+"Estimated time for you to validate the work done by the user to whom you "
+"delegate this task"
+msgstr ""
+
+#. module: project
+#: view:report.project.task.user:0
+#: field:report.project.task.user,year:0
+msgid "Year"
+msgstr ""
+
+#. module: project
+#: field:project.project,type_ids:0
+#: view:project.task.type:0
+msgid "Tasks Stages"
+msgstr ""
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml
index 4a73bfd00d1..9955fe1ffe1 100644
--- a/addons/project/process/task_process.xml
+++ b/addons/project/process/task_process.xml
@@ -68,24 +68,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Delegate&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Delegates tasks to the other user&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_drafttask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_taskbydelegate0"/>
+            <field name="target_node_id" ref="process_node_drafttask0"/>
+            <field name="source_node_id" ref="process_node_taskbydelegate0"/>
         </record>
 
         <record id="process_transition_draftopentask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Draft Open task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;From draft state, it will come into the open state.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_opentask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_drafttask0"/>
+            <field name="target_node_id" ref="process_node_opentask0"/>
+            <field name="source_node_id" ref="process_node_drafttask0"/>
         </record>
 
         <record id="process_transition_opendonetask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Open Done Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;When task is completed, it will come into the done state.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_donetask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_opentask0"/>
+            <field name="target_node_id" ref="process_node_donetask0"/>
+            <field name="source_node_id" ref="process_node_opentask0"/>
         </record>
 
 
diff --git a/addons/project/project.py b/addons/project/project.py
index 0751865d9c4..28e4bd6e5d2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -85,7 +85,7 @@ class project(osv.osv):
         if context and context.get('user_preference'):
                 cr.execute("""SELECT project.id FROM project_project project
                            LEFT JOIN account_analytic_account account ON account.id = project.analytic_account_id
-                           LEFT JOIN project_user_rel rel ON rel.project_id = project.analytic_account_id
+                           LEFT JOIN project_user_rel rel ON rel.project_id = project.id
                            WHERE (account.user_id = %s or rel.uid = %s)"""%(user, user))
                 return [(r[0]) for r in cr.fetchall()]
         return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order,
@@ -198,8 +198,12 @@ class project(osv.osv):
         return res
         
     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
+        if context is None:
+            context = {}
         res = dict.fromkeys(ids, 0)
-        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
+        ctx = context.copy()
+        ctx['active_test'] = False
+        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)], context=ctx)
         for task in self.pool.get('project.task').browse(cr, uid, task_ids, context):
             res[task.project_id.id] += 1
         return res
@@ -208,6 +212,12 @@ class project(osv.osv):
         """Overriden in project_issue to offer more options"""
         return [('project.task', "Tasks")]
 
+    def _get_visibility_selection(self, cr, uid, context=None):
+        """ Overriden in portal_project to offer more options """
+        return [('public', 'Public'),
+                ('employees', 'Employees Only'),
+                ('followers', 'Followers Only')]
+
     def attachment_tree_view(self, cr, uid, ids, context):
         task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
         domain = [
@@ -229,6 +239,8 @@ class project(osv.osv):
         }
     # Lambda indirection method to avoid passing a copy of the overridable method when declaring the field
     _alias_models = lambda self, *args, **kwargs: self._get_alias_models(*args, **kwargs)
+    _visibility_selection = lambda self, *args, **kwargs: self._get_visibility_selection(*args, **kwargs)
+
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the project without removing it."),
@@ -267,7 +279,17 @@ class project(osv.osv):
                                          "with Tasks (or optionally Issues if the Issue Tracker module is installed)."),
         'alias_model': fields.selection(_alias_models, "Alias Model", select=True, required=True,
                                         help="The kind of document created when an email is received on this project's email alias"),
-        'privacy_visibility': fields.selection([('public','All Users'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
+        'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True,
+            help="Holds visibility of the tasks or issues that belong to the current project:\n"
+                    "- Public: everybody sees everything; if portal is activated, portal users\n"
+                    "   see all tasks or issues; if anonymous portal is activated, visitors\n"
+                    "   see all tasks or issues\n"
+                    "- Portal (only available if Portal is installed): employees see everything;\n"
+                    "   if portal is activated, portal users see the tasks or issues followed by\n"
+                    "   them or by someone of their company\n"
+                    "- Employees Only: employees see all tasks or issues\n"
+                    "- Followers Only: employees see only the followed tasks or issues; if portal\n"
+                    "   is activated, portal users see the followed tasks or issues."),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
         'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
      }
@@ -285,8 +307,7 @@ class project(osv.osv):
         'sequence': 10,
         'type_ids': _get_type_common,
         'alias_model': 'project.task',
-        'privacy_visibility': 'public',
-        'alias_domain': False, # always hide alias during creation
+        'privacy_visibility': 'employees',
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -429,7 +450,7 @@ class project(osv.osv):
 
         for project in projects:
             if (not project.members) and force_members:
-                raise osv.except_osv(_('Warning!'),_("You must assign members on the project '%s' !") % (project.name,))
+                raise osv.except_osv(_('Warning!'),_("You must assign members on the project '%s'!") % (project.name,))
 
         resource_pool = self.pool.get('resource.resource')
 
@@ -531,11 +552,11 @@ def Project():
         context = dict(context, project_creation_in_progress=True)
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id') and vals.get('name', False):
-            vals.pop('alias_name', None) # prevent errors during copy()
+            alias_name = vals.pop('alias_name', None) # prevent errors during copy()
             alias_id = mail_alias.create_unique_alias(cr, uid,
                           # Using '+' allows using subaddressing for those who don't
                           # have a catchall domain setup.
-                          {'alias_name': "project+"+short_name(vals['name'])},
+                          {'alias_name': alias_name or "project+"+short_name(vals['name'])},
                           model_name=vals.get('alias_model', 'project.task'),
                           context=context)
             vals['alias_id'] = alias_id
@@ -560,12 +581,12 @@ class task(base_stage, osv.osv):
 
     _track = {
         'state': {
-            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
+            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
             'project.mt_task_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
             'project.mt_task_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
         },
         'stage_id': {
-            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'done', 'open'],
+            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'done', 'open'],
         },
         'kanban_state': {  # kanban state: tracked, but only block subtype
             'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
@@ -732,7 +753,7 @@ class task(base_stage, osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
-                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
+                        domain="[('project_ids', '=', project_id)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -889,6 +910,12 @@ class task(base_stage, osv.osv):
                 res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
         return res
 
+    def get_empty_list_help(self, cr, uid, help, context=None):
+        context['empty_list_help_id'] = context.get('default_project_id')
+        context['empty_list_help_model'] = 'project.project'
+        context['empty_list_help_document_name'] = _("tasks")
+        return super(task, self).get_empty_list_help(cr, uid, help, context=context)
+
     # ----------------------------------------
     # Case management
     # ----------------------------------------
@@ -929,7 +956,7 @@ class task(base_stage, osv.osv):
             if task.child_ids:
                 for child in task.child_ids:
                     if child.state in ['draft', 'open', 'pending']:
-                        raise osv.except_osv(_("Warning !"), _("Child task still open.\nPlease cancel or complete child task first."))
+                        raise osv.except_osv(_("Warning!"), _("Child task still open.\nPlease cancel or complete child task first."))
         return True
 
     def action_close(self, cr, uid, ids, context=None):
@@ -1093,10 +1120,12 @@ class task(base_stage, osv.osv):
             context = {}
         if not vals.get('stage_id'):
             ctx = context.copy()
-            if  vals.get('project_id'):
+            if vals.get('project_id'):
                 ctx['default_project_id'] = vals['project_id']
             vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
-        task_id = super(task, self).create(cr, uid, vals, context=context)
+        # context: no_log, because subtype already handle this
+        create_context = dict(context, mail_create_nolog=True)
+        task_id = super(task, self).create(cr, uid, vals, context=create_context)
         self._store_history(cr, uid, [task_id], context=context)
         return task_id
 
@@ -1170,6 +1199,17 @@ class task(base_stage, osv.osv):
         return [task.project_id.message_get_reply_to()[0] if task.project_id else False
                     for task in self.browse(cr, uid, ids, context=context)]
 
+    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
+        """ mail.message document permission rule: can post a new message if can read
+            because of portal document. """
+        if not model_obj:
+            model_obj = self
+        if operation == 'create':
+            model_obj.check_access_rights(cr, uid, 'read')
+            model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
+        else:
+            return super(task, self).check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
+
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
         """ Override to updates the document according to the email. """
         if custom_values is None: custom_values = {}
@@ -1178,7 +1218,7 @@ class task(base_stage, osv.osv):
             'planned_hours': 0.0,
         }
         defaults.update(custom_values)
-        return super(task,self).message_new(cr, uid, msg, custom_values=defaults, context=context)
+        return super(task, self).message_new(cr, uid, msg, custom_values=defaults, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
         """ Override to update the task according to the email. """
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index f5fbf878fd0..b7dcc2bdb83 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -62,7 +62,7 @@
             <field name="name">E-Learning Integration</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
-            <field name="privacy_visibility">public</field>
+            <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
         </record>
 
@@ -76,6 +76,7 @@
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
         </record>
 
@@ -89,6 +90,7 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">followers</field>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 16dbe44ccc1..eb042e5f0c7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -50,16 +50,18 @@
             <field name="name">Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
-            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+            <field name="context">{
+                'search_default_project_id': [active_id], 
+                'default_project_id': active_id,
+                'active_test': False,
+            }</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a new task.
-              </p><p>
-                OpenERP's project management allows you to manage the pipeline
-                of tasks in order to get things done efficiently. You can
-                track progress, discuss on tasks, attach documents, etc.
-              </p>
+                <p>
+                    OpenERP's project management allows you to manage the pipeline
+                    of tasks in order to get things done efficiently. You can
+                    track progress, discuss on tasks, attach documents, etc.
+                </p>
             </field>
         </record>
 
@@ -87,6 +89,17 @@
                         <h1>
                             <field name="name" string="Project Name"/>
                         </h1>
+                        <div name="group_alias"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <label for="alias_id" string="Email Alias"/>
+                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                        <span name="edit_alias" class="oe_edit_only">
+                            <field name="alias_name" class="oe_inline"
+                                    attrs="{'required': [('alias_id', '!=', False)]}"/>
+                            @
+                            <field name="alias_domain" class="oe_inline" readonly="1"/>
+                        </span>
+                    </div>
                         <div name="options_active">
                             <field name="use_tasks" class="oe_inline"/>
                             <label for="use_tasks"/>
@@ -133,13 +146,6 @@
                         </page>
                         <page string="Other Info">
                             <group>
-                                <group string="Email Interface" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                    <div>
-                                        <field name="alias_id" invisible="1" required="0"/>
-                                        <label for="alias_name" class="oe_edit_only "/>
-                                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
-                                    </div>
-                                </group>
                                 <group string="Administration" groups="project.group_time_work_estimation_tasks">
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="effective_hours" widget="float_time"/>
@@ -184,7 +190,7 @@
                     <separator/>
                     <filter string="Project(s) Manager" domain="[('user_id','=',uid)]" help="Projects in which I am a manager" icon="terp-personal"/>
                     <field name="user_id" string="Project Manager"/>
-                    <field name="partner_id" string="Contact"/>
+                    <field name="partner_id" string="Contact" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" name="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" name="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -231,7 +237,6 @@
                     <field name="color"/>
                     <field name="task_count"/>
                     <field name="alias_id"/>
-                    <field name="alias_domain"/>
                     <field name="doc_count"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -245,8 +250,10 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-
                                     <h4><field name="name"/></h4>
+                                    <div class="oe_kanban_alias" t-if="record.alias_id.value">
+                                        <span class="oe_e">%%</span><small><field name="alias_id"/></small>
+                                    </div>
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> 
                                             <span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span>
@@ -503,6 +510,7 @@
                                         <li><a name="do_open" states="draft" string="Validate planned time" type="object" class="oe_kanban_button oe_kanban_button_active">!</a></li>
                                       </ul>
                                     </li>
+                                    <br/>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                             </div>
@@ -622,13 +630,11 @@
             <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a new task.
-              </p><p>
-                OpenERP's project management allows you to manage the pipeline
-                of tasks in order to get things done efficiently. You can
-                track progress, discuss on tasks, attach documents, etc.
-              </p>
+                <p>
+                    OpenERP's project management allows you to manage the pipeline
+                    of tasks in order to get things done efficiently. You can
+                    track progress, discuss on tasks, attach documents, etc.
+                </p>
             </field>
         </record>
         <record id="open_view_task_list_kanban" model="ir.actions.act_window.view">
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index c30c91fe6c0..17e059c8de7 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -6,7 +6,7 @@
             <field name="name">project.task.history.cumulative.tree</field>
             <field name="model">project.task.history.cumulative</field>
             <field name="arch" type="xml">
-                <tree string="Tasks's Cumulative Flow">
+                <tree string="Tasks's Cumulative Flow" create="false">
                     <field name="date"/>
                     <field name="project_id"/>
                     <field name="task_id"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 8e7dca059f9..006aae1085c 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -117,5 +117,4 @@ class report_project_task_user(osv.osv):
 
         """)
 
-report_project_task_user()
 
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 10f3f4a8c7c..d9650e165ce 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -69,7 +69,7 @@
                     <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="partner_id" />
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index 97fca8c459f..e4ca63d79d8 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -29,7 +29,6 @@ class res_partner(osv.osv):
         'task_ids': fields.one2many('project.task', 'partner_id', 'Tasks'),
     }
 
-res_partner()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f1d8c7e760f..e674019443b 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -38,39 +38,60 @@
 <data noupdate="1">
 
     <record model="ir.rule" id="project_comp_rule">
-        <field name="name">Project multi-company</field>
+        <field name="name">Project: multi-company</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',
+                                        ('company_id', '=', False),
+                                        ('company_id', 'child_of', [user.company_id.id]),
+                                    ]</field>
+    </record>
+
+    <record model="ir.rule" id="project_project_manager_rule">
+        <field name="name">Project: project manager: see all</field>
+        <field name="model_id" ref="model_project_project"/>
+        <field name="domain_force">[(1, '=', 1)]</field>
+        <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
     </record>
 
     <record model="ir.rule" id="project_public_members_rule">
-        <field name="name">Public Members</field>
+        <field name="name">Project: employees: public, employees or followers</field>
         <field name="model_id" ref="model_project_project"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('privacy_visibility','in',[False,'public']),('message_follower_ids','in',[user.partner_id.id])]</field>
+        <field name="domain_force">['|',
+                                        ('privacy_visibility', 'in', ['public', 'employees']),
+                                        ('message_follower_ids', 'in', [user.partner_id.id])
+                                    ]</field>
+        <field name="groups" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">
-        <field name="name" >Task multi-company</field>
+        <field name="name">Project/Task: multi-company</field>
         <field name="model_id" ref="model_project_task"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',
+                                        ('company_id', '=', False),
+                                        ('company_id', 'child_of', [user.company_id.id]),
+                                    ]</field>
     </record>
 
     <record model="ir.rule" id="task_visibility_rule">
-        <field name="name" >Tasks According to User and Project</field>
+        <field name="name">Project/Task: employees: public or employee or (followers and following)</field>
         <field name="model_id" ref="model_project_task"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|','|','|',('user_id','=',False),('user_id','=',user.id),('project_id.members','in', [user.id]),('project_id.user_id','=',user.id)]</field>
-        <field name="groups" eval="[(4,ref('project.group_project_user'))]"/>
+        <field name="domain_force">['|',
+                                        ('project_id.privacy_visibility', 'in', ['public', 'employees']),
+                                        '&amp;',
+                                            ('project_id.privacy_visibility', '=', 'followers'),
+                                            ('message_follower_ids', 'in', [user.partner_id.id]),
+                                    ]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
     </record>
 
     <record model="ir.rule" id="project_manager_all_project_tasks_rule">
-        <field name="name">Project Managers: all tasks from all projects</field>
+        <field name="name">Project/Task: project manager: see all</field>
         <field name="model_id" ref="model_project_task"/>
-        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="domain_force">[(1, '=', 1)]</field>
         <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
     </record>
+
 </data>
 </openerp>
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index bb15c62db1f..6a26868557e 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -125,13 +125,12 @@ class project_task_delegate(osv.osv_memory):
         action_model, action_id = models_data.get_object_reference(cr, uid, 'project', 'action_view_task')
         view_model, task_view_form_id = models_data.get_object_reference(cr, uid, 'project', 'view_task_form2')
         view_model, task_view_tree_id = models_data.get_object_reference(cr, uid, 'project', 'view_task_tree2')
-        action = self.pool.get(action_model).read(cr, uid, action_id, context=context)         
+        action = self.pool[action_model].read(cr, uid, action_id, context=context)         
         action['res_id'] = delegated_tasks[task_id]
         action['view_id'] = False
         action['views'] = [(task_view_form_id, 'form'), (task_view_tree_id, 'tree')]
         action['help'] = False    
         return action
 
-project_task_delegate()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
index 1cbea397d5e..eeb8cccc5d2 100644
--- a/addons/project/wizard/project_task_reevaluate.py
+++ b/addons/project/wizard/project_task_reevaluate.py
@@ -80,6 +80,5 @@ class project_task_reevaluate(osv.osv_memory):
             if context.get('button_reactivate'):
                 task_pool.do_reopen(cr, uid, [task_id], context=context)
         return {'type': 'ir.actions.act_window_close'}
-project_task_reevaluate()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index 715544cf4fc..47569e863aa 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -37,7 +37,6 @@ class project_gtd_context(osv.osv):
     }
     _order = "sequence, name"
 
-project_gtd_context()
 
 
 class project_gtd_timebox(osv.osv):
@@ -49,7 +48,6 @@ class project_gtd_timebox(osv.osv):
         'icon': fields.selection(tools.icons, 'Icon', size=64),
     }
 
-project_gtd_timebox()
 
 class project_task(osv.osv):
     _inherit = "project.task"
@@ -120,6 +118,5 @@ class project_task(osv.osv):
 
         return res
 
-project_task()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 1467ce55fab..4bfd5b783c7 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -106,6 +106,8 @@
                 <filter name="open" string="In Progress" domain="[('state','in',('draft','open'))]" help="In Progress and draft tasks" icon="terp-camera_test"/>
                 <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                 <separator/>
+                <filter name="message_unread" string="Unread Messages" domain="[('message_unread','=',True)]"/>
+                <separator/>
                 <filter string="Inbox" domain="[('timebox_id','=', False)]" help="Tasks having no timebox assigned yet"/>
                 <group expand="0" string="Display">
                     <filter string="Show Context" name="context_show" context="{'context_show': True}" domain="[]" icon="terp-camera_test" help="Show the context field"/>
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index 26e438b789e..3233e2534af 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -49,7 +49,7 @@ class project_timebox_empty(osv.osv_memory):
 
         ids = obj_tb.search(cr, uid, [], context=context)
         if not len(ids):
-            raise osv.except_osv(_('Error!'), _('No timebox child of this one !'))
+            raise osv.except_osv(_('Error!'), _('No timebox child of this one!'))
         tids = obj_task.search(cr, uid, [('timebox_id', '=', context['active_id'])])
         for task in obj_task.browse(cr, uid, tids, context):
             if (task.state in ('cancel','done')) or (task.user_id.id <> uid):
@@ -62,6 +62,5 @@ class project_timebox_empty(osv.osv_memory):
             obj_task.write(cr, uid, close, {'timebox_id':False})
         return {}
 
-project_timebox_empty()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index ae8fea61e1c..121bd7efdac 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -56,6 +56,5 @@ class project_timebox_fill(osv.osv_memory):
         self.pool.get('project.task').write(cr, uid, data[0]['task_ids'], {'timebox_id':data[0]['timebox_to_id'][0]})
         return {'type': 'ir.actions.act_window_close'}
 
-project_timebox_fill()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f8f6510cd49..8bcac4581c3 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -19,11 +19,12 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from openerp.addons.base_status.base_stage import base_stage
 from openerp.addons.project.project import _TASK_STATE
 from openerp.addons.crm import crm
 from datetime import datetime
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 import binascii
 import time
@@ -40,7 +41,6 @@ class project_issue_version(osv.osv):
     _defaults = {
         'active': 1,
     }
-project_issue_version()
 
 class project_issue(base_stage, osv.osv):
     _name = "project.issue"
@@ -50,12 +50,12 @@ class project_issue(base_stage, osv.osv):
 
     _track = {
         'state': {
-            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'new',
+            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
             'project_issue.mt_issue_closed': lambda self, cr, uid, obj, ctx=None:  obj['state'] == 'done',
             'project_issue.mt_issue_started': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
         },
         'stage_id': {
-            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'done', 'open'],
+            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'done', 'open'],
         },
         'kanban_state': {
             'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
@@ -70,7 +70,9 @@ class project_issue(base_stage, osv.osv):
             if vals.get('project_id'):
                 ctx['default_project_id'] = vals['project_id']
             vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
-        return super(project_issue, self).create(cr, uid, vals, context=context)
+        # context: no_log, because subtype already handle this
+        create_context = dict(context, mail_create_nolog=True)
+        return super(project_issue, self).create(cr, uid, vals, context=create_context)
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """
@@ -271,7 +273,7 @@ class project_issue(base_stage, osv.osv):
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
                         track_visibility='onchange',
-                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
+                        domain="[('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -416,6 +418,12 @@ class project_issue(base_stage, osv.osv):
         self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
         return res
 
+    def get_empty_list_help(self, cr, uid, help, context=None):
+        context['empty_list_help_model'] = 'project.project'
+        context['empty_list_help_id'] = context.get('default_project_id')
+        context['empty_list_help_document_name'] = _("issues")
+        return super(project_issue, self).get_empty_list_help(cr, uid, help, context=context)
+
     # -------------------------------------------------------
     # Stage management
     # -------------------------------------------------------
@@ -487,13 +495,27 @@ class project_issue(base_stage, osv.osv):
         return [issue.project_id.message_get_reply_to()[0] if issue.project_id else False
                     for issue in self.browse(cr, uid, ids, context=context)]
 
+    def check_mail_message_access(self, cr, uid, mids, operation, model_obj=None, context=None):
+        """ mail.message document permission rule: can post a new message if can read
+            because of portal document. """
+        if not model_obj:
+            model_obj = self
+        if operation == 'create':
+            model_obj.check_access_rights(cr, uid, 'read')
+            model_obj.check_access_rule(cr, uid, mids, 'read', context=context)
+        else:
+            return super(project_issue, self).check_mail_message_access(cr, uid, mids, operation, model_obj=model_obj, context=context)
+
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
         recipients = super(project_issue, self).message_get_suggested_recipients(cr, uid, ids, context=context)
-        for issue in self.browse(cr, uid, ids, context=context):
-            if issue.partner_id:
-                self._message_add_suggested_recipient(cr, uid, recipients, issue, partner=issue.partner_id, reason=_('Customer'))
-            elif issue.email_from:
-                self._message_add_suggested_recipient(cr, uid, recipients, issue, email=issue.email_from, reason=_('Customer Email'))
+        try:
+            for issue in self.browse(cr, uid, ids, context=context):
+                if issue.partner_id:
+                    self._message_add_suggested_recipient(cr, uid, recipients, issue, partner=issue.partner_id, reason=_('Customer'))
+                elif issue.email_from:
+                    self._message_add_suggested_recipient(cr, uid, recipients, issue, email=issue.email_from, reason=_('Customer Email'))
+        except (osv.except_osv, orm.except_orm):  # no read access rights -> just ignore suggested recipients because this imply modifying followers
+            pass
         return recipients
 
     def message_new(self, cr, uid, msg, custom_values=None, context=None):
@@ -555,15 +577,13 @@ class project_issue(base_stage, osv.osv):
         """
         if context is None:
             context = {}
-        
         res = super(project_issue, self).message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, content_subtype=content_subtype, **kwargs)
-        
         if thread_id:
-            self.write(cr, uid, thread_id, {'date_action_last': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)    
-        
-        return res   
+            self.write(cr, SUPERUSER_ID, thread_id, {'date_action_last': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
+        return res
 
-class project(osv.osv):
+
+class project(osv.Model):
     _inherit = "project.project"
 
     def _get_alias_models(self, cr, uid, context=None):
@@ -578,7 +598,9 @@ class project(osv.osv):
         return res
 
     _columns = {
-        'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'project_escalation_id': fields.many2one('project.project', 'Project Escalation',
+            help='If any issue is escalated from the current Project, it will be listed under the project selected here.',
+            states={'close': [('readonly', True)], 'cancelled': [('readonly', True)]}),
         'issue_count': fields.function(_issue_count, type='integer', string="Unclosed Issues"),
     }
 
@@ -593,14 +615,13 @@ class project(osv.osv):
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
 
-project()
 
-class account_analytic_account(osv.osv):
+class account_analytic_account(osv.Model):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
 
     _columns = {
-        'use_issues' : fields.boolean('Issues', help="Check this field if this project manages issues"),
+        'use_issues': fields.boolean('Issues', help="Check this field if this project manages issues"),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, context=None):
@@ -611,16 +632,34 @@ class account_analytic_account(osv.osv):
         return res
 
     def _trigger_project_creation(self, cr, uid, vals, context=None):
-        if context is None: context = {}
+        if context is None:
+            context = {}
         res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
         return res or (vals.get('use_issues') and not 'project_creation_in_progress' in context)
 
-account_analytic_account()
 
-class project_project(osv.osv):
+class project_project(osv.Model):
     _inherit = 'project.project'
+
     _defaults = {
         'use_issues': True
     }
 
+    def _check_create_write_values(self, cr, uid, vals, context=None):
+        """ Perform some check on values given to create or write. """
+        # Handle use_tasks / use_issues: if only one is checked, alias should take the same model
+        if vals.get('use_tasks') and not vals.get('use_issues'):
+            vals['alias_model'] = 'project.task'
+        elif vals.get('use_issues') and not vals.get('use_tasks'):
+            vals['alias_model'] = 'project.issue'
+
+    def create(self, cr, uid, vals, context=None):
+        self._check_create_write_values(cr, uid, vals, context=context)
+        return super(project_project, self).create(cr, uid, vals, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        self._check_create_write_values(cr, uid, vals, context=context)
+        return super(project_project, self).write(cr, uid, ids, vals, context=context)
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index 78841f56156..308b4884844 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -14,13 +14,11 @@
         <field name="domain" eval=""/>
         <field name="search_view_id" ref="view_project_issue_filter"/>
         <field name="help" type="html">
-          <p class="oe_view_nocontent_create">
-            Click to report a new issue.
-          </p><p>
-            The OpenERP issues tacker allows you to efficiantly manage things
-            like internal requests, software development bugs, customer
-            complaints, project troubles, material breakdowns, etc.
-          </p>
+            <p>
+                The OpenERP issues tacker allows you to efficiantly manage things
+                like internal requests, software development bugs, customer
+                complaints, project troubles, material breakdowns, etc.
+            </p>
         </field>
     </record>
 
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 500a1376422..46caba0021e 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -68,15 +68,16 @@
                     <label for="categ_ids" class="oe_edit_only"/>
                     <field name="categ_ids" widget="many2many_tags"/>
                     <group>
-                        <group groups="base.group_user">
+                        <group>
                             <field name="user_id" 
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
-                            <label for="project_id" groups="base.group_user"/>
-                            <div groups="base.group_user">
+                            <label for="project_id"/>
+                            <div>
                                 <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"/>
+                                <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"
+                                        groups="base.group_user"/>
                             </div>
                         </group>
                         <group>
@@ -146,26 +147,27 @@
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <field name="name" string="Issue" filter_domain="['|', '|',('description','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="name" string="Issue" filter_domain="['|', '|', '|', ('partner_id','child_of',self), ('description','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
-                    <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
+                    <filter name="filter_new" string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
+                    <filter name="filter_open" string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
                     <separator/>
                     <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-"/>
-                    <field name="partner_id"/>
+                    <separator/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By..." >
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Contact" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Project"  icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
-                        <filter string="Version" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'version_id'}"/>
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
+                        <filter string="Responsible" name="group_user_id" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Contact" name="group_partner_id" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Version" name="group_version" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'version_id'}"/>
+                        <filter string="Priority" name="group_priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
+                        <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Month" name="group_create_date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
             </field>
@@ -302,7 +304,18 @@
             <field name="view_type">form</field>
             <field name="name">Issues</field>
             <field name="view_mode">kanban,tree,form,calendar,graph</field>
-            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+            <field name="context">{
+                    'search_default_project_id': [active_id], 
+                    'default_project_id': active_id,
+                }
+            </field>
+            <field name="help" type="html">
+                <p>
+                    The OpenERP issues tacker allows you to efficiantly manage things
+                    like internal requests, software development bugs, customer
+                    complaints, project troubles, material breakdowns, etc.
+                </p>
+            </field>
         </record>
 
         <!-- Project -->
@@ -324,9 +337,18 @@
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                 </field>
-                <field name="alias_domain" position="after">
-                    <label for="alias_model" class="oe_edit_only" string="creates"/><field name="alias_model" class="oe_edit_only oe_inline"/>
-                </field>
+                <xpath expr='//span[@name="edit_alias"]' position='replace'>
+                    <span class="oe_edit_only" name="edit_alias">
+                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>
+                        @
+                        <field class="oe_inline" name="alias_domain"/>
+                        <span class="oe_inline"
+                                attrs="{'invisible': ['|', ('use_issues', '!=', True), ('use_tasks', '!=', True)]}">
+                            <label for="alias_model" string="creates"/>
+                            <field name="alias_model" class="oe_inline"/>
+                        </span>
+                    </span>
+                </xpath>
             </field>
        </record>
 
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 199a971c4ad..5cca0ff8689 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -105,6 +105,5 @@ class project_issue_report(osv.osv):
                 WHERE c.active= 'true'
             )""")
 
-project_issue_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 47ea91fad5f..a885dcd8a7f 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -14,7 +14,7 @@
                     <field name="version_id" string="Version" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
-                    <field name="section_id" invisible="1"/>
+                    <field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
                     <field name="user_id" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -55,7 +55,7 @@
                     <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="version_id"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
diff --git a/addons/project_issue/security/project_issue_security.xml b/addons/project_issue/security/project_issue_security.xml
index c3119073a75..c8ed12086e4 100644
--- a/addons/project_issue/security/project_issue_security.xml
+++ b/addons/project_issue/security/project_issue_security.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
+        <record model="ir.rule" id="issue_project_manager_rule">
+            <field name="name">Project/Issue: project manager: see all</field>
+            <field name="model_id" ref="model_project_issue"/>
+            <field name="domain_force">[(1, '=', 1)]</field>
+            <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
+        </record>
+
+        <record model="ir.rule" id="issue_user_rule">
+            <field name="name">Project/Issue: employees: public or employee or (followers and following)</field>
+            <field name="model_id" ref="model_project_issue"/>
+            <field name="domain_force">['|',
+                                            ('project_id.privacy_visibility', 'in', ['public', 'employees']),
+                                            '&amp;',
+                                                ('project_id.privacy_visibility', '=', 'followers'),
+                                                ('message_follower_ids', 'in', [user.id]),
+                                        ]</field>
+            <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_issue/test/subscribe_issue.yml b/addons/project_issue/test/subscribe_issue.yml
index 9f16dc80b97..af81ff4d295 100644
--- a/addons/project_issue/test/subscribe_issue.yml
+++ b/addons/project_issue/test/subscribe_issue.yml
@@ -2,8 +2,7 @@
   In Order to test process of  Issue in OpenERP, Custmer send the issue by email.
 -
   !python {model: mail.thread}: |
-    from openerp import addons
-    request_file = open(addons.get_module_resource('project_issue','test', 'issue.eml'),'rb')
+    request_file = open(openerp.modules.module.get_module_resource('project_issue','test', 'issue.eml'),'rb')
     request_message = request_file.read()
     self.message_process(cr, uid, 'project.issue', request_message)
 -
@@ -14,4 +13,4 @@
     assert issue_ids and len(issue_ids), "issue is not created after getting request"
     issue = self.browse(cr, uid, issue_ids[0], context=context)
     assert not issue.partner_id, "Customer should be a new"
-    assert issue.name == "Error in the account module", "Subject does not match"
\ No newline at end of file
+    assert issue.name == "Error in the account module", "Subject does not match"
diff --git a/addons/project_issue_sheet/project_issue_sheet.py b/addons/project_issue_sheet/project_issue_sheet.py
index 8fe645e19fe..551ef3c8194 100644
--- a/addons/project_issue_sheet/project_issue_sheet.py
+++ b/addons/project_issue_sheet/project_issue_sheet.py
@@ -58,7 +58,6 @@ class project_issue(osv.osv):
             
         return result
 
-project_issue()
 
 class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
@@ -67,7 +66,6 @@ class account_analytic_line(osv.osv):
         'create_date' : fields.datetime('Create Date', readonly=True),
     }
 
-account_analytic_line()
 
 class hr_analytic_issue(osv.osv):
 
@@ -77,6 +75,5 @@ class hr_analytic_issue(osv.osv):
         'issue_id' : fields.many2one('project.issue', 'Issue'),
     }
 
-hr_analytic_issue()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index fb245a0510a..4911cac8f25 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -19,7 +19,8 @@
                 </field>
                 <xpath expr="//notebook/page[@string='Extra Info']" position="before">
                     <page string="Worklogs">
-                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}">
+                        <field name="timesheet_ids" colspan="4" nolabel="1" context="{'default_user_id' : user_id, 'default_account_id' : analytic_account_id}"
+                                groups="base.group_user">
                             <tree editable="top" string="Timesheets">
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index e53ff9ed253..a950907fb69 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -198,7 +198,6 @@ class project_phase(osv.osv):
             result += "\n"
 
         return result
-project_phase()
 
 class project_user_allocation(osv.osv):
     _name = 'project.user.allocation'
@@ -211,7 +210,6 @@ class project_user_allocation(osv.osv):
         'date_start': fields.datetime('Start Date', help="Starting Date"),
         'date_end': fields.datetime('End Date', help="Ending Date"),
     }
-project_user_allocation()
 
 class project(osv.osv):
     _inherit = "project.project"
@@ -267,7 +265,6 @@ class project(osv.osv):
                     'date_end': p.end.strftime('%Y-%m-%d %H:%M:%S')
                 }, context=context)
         return True
-project()
 
 class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
@@ -283,17 +280,17 @@ class account_analytic_account(osv.osv):
             res['value']['use_phases'] = template.use_phases
         return res
 
-    def _trigger_project_creation(self, cr, uid, vals, context=None):
-        res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
-        return res or vals.get('use_phases')
 
-account_analytic_account()
+    def _trigger_project_creation(self, cr, uid, vals, context=None):
+        if context is None: context = {}
+        res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
+        return res or (vals.get('use_phases') and not 'project_creation_in_progress' in context)
+
 
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"),
     }
-project_task()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 4066b6133c1..e61af0c6c32 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -120,7 +120,8 @@
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_phases.raw_value"
-                        name="%(act_project_phases)d" type="action">
+                        name="%(act_project_phases)d" type="action"
+                        groups="base.group_user">
                         <span t-if="record.phase_count.raw_value gt 1"><field name="phase_count"/> Phases</span>
                         <span t-if="record.phase_count.raw_value lt 2"><field name="phase_count"/> Phase</span>
                     </a>
@@ -322,7 +323,7 @@
             <field name="inherit_id" ref="project.view_task_search_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="before">
-                    <field name="phase_id"/>
+                    <field name="phase_id" domain="[]"/>
                 </field>
             </field>
         </record>
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index c9aa7eb3573..5ac89e2def2 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -71,6 +71,5 @@ class project_compute_phases(osv.osv_memory):
         result['context'] = {"search_default_project_id":project_id, "default_project_id":project_id, "search_default_current": 1}
         return result
 
-project_compute_phases()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index f21dab8a6d2..d442aee7790 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -59,6 +59,5 @@ class project_compute_tasks(osv.osv_memory):
         result['target'] = 'current'
         return result
 
-project_compute_tasks()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index e2195c6f61b..c25cd264538 100644
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -50,24 +50,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
-            <field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
+            <field name="target_node_id" ref="process_node_procuretasktask0"/>
+            <field name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
         </record>
 
         <record id="process_transition_createtask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Product type is service, then its creates the task.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="project.process_node_drafttask0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleordertask0"/>
+            <field name="target_node_id" ref="project.process_node_drafttask0"/>
+            <field name="source_node_id" ref="process_node_saleordertask0"/>
         </record>
 
         <record id="process_transition_ordertask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Order Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;If procurement method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
-            <field model="process.node" name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
+            <field name="target_node_id" ref="process_node_mrptask0"/>
+            <field name="source_node_id" ref="procurement.process_node_serviceonorder0"/>
         </record>
 
     </data>
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index a6f0495a962..bb25b4aae24 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -45,14 +45,12 @@ class project_task(osv.osv):
         res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
         self._validate_subflows(cr, uid, ids)
         return res
-project_task()
 
 class product_product(osv.osv):
     _inherit = "product.product"
     _columns = {
         'project_id': fields.many2one('project.project', 'Project', ondelete='set null',)
     }
-product_product()
 
 class sale_order(osv.osv):
     _inherit ='sale.order'
@@ -108,5 +106,4 @@ class sale_order(osv.osv):
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
     }
 
-sale_order()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 79228fe3285..f4b4a28db46 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -94,6 +94,5 @@ class procurement_order(osv.osv):
             if procurement.sale_line_id and procurement.sale_line_id.order_id:
                 procurement.sale_line_id.order_id.message_post(body=body)
 
-procurement_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
index 8854ce20c80..967461ca30a 100644
--- a/addons/project_mrp/test/project_task_procurement.yml
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -27,7 +27,7 @@
         assert (not project and not account) or project.analytic_account_id == account, "Project does not correspond."
     planned_hours = self._convert_qty_company_hours(cr, uid, procurement, context=context)
     assert task.planned_hours == planned_hours, 'Planned Hours do not correspond.'
-    assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S'), 'Deadline does not correspond.'
+    assert datetime.strptime(task.date_deadline, '%Y-%m-%d') == datetime.strptime(procurement.date_planned[:10], '%Y-%m-%d'), 'Deadline does not correspond.'
     if procurement.product_id.product_manager:
         assert task.user_id.id == procurement.product_id.product_manager.id, 'Allocated Person does not correspond with Service Product Manager.'
 -
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index 0651d7b9ce4..4dff3695c5c 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -34,7 +34,7 @@ with the effect of creating, editing and deleting either ways.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
-    'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
+    'depends': ['resource', 'project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
     'data': [
         'security/ir.model.access.csv',
         'security/project_timesheet_security.xml',
diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml
index 1bff69b603e..17dd35dcad2 100644
--- a/addons/project_timesheet/process/project_timesheet_process.xml
+++ b/addons/project_timesheet/process/project_timesheet_process.xml
@@ -46,24 +46,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Fill Timesheet&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Task summary is comes into the timesheet line&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/>
-            <field model="process.node" name="source_node_id" ref="project.process_node_opentask0"/>
+            <field name="target_node_id" ref="process_node_timesheettask0"/>
+            <field name="source_node_id" ref="project.process_node_opentask0"/>
         </record>
 
         <record id="process_transition_taskencoding0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task encoding&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Encode how much time u spent on your task&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/>
+            <field name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheet0"/>
+            <field name="source_node_id" ref="process_node_taskwork0"/>
         </record>
 
         <record id="process_transition_taskinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Task invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;After task is completed, Create its invoice.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_triggerinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="project.process_node_donetask0"/>
+            <field name="target_node_id" ref="process_node_triggerinvoice0"/>
+            <field name="source_node_id" ref="project.process_node_donetask0"/>
         </record>
 
     </data>
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 6c2b2b0e13b..767cb4893b5 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -69,7 +69,6 @@ class project_project(osv.osv):
         result['help'] = help
         return result
 
-project_project()
 
 class project_work(osv.osv):
     _inherit = "project.task.work"
@@ -80,22 +79,22 @@ class project_work(osv.osv):
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', user_id)])
         if not emp_id:
             user_name = self.pool.get('res.users').read(cr, uid, [user_id], ['name'])[0]['name']
-            raise osv.except_osv(_('Bad Configuration !'),
+            raise osv.except_osv(_('Bad Configuration!'),
                  _('Please define employee for user "%s". You must create one.')% (user_name,))
         emp = emp_obj.browse(cr, uid, emp_id[0])
         if not emp.product_id:
-            raise osv.except_osv(_('Bad Configuration !'),
+            raise osv.except_osv(_('Bad Configuration!'),
                  _('Please define product and product category property account on the related employee.\nFill in the HR Settings tab of the employee form.'))
 
         if not emp.journal_id:
-            raise osv.except_osv(_('Bad Configuration !'),
+            raise osv.except_osv(_('Bad Configuration!'),
                  _('Please define journal on the related employee.\nFill in the timesheet tab of the employee form.'))
 
         acc_id = emp.product_id.property_account_expense.id
         if not acc_id:
             acc_id = emp.product_id.categ_id.property_account_expense_categ.id
             if not acc_id:
-                raise osv.except_osv(_('Bad Configuration !'),
+                raise osv.except_osv(_('Bad Configuration!'),
                         _('Please define product and product category property account on the related employee.\nFill in the timesheet tab of the employee form.'))
 
         res['product_id'] = emp.product_id.id
@@ -218,7 +217,6 @@ class project_work(osv.osv):
         'hr_analytic_timesheet_id':fields.many2one('hr.analytic.timesheet','Related Timeline Id', ondelete='set null'),
     }
 
-project_work()
 
 class task(osv.osv):
     _inherit = "project.task"
@@ -254,7 +252,6 @@ class task(osv.osv):
                         hr_anlytic_timesheet.write(cr, uid, [line_id], vals_line, {})
         return super(task,self).write(cr, uid, ids, vals, context)
 
-task()
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
@@ -266,7 +263,6 @@ class res_partner(osv.osv):
         return super(res_partner,self).unlink(cursor, user, ids,
                 context=context)
 
-res_partner()
 
 class account_analytic_line(osv.osv):
    _inherit = "account.analytic.line"
@@ -290,9 +286,8 @@ class account_analytic_line(osv.osv):
        st = acc.to_invoice.id
        res['value']['to_invoice'] = st or False
        if acc.state == 'close' or acc.state == 'cancelled':
-           raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
+           raise osv.except_osv(_('Invalid Analytic Account!'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
        return res
 
-account_analytic_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index c4945e942f6..3411a73a239 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -79,6 +79,5 @@ class report_timesheet_task_user(osv.osv):
                 to_char(to_date(months.name, 'YYYY/MM/DD'),'MM')
               ) """)
 
-report_timesheet_task_user()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/company.py b/addons/purchase/company.py
index 275f5ea200d..cc98c200458 100644
--- a/addons/purchase/company.py
+++ b/addons/purchase/company.py
@@ -24,13 +24,16 @@ from openerp.osv import osv,fields
 class company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'po_lead': fields.float('Purchase Lead Time', required=True,
-            help="This is the leads/security time for each purchase order."),
+        'po_lead': fields.float(
+            'Purchase Lead Time', required=True,
+            help="Margin of error for supplier lead times. When the system"\
+                 "generates Purchase Orders for procuring products,"\
+                 "they will be scheduled that many days earlier "\
+                 "to cope with unexpected supplier delays."),
     }
     _defaults = {
         'po_lead': lambda *a: 1.0,
     }
-company()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/html/index.html b/addons/purchase/html/index.html
new file mode 100644
index 00000000000..67b122ac557
--- /dev/null
+++ b/addons/purchase/html/index.html
@@ -0,0 +1,141 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Purchase Management</h2>
+            <h3 class="oe_slogan">Automate requisition-to-pay, control invoicing</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=purchase">
+                    <img src="purchase_po.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+           <p class="oe_mt32">
+Automate procurement propositions, launch request for quotations, track purchase orders, manage suppliers' information, control products reception and check suppliers' invoices. 
+           </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Automated Procurement Propositions</h2>
+        <h3 class="oe_slogan">Reduce inventory level with procurement rules</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the right purchase proposition at the right time to reduce your inventory level. Improve your purchase and inventory performance with procurement rules depending on stock levels, logistic rules, sales orders, forecasted manufacturing orders, etc.
+            </p><p>
+Send requests for quotations or purchase orders to your supplier in one click. Get access to product receptions and invoices from your purchase order.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_product_form.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Purchase Tenders</h2>
+        <h3 class="oe_slogan">Get the best price by negotiating with several suppliers</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_procurement.png">
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Launch purchase tenders, integrate supplier's answers in the process and compare propositions. Choose the best offer and send purchase orders easily. Use reporting to analyse the quality of your suppliers afterwards.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/logistic.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/logistic" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Email integrations</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Integrate all supplier's communications on the purchase orders (or RfQs) to get a strong traceability on the negotiation or after sales service issues. Use the claim management module to track issues related to suppliers.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture" src="purchase_compose.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+	    <h2 class="oe_slogan">Standard Price, Average Price, FIFO</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_product.png">
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Use the costing method that reflects your business: standard price, average price, fifo or lifo. Get your accounting entries and the right inventory valuation in real-time; OpenERP manages everything for you, transparently.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+	    <h2 class="oe_slogan">Import Supplier Pricelists</h2>
+	    <h3 class="oe_slogan">Take smart purchase decisions using the best prices</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Easily import supplier's pricelists to make smarter purchase decisions based on promotions, prices depending on quantities and special contract conditions. You can even base your sales price depending on your supplier's prices.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_import.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Control Products and Invoices</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="purchase_incoming.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+No product or order is left behind, the inventory control allows you to manage back orders, refunds, product reception and quality control. Choose the right control method according to your need.
+            </p>
+            <p>
+Control supplier invoices with no effort. Choose the right method according to your need: pre-generate draft invoices based on purchase orders, on products receptions, create invoices manually and import lines from purchase orders, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Get Statistics On Your Purchases</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get accurate statistics on the performance of your suppliers through flexible reporting: delivery delays, negotiated discount on prices, quantities purchased, etc. Integrate purchases with the analytic accounting to analyse your contracts profitability.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="purchase_dashboard.png">
+        </div>
+    </div>
+</section>
diff --git a/addons/purchase/html/purchase_compose.png b/addons/purchase/html/purchase_compose.png
new file mode 100644
index 00000000000..22cbe1cb21c
Binary files /dev/null and b/addons/purchase/html/purchase_compose.png differ
diff --git a/addons/purchase/html/purchase_dashboard.png b/addons/purchase/html/purchase_dashboard.png
new file mode 100644
index 00000000000..0939edea591
Binary files /dev/null and b/addons/purchase/html/purchase_dashboard.png differ
diff --git a/addons/purchase/html/purchase_import.png b/addons/purchase/html/purchase_import.png
new file mode 100644
index 00000000000..bd2a4d0c15e
Binary files /dev/null and b/addons/purchase/html/purchase_import.png differ
diff --git a/addons/purchase/html/purchase_incoming.png b/addons/purchase/html/purchase_incoming.png
new file mode 100644
index 00000000000..02b82cead02
Binary files /dev/null and b/addons/purchase/html/purchase_incoming.png differ
diff --git a/addons/purchase/html/purchase_po.png b/addons/purchase/html/purchase_po.png
new file mode 100644
index 00000000000..d9cec9f5140
Binary files /dev/null and b/addons/purchase/html/purchase_po.png differ
diff --git a/addons/purchase/html/purchase_procurement.png b/addons/purchase/html/purchase_procurement.png
new file mode 100644
index 00000000000..cb315e08224
Binary files /dev/null and b/addons/purchase/html/purchase_procurement.png differ
diff --git a/addons/purchase/html/purchase_product.png b/addons/purchase/html/purchase_product.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/purchase/html/purchase_product.png differ
diff --git a/addons/purchase/html/purchase_product_form.png b/addons/purchase/html/purchase_product_form.png
new file mode 100644
index 00000000000..a25c85b6496
Binary files /dev/null and b/addons/purchase/html/purchase_product_form.png differ
diff --git a/addons/purchase/html/purchase_tender.png b/addons/purchase/html/purchase_tender.png
new file mode 100644
index 00000000000..33ef600b869
Binary files /dev/null and b/addons/purchase/html/purchase_tender.png differ
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 56eaf288fe6..5e5af0815e3 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -43,6 +43,9 @@ class res_partner(osv.osv):
 
         super(res_partner, self).copy(cr, uid, id, default=default, context=context)
 
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist_purchase']
+
     _columns = {
         'property_product_pricelist_purchase': fields.property(
           'product.pricelist',
@@ -55,7 +58,6 @@ class res_partner(osv.osv):
         'purchase_order_count': fields.function(_purchase_order_count, string='# of Purchase Order', type='integer'),
         'purchase_order_ids': fields.one2many('purchase.order','partner_id','Purchase Order')
     }
-res_partner()
 
 
 
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index c6b6805351a..7feb47690e0 100644
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -154,16 +154,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
+            <field name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
+            <field name="source_node_id" ref="process_node_productrecept0"/>
         </record>
 
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/>
+            <field name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_draftpurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
         </record>
 
@@ -171,24 +171,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;In case there is no supplier for this product, the buyer can fill the form manually and confirm it. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/>
+            <field name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_draftpurchaseorder1"/>
         </record>
 
         <record id="process_transition_approvingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Approbation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The supplier approves the Purchase Order.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" />
+            <field name="target_node_id" ref="process_node_approvepurchaseorder0"/>
+            <field name="source_node_id" ref="process_node_confirmpurchaseorder0" />
         </record>
 
         <record id="process_transition_invoicefrompurchase0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoicecontrol0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
+            <field name="target_node_id" ref="process_node_invoicecontrol0"/>
+            <field name="source_node_id" ref="process_node_approvepurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/>
         </record>
 
@@ -196,32 +196,32 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Pick list generated&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A pick list is generated to track the incoming products.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
+            <field name="target_node_id" ref="process_node_packinglist0"/>
+            <field name="source_node_id" ref="process_node_approvepurchaseorder0"/>
         </record>
 
         <record id="process_transition_invoicefrompackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On picking'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+            <field name="target_node_id" ref="process_node_invoiceafterpacking0"/>
+            <field name="source_node_id" ref="process_node_packinglist0"/>
         </record>
 
         <record id="process_transition_purchaseinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a purchase order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/>
+            <field name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
+            <field name="source_node_id" ref="process_node_purchaseorder0"/>
         </record>
 
         <record id="process_transition_packinginvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A Pick list generates an invoice. Depending on the Invoicing control of the sales order, the invoice is based on delivered or on ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
+            <field name="target_node_id" ref="account.process_node_draftinvoices0"/>
+            <field name="source_node_id" ref="process_node_packinginvoice0"/>
         </record>
 
         <!--
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 4c18739cc78..849e558563a 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -20,6 +20,8 @@
 ##############################################################################
 
 import time
+import pytz
+from openerp import SUPERUSER_ID
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from operator import attrgetter
@@ -371,7 +373,7 @@ class purchase_order(osv.osv):
             pick_ids += [picking.id for picking in po.picking_ids]
 
         action_model, action_id = tuple(mod_obj.get_object_reference(cr, uid, 'stock', 'action_picking_tree4'))
-        action = self.pool.get(action_model).read(cr, uid, action_id, context=context)
+        action = self.pool[action_model].read(cr, uid, action_id, context=context)
         ctx = eval(action['context'])
         ctx.update({
             'search_default_purchase_id': ids[0]
@@ -592,11 +594,34 @@ class purchase_order(osv.osv):
         self.signal_purchase_cancel(cr, uid, ids)
         return True
 
+    def date_to_datetime(self, cr, uid, userdate, context=None):
+        """ Convert date values expressed in user's timezone to
+        server-side UTC timestamp, assuming a default arbitrary
+        time of 12:00 AM - because a time is needed.
+    
+        :param str userdate: date string in in user time zone
+        :return: UTC datetime string for server-side use
+        """
+        # TODO: move to fields.datetime in server after 7.0
+        user_date = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT)
+        if context and context.get('tz'):
+            tz_name = context['tz']
+        else:
+            tz_name = self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
+        if tz_name:
+            utc = pytz.timezone('UTC')
+            context_tz = pytz.timezone(tz_name)
+            user_datetime = user_date + relativedelta(hours=12.0)
+            local_timestamp = context_tz.localize(user_datetime, is_dst=False)
+            user_datetime = local_timestamp.astimezone(utc)
+            return user_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return user_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
     def _prepare_order_picking(self, cr, uid, order, context=None):
         return {
             'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
-            'date': order.date_order,
+            'date': self.date_to_datetime(cr, uid, order.date_order, context),
             'partner_id': order.dest_address_id.id or order.partner_id.id,
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'type': 'in',
@@ -614,8 +639,8 @@ class purchase_order(osv.osv):
             'product_uos_qty': order_line.product_qty,
             'product_uom': order_line.product_uom.id,
             'product_uos': order_line.product_uom.id,
-            'date': order_line.date_planned,
-            'date_expected': order_line.date_planned,
+            'date': self.date_to_datetime(cr, uid, order.date_order, context),
+            'date_expected': self.date_to_datetime(cr, uid, order_line.date_planned, context),
             'location_id': order.partner_id.property_stock_supplier.id,
             'location_dest_id': order.location_id.id,
             'picking_id': picking_id,
@@ -927,7 +952,8 @@ class purchase_order_line(osv.osv):
             lang = res_partner.browse(cr, uid, partner_id).lang
             context_partner.update( {'lang': lang, 'partner_id': partner_id} )
         product = product_product.browse(cr, uid, product_id, context=context_partner)
-        name = product.name
+        #call name_get() with partner in the context to eventually match name and description in the seller_ids field
+        dummy, name = product_product.name_get(cr, uid, product_id, context=context_partner)[0]
         if product.description_purchase:
             name += '\n' + product.description_purchase
         res['value'].update({'name': name})
@@ -990,7 +1016,6 @@ class purchase_order_line(osv.osv):
         self.write(cr, uid, ids, {'state': 'confirmed'}, context=context)
         return True
 
-purchase_order_line()
 
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 056a06f0750..4432d2b3200 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -270,7 +270,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
@@ -297,7 +297,7 @@
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase orders which are in exception state"/>
                     <separator/>
                     <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced."/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="create_uid"/>
                     <group expand="0" string="Group By...">
@@ -335,7 +335,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="context">{}</field>
-            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
+            <field name="domain">[('state','in',('draft','sent','cancel', 'confirmed'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
@@ -481,7 +481,7 @@
                 <search string="Search Purchase Order">
                     <field name="order_id"/>
                     <field name="product_id"/>
-                    <field name="partner_id" string="Supplier"/>
+                    <field name="partner_id" string="Supplier" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by' : 'partner_id'}" />
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by' : 'product_id'}" />
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 11936db0bed..68a6cd12733 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -57,7 +57,7 @@
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice</field>
             <field name="kind">subflow</field>
-            <field name="subflow_id" search="[('osv','=','account.invoice')]" type="int"/>
+            <field name="subflow_id" search="[('osv','=','account.invoice')]"/>
             <field name="action">action_invoice_create()</field>
         </record>
         <record id="act_invoice_done" model="workflow.activity">
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 1794bea19c4..6eb1b2167ee 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -94,38 +94,16 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -136,22 +114,22 @@
     <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_General">Description</para>
+          <para style="terp_tblheader_General"><b>Description</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General">Taxes</para>
+          <para style="terp_tblheader_General"><b>Taxes</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General">Date Req.</para>
+          <para style="terp_tblheader_General"><b>Date Req.</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Qty</para>
+          <para style="terp_tblheader_General_Right"><b>Qty</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Unit Price</para>
+          <para style="terp_tblheader_General_Right"><b>Unit Price</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Net Price</para>
+          <para style="terp_tblheader_General_Right"><b>Net Price</b></para>
         </td>
       </tr>
     </blockTable>
@@ -165,7 +143,7 @@
           <blockTable colWidths="253.0" style="Tableau2">
             <tr>
               <td>
-                <para style="terp_default_Bold_9">Shipping address :</para>
+                <para style="terp_default_Bold_9"><b>Shipping address :</b></para>
                 <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']]</para>
                 <para style="terp_default_9">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_id)) or '']]</para>
               </td>
@@ -195,24 +173,24 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation N° [[ o.name ]]</para>
-    <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation N° [[ o.name ]]</para>
+    <para style="terp_header"><b>[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation N° [[ o.name ]]</b></para>
+    <para style="terp_header"><b>[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation N° [[ o.name ]]</b></para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="136.0,132.0,133.0,133.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Our Order Reference</para>
+          <para style="terp_tblheader_General_Centre"><b>Our Order Reference</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Your Order Reference</para>
+          <para style="terp_tblheader_General_Centre"><b>Your Order Reference</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Order Date</para>
+          <para style="terp_tblheader_General_Centre"><b>Order Date</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Validated By</para>
+          <para style="terp_tblheader_General_Centre"><b>Validated By</b></para>
         </td>
       </tr>
     </blockTable>
@@ -238,22 +216,22 @@
     <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_General">Description</para>
+          <para style="terp_tblheader_General"><b>Description</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General">Taxes</para>
+          <para style="terp_tblheader_General"><b>Taxes</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General">Date Req.</para>
+          <para style="terp_tblheader_General"><b>Date Req.</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Qty</para>
+          <para style="terp_tblheader_General_Right"><b>Qty</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Unit Price</para>
+          <para style="terp_tblheader_General_Right"><b>Unit Price</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Net Price</para>
+          <para style="terp_tblheader_General_Right"><b>Net Price</b></para>
         </td>
       </tr>
     </blockTable>
@@ -316,10 +294,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Total :</para>
+          <para style="terp_default_Bold_9"><b>Total :</b></para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') , currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Bold_9_Right"><b>[[ formatLang(o.amount_total, digits=get_digits(dp='Account') , currency_obj=o.pricelist_id.currency_id) ]]</b></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 1855ed173ca..5af74b23495 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -136,7 +136,6 @@ class purchase_report(osv.osv):
                     u2.factor
             )
         """)
-purchase_report()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 8e5e73ee588..b7b4776d635 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -36,40 +36,17 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Space bet user and signature" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P1" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard"/>
+    <paraStyle name="terp_header" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Space bet user and signature" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -84,7 +61,7 @@
           <blockTable colWidths="250.0" style="Tableau2">
             <tr>
               <td>
-                <para style="terp_default_Bold_9">Expected Delivery address:</para>
+                <para style="terp_default_Bold_9"><b>Expected Delivery address:</b></para>
                 <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
                 <para style="P1">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
               </td>
@@ -114,20 +91,20 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">Request for Quotation : [[order.name]]</para>
+    <para style="terp_header"><b>Request for Quotation : [[order.name]]</b></para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_tblheader_Details"><b>Description</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Expected Date</para>
+          <para style="terp_tblheader_Details_Centre"><b>Expected Date</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
+          <para style="terp_tblheader_Details_Centre"><b>Qty</b></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 60b439a2097..e64c12a2359 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -29,7 +29,6 @@ class stock_move(osv.osv):
             readonly=True),
     }
 
-stock_move()
 
 #
 # Inherit of picking to add the link to the PO
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index 12dbf4a09f6..f97d82a8456 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -142,7 +142,6 @@ class purchase_line_invoice(osv.osv_memory):
             'context': "{'type':'in_invoice', 'journal_type': 'purchase'}",
             'type': 'ir.actions.act_window'
         }
-purchase_line_invoice()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index f9b68c1fe11..243f27efea4 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -83,6 +83,5 @@ class purchase_order_group(osv.osv_memory):
             'search_view_id': id['res_id']
         }
 
-purchase_order_group()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
index c80beddd20f..a654de83253 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans.py
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -29,7 +29,6 @@ class purchase_order_line(osv.osv):
          'analytics_id':fields.many2one('account.analytic.plan.instance','Analytic Distribution'),
     }
 
-purchase_order_line()
 
 class purchase_order(osv.osv):
     _name='purchase.order'
@@ -40,6 +39,5 @@ class purchase_order(osv.osv):
         res['analytics_id'] = order_line.analytics_id.id
         return res
 
-purchase_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index bcc67a2a215..d1db411f68c 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -38,5 +38,22 @@
         </field>
     </record>
 
+
+
+    <!-- Replace analytic_id with analytics_id in account.invoice.line -->
+
+
+
+    <record model="ir.ui.view" id="invoice_supplier_form_inherit">
+        <field name="name">account.invoice.supplier.form.inherit</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="account.invoice_supplier_form"/>
+        <field name="priority">2</field>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/purchase_double_validation/i18n/lt.po b/addons/purchase_double_validation/i18n/lt.po
new file mode 100644
index 00000000000..7205a152f84
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/lt.po
@@ -0,0 +1,49 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-29 15:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
+msgid "purchase.config.settings"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.order:0
+msgid "Purchase orders which are not approved yet."
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.config.settings,limit_amount:0
+msgid "limit to require a second approval"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
+msgid "Purchase Orders Waiting Approval"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.order:0
+msgid "To Approve"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.config.settings,limit_amount:0
+msgid "Amount after which validation of purchase is required."
+msgstr ""
diff --git a/addons/purchase_double_validation/test/purchase_double_validation_test.yml b/addons/purchase_double_validation/test/purchase_double_validation_test.yml
old mode 100755
new mode 100644
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index b213f958736..c5d32136a7a 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -194,7 +194,6 @@ class purchase_requisition_line(osv.osv):
     _defaults = {
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition.line', context=c),
     }
-purchase_requisition_line()
 
 class purchase_order(osv.osv):
     _inherit = "purchase.order"
@@ -216,7 +215,6 @@ class purchase_order(osv.osv):
                     po.requisition_id.tender_done(context=context)
         return res
 
-purchase_order()
 
 class product_product(osv.osv):
     _inherit = 'product.product'
@@ -228,7 +226,6 @@ class product_product(osv.osv):
         'purchase_requisition': False
     }
 
-product_product()
 
 class procurement_order(osv.osv):
 
@@ -261,6 +258,5 @@ class procurement_order(osv.osv):
             res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
         return res
 
-procurement_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_requisition/test/purchase_requisition_demo.yml b/addons/purchase_requisition/test/purchase_requisition_demo.yml
old mode 100755
new mode 100644
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index 58a72556b22..0fee8745931 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -47,7 +47,6 @@ class purchase_requisition_partner(osv.osv_memory):
         self.pool.get('purchase.requisition').make_purchase_order(cr, uid, active_ids, data.partner_id.id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-purchase_requisition_partner()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 2d11151cb5b..003aaec8447 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -34,7 +34,6 @@ class res_country(osv.osv):
         'intrastat': lambda *a: False,
     }
 
-res_country()
 
 
 class report_intrastat_code(osv.osv):
@@ -45,7 +44,6 @@ class report_intrastat_code(osv.osv):
         'description': fields.char('Description', size=64),
     }
 
-report_intrastat_code()
 
 
 class product_template(osv.osv):
@@ -55,7 +53,6 @@ class product_template(osv.osv):
         'intrastat_id': fields.many2one('report.intrastat.code', 'Intrastat code'),
     }
 
-product_template()
 
 class report_intrastat(osv.osv):
     _name = "report.intrastat"
@@ -122,6 +119,5 @@ class report_intrastat(osv.osv):
                 group by to_char(inv.create_date, 'YYYY'), to_char(inv.create_date, 'MM'),intrastat.id,inv.type,pt.intrastat_id, inv_country.code,inv.number,  inv.currency_id
             )""")
 
-report_intrastat()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
index 2c23fd8ed90..e00289407d8 100644
--- a/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index b962669eee9..f4035a951de 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index f9ae4191528..b29354938de 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py
index b4d42325bb6..e30209a77dc 100644
--- a/addons/report_webkit/convert.py
+++ b/addons/report_webkit/convert.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/header.py b/addons/report_webkit/header.py
index 71deb57c370..7a290662498 100644
--- a/addons/report_webkit/header.py
+++ b/addons/report_webkit/header.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
@@ -87,7 +87,6 @@ class HeaderHTML(osv.osv):
                 help="Select Proper Paper size"
         )
     }
-HeaderHTML()
 
 class HeaderImage(osv.osv):
     """Logo allows you to define multiple logo per company"""
@@ -98,6 +97,5 @@ class HeaderImage(osv.osv):
         'name' : fields.char('Name', size=128, required =True, help="Name of Image"),
         'type' : fields.char('Type', size=32, required =True, help="Image type(png,gif,jpeg)")
     }
-HeaderImage()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index 4b64a54c420..cea2b4e8329 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index af9408b834e..83286dc59bd 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 01536f471fe..5e65afaae25 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -26,7 +26,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
@@ -40,8 +40,8 @@ import logging
 
 from report_helper import WebKitHelper
 import openerp
+from openerp.modules.module import get_module_resource
 from openerp.report.report_sxw import *
-from openerp import addons
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.osv.osv import except_osv
@@ -280,7 +280,7 @@ class WebKitParser(report_sxw):
         template =  False
 
         if report_xml.report_file :
-            path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
+            path = get_module_resource(*report_xml.report_file.split('/'))
             if path and os.path.exists(path) :
                 template = file(path).read()
         if not template and report_xml.report_webkit_data :
@@ -296,7 +296,7 @@ class WebKitParser(report_sxw):
               )
         if not report_xml.header :
             header = ''
-            default_head = addons.get_module_resource('report_webkit', 'default_header.html')
+            default_head = get_module_resource('report_webkit', 'default_header.html')
             with open(default_head,'r') as f:
                 header = f.read()
         css = report_xml.webkit_header.css
diff --git a/addons/report_webkit/wizard/__init__.py b/addons/report_webkit/wizard/__init__.py
index e8ae8b79fc0..e95244cc7aa 100644
--- a/addons/report_webkit/wizard/__init__.py
+++ b/addons/report_webkit/wizard/__init__.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index 4080d0a4034..e22e7948d59 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -25,7 +25,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 ##############################################################################
 
@@ -138,6 +138,5 @@ class report_webkit_actions(osv.osv_memory):
                     'type': 'ir.actions.act_window',
                 }                   
 
-report_webkit_actions()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/resource/faces/observer.py b/addons/resource/faces/observer.py
index 894345230ea..28ae58eb2b6 100644
--- a/addons/resource/faces/observer.py
+++ b/addons/resource/faces/observer.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/pcalendar.py b/addons/resource/faces/pcalendar.py
index c82c49d4816..24c974233d8 100644
--- a/addons/resource/faces/pcalendar.py
+++ b/addons/resource/faces/pcalendar.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/plocale.py b/addons/resource/faces/plocale.py
index 61bfa91917b..908fd1252e9 100644
--- a/addons/resource/faces/plocale.py
+++ b/addons/resource/faces/plocale.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 import gettext
diff --git a/addons/resource/faces/resource.py b/addons/resource/faces/resource.py
index 3451806444e..faee8174994 100644
--- a/addons/resource/faces/resource.py
+++ b/addons/resource/faces/resource.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 7516f41db2a..961f6213d1d 100644
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -22,7 +22,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 #@-node:<< Copyright >>
diff --git a/addons/resource/faces/timescale.py b/addons/resource/faces/timescale.py
index 3e7c3c1dc89..818c031b7d5 100644
--- a/addons/resource/faces/timescale.py
+++ b/addons/resource/faces/timescale.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 import faces.pcalendar as pcal
diff --git a/addons/resource/faces/utils.py b/addons/resource/faces/utils.py
index 54985767613..6568c314fb5 100644
--- a/addons/resource/faces/utils.py
+++ b/addons/resource/faces/utils.py
@@ -17,7 +17,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program; if not, write to the
 #   Free Software Foundation, Inc.,
-#   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ############################################################################
 
 import observer
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 73a6e2a3ec8..449fa422ab4 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -25,6 +25,7 @@ from dateutil import rrule
 import math
 from faces import *
 from openerp.osv import fields, osv
+from openerp.tools.float_utils import float_compare
 from openerp.tools.translate import _
 
 from itertools import groupby
@@ -108,11 +109,11 @@ class resource_calendar(osv.osv):
         result = []
         maxrecur = 100
         current_hour = dt_from.hour
-        while (todo>0) and maxrecur:
+        while float_compare(todo, 0, 4) and maxrecur:
             cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from desc", (dt_from.weekday(),id))
             for (hour_from,hour_to) in cr.fetchall():
                 leave_flag  = False
-                if (hour_from<current_hour) and (todo>0):
+                if (hour_from<current_hour) and float_compare(todo, 0, 4):
                     m = min(hour_to, current_hour)
                     if (m-hour_from)>todo:
                         hour_from = m-todo
@@ -161,10 +162,10 @@ class resource_calendar(osv.osv):
             result = []
             maxrecur = 100
             current_hour = dt_from.hour
-            while (todo>0) and maxrecur:
+            while float_compare(todo, 0, 4) and maxrecur:
                 for (hour_from,hour_to) in [(item['hour_from'], item['hour_to']) for item in hours_by_cal[id] if item['dayofweek'] == str(dt_from.weekday())]:
                     leave_flag  = False
-                    if (hour_to>current_hour) and (todo>0):
+                    if (hour_to>current_hour) and float_compare(todo, 0, 4):
                         m = max(hour_from, current_hour)
                         if (hour_to-m)>todo:
                             hour_to = m+todo
@@ -317,7 +318,6 @@ class resource_calendar(osv.osv):
         # return timedelta converted to hours
         return (hours_timedelta.days * 24.0 + hours_timedelta.seconds / 3600.0)
 
-resource_calendar()
 
 class resource_calendar_attendance(osv.osv):
     _name = "resource.calendar.attendance"
@@ -337,7 +337,6 @@ class resource_calendar_attendance(osv.osv):
     _defaults = {
         'dayofweek' : '0'
     }
-resource_calendar_attendance()
 
 def hours_time_string(hours):
     """ convert a number of hours (float) into a string with format '%H:%M' """
@@ -475,7 +474,6 @@ class resource_resource(osv.osv):
             wktime_cal.append((non_working[:-1], time_range))
         return wktime_cal
 
-resource_resource()
 
 class resource_calendar_leaves(osv.osv):
     _name = "resource.calendar.leaves"
@@ -508,6 +506,5 @@ class resource_calendar_leaves(osv.osv):
             return {'value': result}
         return {'value': {'calendar_id': []}}
 
-resource_calendar_leaves()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/html/Gunther-Rombouts.png b/addons/sale/html/Gunther-Rombouts.png
new file mode 100644
index 00000000000..094eb7c764d
Binary files /dev/null and b/addons/sale/html/Gunther-Rombouts.png differ
diff --git a/addons/sale/html/Philippe-Leruth.png b/addons/sale/html/Philippe-Leruth.png
new file mode 100644
index 00000000000..ee024149207
Binary files /dev/null and b/addons/sale/html/Philippe-Leruth.png differ
diff --git a/addons/sale/html/index.html b/addons/sale/html/index.html
new file mode 100644
index 00000000000..1eb6215db2f
--- /dev/null
+++ b/addons/sale/html/index.html
@@ -0,0 +1,296 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Sales Management Made Easy</h2>
+        <h3 class="oe_slogan">From quotes to invoices, in just a few clicks</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=sale">
+                    <img src="sale_invoice.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Drive your sales operations from quotes to invoices with all the information
+you need, easily accessible. Keep track of long term contracts, automate invoicing
+and notify sales when they have things to do.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Create Professional Quotations</h2>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Create quotations in a matter of seconds. Send quotes by email or get a
+professional PDF. Track quotations, and convert them to sales order in one click.
+            </p>
+            <p class='oe_mt32'>
+Spend the extra time focusing on selling, not recording data.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Integrated</h2>
+        <h3 class="oe_slogan">The information your need, where you need it</h3>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Don't lose time looking for customers, products or contracts
+                related information; they are all conveniently accessible when
+                creating quotations.
+            </p><p class='oe_mt32'>
+                Get access to stock availabilities in the different warehouses,
+                to customer's specific prices, to the history of preceeding
+                offers for this prospect, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/marketing.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/marketing" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Your Address Book</h2>
+        <h3 class="oe_slogan">So many features, so easy to use</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Load customer data from LinkedIn, assign tags to your prospects, manage
+relationships between contacts and store all customer's preferences including
+pricing, billing conditions, addresses, payment terms, etc.
+            </p>
+            <p class='oe_mt32'>
+Navigate through all the documents related to a customer with the powerfull
+breadcrumb: quotations, invoices, emails, meetings.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_03.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <h2 class="oe_slogan">Fully Integrated Invoicing</h2>
+    <h3 class="oe_slogan">All the invoicing methods you need</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_04.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Whether you invoice based on time and materials, on delivery
+                orders or fixed price; OpenERP supports all possible methods.
+            </p>
+            <p class='oe_mt32'>
+                Get recurring invoices produced automatically, create advances
+                in just a few clicks, re-invoices expenses easily, etc.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+      <h2 class="oe_slogan">Keep track of your contracts</h2>
+      <div class="oe_span6">
+            <p class='oe_mt32'>
+Get rid of wasted paper and record all your contracts in the application. Invoices
+are generated automatically based on your contract conditions. Your account
+managers get alerts before contracts have to be renewed.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_05.png">
+            </div>
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Communicate Efficiently With Customers</h2>
+      <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_06.png">
+            </div>
+       </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+The chatter feature enables you to communicate faster and more efficiently with
+your customer. This takes place directly on a quotation or sale order from
+within OpenERP or via email.
+            </p>
+            <p class='oe_mt32'>
+Get all the negotiations and discussions attached to the right document
+and relevent managers notified on specific events.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Extensible</h2>
+        <h3 class="oe_slogan">Activate features on demand</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+By default, sales order are very simple, limited to a small number of features.
+Don't be confused by features you don't need.
+            </p>
+            <p class='oe_mt32'>
+But you can activate options to fit your specific need: multi-warehouses, multi
+unit of measures, manage customer specific prices with pricelists, control
+margins on quotations, use different addresses for shipping and billing, etc.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_07.png">
+            </div>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Built-in Customer Relationship Management</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_08.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Activate the CRM application to manage your funnel of opportunities, attract
+leads, log calls, schedule meetings and launch marketing campaigns.
+            </p>
+            <p class='oe_mt32'>
+            Opportunities can be converted into quotations in just one click.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Drive Engagement with Gamification</h2>
+       <h3 class="oe_slogan">Align Sales On Clear Targets</h3>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Define clear targets and commission plans. Get real time statistics on the
+performance of individual sales or teams. Motivate your teams with challenges,
+rewards and leaderboards.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_00.png">
+            </div>
+        </div>
+     </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Have Clear Pricing Strategies</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture" src="sales_target.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Use pricelists to record special conditions for a specific customer or to
+define prices for a segment of customers. Define promotions and have them
+applied automatically for all your sales teams.
+            </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Reporting and Dashboards</h2>
+        <h3 class="oe_slogan">Get access to the right information to make smart decisions</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the insights you need to make smarter decisions. Design custom dashboards
+to get a picture of your business at a glance. Dig deeper with real-time
+reports that anyone can create and share.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="sale_sc_10.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP proved to be an effective tool to sustain our operations
+                    for the bright future. It's stable, robust and easy.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Philippe-Leruth.png">
+                    <div class="oe_author">Philippe Leruth</div>
+                    <div class="oe_job">Director of Singer France</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP is a great tool to drive sales. We manage our prospects in different stages
+                    to get a proper overview of our success rate.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Gunther-Rombouts.png">
+                    <div class="oe_author">Ir Ing Gunther Rombouts</div>
+                    <div class="oe_job">Indutrial Automation Specialist at <a href="http://www.hew-automation.be" target="_blank">HeW automation</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/sale/html/sale_invoice.png b/addons/sale/html/sale_invoice.png
new file mode 100644
index 00000000000..396276e5f7a
Binary files /dev/null and b/addons/sale/html/sale_invoice.png differ
diff --git a/addons/sale/html/sale_sc_00.png b/addons/sale/html/sale_sc_00.png
new file mode 100644
index 00000000000..8f1ff1e95fe
Binary files /dev/null and b/addons/sale/html/sale_sc_00.png differ
diff --git a/addons/sale/html/sale_sc_01.png b/addons/sale/html/sale_sc_01.png
new file mode 100644
index 00000000000..ba068ab11c1
Binary files /dev/null and b/addons/sale/html/sale_sc_01.png differ
diff --git a/addons/sale/html/sale_sc_02.png b/addons/sale/html/sale_sc_02.png
new file mode 100644
index 00000000000..4e89d43c4c3
Binary files /dev/null and b/addons/sale/html/sale_sc_02.png differ
diff --git a/addons/sale/html/sale_sc_03.png b/addons/sale/html/sale_sc_03.png
new file mode 100644
index 00000000000..42abf28506c
Binary files /dev/null and b/addons/sale/html/sale_sc_03.png differ
diff --git a/addons/sale/html/sale_sc_04.png b/addons/sale/html/sale_sc_04.png
new file mode 100644
index 00000000000..458c8280c26
Binary files /dev/null and b/addons/sale/html/sale_sc_04.png differ
diff --git a/addons/sale/html/sale_sc_05.png b/addons/sale/html/sale_sc_05.png
new file mode 100644
index 00000000000..ef41138976e
Binary files /dev/null and b/addons/sale/html/sale_sc_05.png differ
diff --git a/addons/sale/html/sale_sc_06.png b/addons/sale/html/sale_sc_06.png
new file mode 100644
index 00000000000..483e5eec09b
Binary files /dev/null and b/addons/sale/html/sale_sc_06.png differ
diff --git a/addons/sale/html/sale_sc_07.png b/addons/sale/html/sale_sc_07.png
new file mode 100644
index 00000000000..73fcfb3b083
Binary files /dev/null and b/addons/sale/html/sale_sc_07.png differ
diff --git a/addons/sale/html/sale_sc_08.png b/addons/sale/html/sale_sc_08.png
new file mode 100644
index 00000000000..e20c44836ba
Binary files /dev/null and b/addons/sale/html/sale_sc_08.png differ
diff --git a/addons/sale/html/sale_sc_10.png b/addons/sale/html/sale_sc_10.png
new file mode 100644
index 00000000000..b71ce805250
Binary files /dev/null and b/addons/sale/html/sale_sc_10.png differ
diff --git a/addons/sale/html/sales_illu_01.png b/addons/sale/html/sales_illu_01.png
new file mode 100644
index 00000000000..66e680bc42e
Binary files /dev/null and b/addons/sale/html/sales_illu_01.png differ
diff --git a/addons/sale/html/sales_target.png b/addons/sale/html/sales_target.png
new file mode 100644
index 00000000000..41042ce49ea
Binary files /dev/null and b/addons/sale/html/sales_target.png differ
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 405ac210af5..7ca635be446 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-28 14:12+0000\n"
+"PO-Revision-Date: 2013-06-06 11:38+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:22+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -89,6 +89,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -189,7 +191,7 @@ msgstr "Счет аналитики"
 #: field:sale.config.settings,module_sale_journal:0
 msgid "Allow batch invoicing of delivery orders through journals"
 msgstr ""
-"Разрешить групповое выставление счета из заказов на доставку через журналы"
+"Разрешить групповое выставление счетов из заказов доставки через журналы"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -221,7 +223,7 @@ msgstr "Особенности склада"
 #. module: sale
 #: field:sale.config.settings,time_unit:0
 msgid "The default working time unit for services is"
-msgstr ""
+msgstr "Единица измерения времени для услуг"
 
 #. module: sale
 #: field:sale.order.line,product_uom:0
@@ -558,6 +560,7 @@ msgstr "Подготовить счета основанные на распис
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
+"Нельзя отменить позиции заказа продажи на которые был выставлен счет."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -1550,7 +1553,7 @@ msgstr "Искать позиции без счетов"
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: sql_constraint:sale.order:0
@@ -1876,7 +1879,7 @@ msgstr ""
 #. module: sale
 #: view:res.partner:0
 msgid "sale.group_delivery_invoice_address"
-msgstr ""
+msgstr "sale.group_delivery_invoice_address"
 
 #. module: sale
 #: code:addons/sale/sale.py:781
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 706d42913de..b3034cafa28 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -70,8 +70,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_saleorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_quotation0"/>
+            <field name="target_node_id" ref="process_node_saleorder0"/>
+            <field name="source_node_id" ref="process_node_quotation0"/>
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
 
@@ -80,8 +80,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
+            <field name="target_node_id" ref="process_node_invoice0"/>
+            <field name="source_node_id" ref="process_node_saleorder0"/>
             <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/>
         </record>
 
@@ -90,8 +90,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a sales order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_order0"/>
+            <field name="target_node_id" ref="account.process_node_draftinvoices0"/>
+            <field name="source_node_id" ref="process_node_order0"/>
         </record>
 
         <!--
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 130220535f9..3bddf81ade8 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -89,40 +89,19 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Italic" rightIndent="0.0" leftIndent="20.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_9" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -133,22 +112,22 @@
     <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_tblheader_Details"><b>Description</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Tax</para>
+          <para style="terp_tblheader_Details_Centre"><b>Tax</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Quantity</para>
+          <para style="terp_tblheader_Details_Right"><b>Quantity</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_Details_Right"><b>Unit Price</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
+          <para style="terp_tblheader_Details_Centre"><b>Disc.(%)</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
+          <para style="terp_tblheader_Details_Right"><b>Price</b></para>
         </td>
       </tr>
     </blockTable>
@@ -162,13 +141,13 @@
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Shipping address :</para>
+          <para style="terp_default_Bold_9"><b>Shipping address :</b></para>
           <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name) or '' ]] [[ (o.partner_shipping_id and o.partner_shipping_id.name) or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id and display_address(o.partner_shipping_id) ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_Bold_9">Invoice address :</para>
+          <para style="terp_default_Bold_9"><b>Invoice address :</b></para>
           <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.title and o.partner_invoice_id.title.name) or '' ]] [[ (o.partner_invoice_id and o.partner_invoice_id.name) or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id and display_address(o.partner_invoice_id) ]] </para>
         </td>
@@ -195,25 +174,25 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
-    <para style="terp_header">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
+    <para style="terp_header"><b>[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</b></para>
+    <para style="terp_header"><b>[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</b></para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Your Reference </para>
+          <para style="terp_tblheader_General_Centre"><b>Your Reference </b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Date Ordered</para>
-          <para style="terp_tblheader_General_Centre">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation Date</para>
+          <para style="terp_tblheader_General_Centre"><b>[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Date Ordered</b></para>
+          <para style="terp_tblheader_General_Centre"><b>[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation Date</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Salesperson</para>
+          <para style="terp_tblheader_General_Centre"><b>Salesperson</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Payment Term</para>
+          <para style="terp_tblheader_General_Centre"><b>Payment Term</b></para>
         </td>
       </tr>
     </blockTable>
@@ -239,22 +218,22 @@
     <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_tblheader_Details"><b>Description</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Tax</para>
+          <para style="terp_tblheader_Details_Centre"><b>Tax</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Quantity</para>
+          <para style="terp_tblheader_Details_Right"><b>Quantity</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_Details_Right"><b>Unit Price</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">[[not show_discount(user.id) and removeParentNode('para') ]]Disc.(%)</para>
+          <para style="terp_tblheader_Details_Centre"><b>[[not show_discount(user.id) and removeParentNode('para') ]]Disc.(%)</b></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
+          <para style="terp_tblheader_Details_Right"><b>Price</b></para>
         </td>
       </tr>
     </blockTable>
@@ -317,10 +296,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Total :</para>
+          <para style="terp_default_Bold_9"><b>Total :</b></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9_Bold"><b>[[ formatLang(o.amount_total, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</b></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 070e9c4336f..80143379247 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -110,6 +110,5 @@ class sale_report(osv.osv):
                     s.project_id
             )
         """)
-sale_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index ec2307ca983..bfbaa5f0a6f 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -58,7 +58,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
             implied_group='product.group_product_variant',
             help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),
         'module_warning': fields.boolean("Allow configuring alerts by customer or products",
-            help="""Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer.
+            help="""Allow to configure notification on products and trigger them when a user wants to sell a given product or a given customer.
 Example: Product: this product is deprecated, do not purchase more than 5.
                 Supplier: don't forget to ask for an express delivery."""),
         'module_sale_margin': fields.boolean("Display margins on sales orders",
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index 1b37b609179..8201e147e34 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -41,7 +41,7 @@ class res_partner(osv.osv):
 
         default.update({'sale_order_ids': []})
 
-        super(res_partner, self).copy(cr, uid, record_id, default, context)
+        return super(res_partner, self).copy(cr, uid, record_id, default, context)
 
     _columns = {
         'sale_order_count': fields.function(_sale_order_count, string='# of Sales Order', type='integer'),
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 54a9813eea9..5107f0c17af 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -63,14 +63,22 @@
             <field name="arch" type="xml">
                 <xpath expr="//label[@for='type']" position="attributes">
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
-                </xpath>
-                <xpath expr="//label[@for='type']" position="attributes">
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//div[@name='div_type']" position="attributes">
                     <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
-                <xpath expr="//div[@name='div_type']" position="attributes">
+                <!--  Version-specific hacks to avoid breaking view inheritance when the sale module
+                      is installed on top of an older 7.0 version of the base module
+                      (as the second embedded div_type was added later in the 7.0 release)
+                      TODO: remove the hacks in trunk -->
+                <xpath expr="//div[@name='div_type'][field[@name='use_parent_address']] | //field[@name='child_ids']//div[@name='div_type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                    <attribute name="groups">sale.group_delivery_invoice_address</attribute>
+                </xpath>
+                <xpath expr="//label[@for='type'][following-sibling::div[@name='div_type']/field[@name='use_parent_address']] | //field[@name='child_ids']//label[@for='type']" position="attributes">
+                    <attribute name="invisible">False</attribute>
                     <attribute name="groups">sale.group_delivery_invoice_address</attribute>
                 </xpath>
             </field>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index d1b4236cd4e..f34137f8231 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -42,7 +42,6 @@ class sale_shop(osv.osv):
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.shop', context=c),
     }
 
-sale_shop()
 
 class sale_order(osv.osv):
     _name = "sale.order"
@@ -211,8 +210,7 @@ class sale_order(osv.osv):
         'order_policy': fields.selection([
                 ('manual', 'On Demand'),
             ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
-            help="""This field controls how invoice and delivery operations are synchronized.
-  - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""),
+            help="""This field controls how invoice and delivery operations are synchronized."""),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."),
         'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency", readonly=True, required=True),
         'project_id': fields.many2one('account.analytic.account', 'Contract / Analytic', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
@@ -275,7 +273,7 @@ class sale_order(osv.osv):
             if s['state'] in ['draft', 'cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it before !'))
+                raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it before!'))
 
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
@@ -322,10 +320,6 @@ class sale_order(osv.osv):
             return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False,  'payment_term': False, 'fiscal_position': False}}
 
         part = self.pool.get('res.partner').browse(cr, uid, part, context=context)
-        #if the chosen partner is not a company and has a parent company, use the parent to choose the delivery, the 
-        #invoicing addresses and all the fields related to the partner.
-        if part.parent_id and not part.is_company:
-            part = part.parent_id
         addr = self.pool.get('res.partner').address_get(cr, uid, [part.id], ['delivery', 'invoice', 'contact'])
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         payment_term = part.property_payment_term and part.property_payment_term.id or False
@@ -701,7 +695,7 @@ class sale_order_line(osv.osv):
     _description = 'Sales Order Line'
     _columns = {
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'name': fields.text('Description', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'name': fields.text('Description', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
@@ -876,7 +870,7 @@ class sale_order_line(osv.osv):
         context = context or {}
         lang = lang or context.get('lang',False)
         if not  partner_id:
-            raise osv.except_osv(_('No Customer Defined !'), _('Before choosing a product,\n select a customer in the sales form.'))
+            raise osv.except_osv(_('No Customer Defined!'), _('Before choosing a product,\n select a customer in the sales form.'))
         warning = {}
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
@@ -1026,4 +1020,16 @@ class account_invoice(osv.Model):
             sale_order_obj.message_post(cr, uid, so_ids, body=_("Invoice paid"), context=context)
         return res
 
+    def unlink(self, cr, uid, ids, context=None):
+        """ Overwrite unlink method of account invoice to send a trigger to the sale workflow upon invoice deletion """
+        invoice_ids = self.search(cr, uid, [('id', 'in', ids), ('state', 'in', ['draft', 'cancel'])], context=context)
+        #if we can't cancel all invoices, do nothing
+        if len(invoice_ids) == len(ids):
+            #Cancel invoice(s) first before deleting them so that if any sale order is associated with them
+            #it will trigger the workflow to put the sale order in an 'invoice exception' state
+            wf_service = netsvc.LocalService("workflow")
+            for id in ids:
+                wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr)
+        return super(account_invoice, self).unlink(cr, uid, ids, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 428b586ffa8..eb937199aba 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -288,6 +288,8 @@
         </record>
 
         <!-- Confirm some Sale Orders-->
+        <workflow action="order_confirm" model="sale.order" ref="sale_order_4"/>
+
         <workflow action="order_confirm" model="sale.order" ref="sale_order_7"/>
 
         <record id="message_sale_1" model="mail.message">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index e3a393666b4..d8d038eb002 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -156,7 +156,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
                             <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
-                            <field name="project_id" context="{'partner_id':partner_id, 'default_pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
+                            <field name="project_id" context="{'partner_id':partner_invoice_id, 'default_pricelist_id':pricelist_id, 'default_name':name, 'default_type': 'contract'}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
                             <field name="date_order"/>
@@ -307,8 +307,8 @@
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
-                    <filter string="My Sales Orders" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
-                    <field name="partner_id"/>
+                    <filter string="My" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <group expand="0" string="Group By...">
@@ -328,19 +328,23 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
-            <field name="context">{'show_address': 1}</field>
-            <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
+            <field name="context">{
+                    'search_default_my_sale_orders_filter': 1
+                }
+            </field>
+            <field name="domain">[('state', 'not in', ('draft', 'sent', 'cancel'))]</field>
             <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a quotation that can be converted into a sales
-                order.
-              </p><p>
-                OpenERP will help you efficiently handle the complete sales flow:
-                quotation, sales order, delivery, invoicing and payment.
-              </p>
+                <p class="oe_view_nocontent_create">
+                    Click to create a quotation that can be converted into a sales
+                    order.
+                </p><p>
+                    OpenERP will help you efficiently handle the complete sales flow:
+                    quotation, sales order, delivery, invoicing and payment.
+                </p>
             </field>
         </record>
-        <menuitem action="action_orders" id="menu_sale_order" parent="base.menu_sales" sequence="5" groups="base.group_sale_salesman,base.group_sale_manager"/>
+
+        <menuitem action="action_orders" id="menu_sale_order" parent="base.menu_sales" sequence="6" groups="base.group_sale_salesman,base.group_sale_manager"/>
 
         <record id="action_orders_exception" model="ir.actions.act_window">
             <field name="name">Sales in Exception</field>
@@ -371,7 +375,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_quotation_tree"/>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{'show_address': 1}</field>
+            <field name="context">{'search_default_my_sale_orders_filter': 1}</field>
             <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="help" type="html">
@@ -390,8 +394,8 @@
         </record>
 
         <menuitem id="menu_sale_quotations"
-        action="action_quotations" parent="base.menu_sales"
-        sequence="4"/>
+                action="action_quotations" parent="base.menu_sales"
+                sequence="5"/>
 
         <record id="action_order_tree" model="ir.actions.act_window">
             <field name="name">Old Quotations</field>
@@ -472,7 +476,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personnal" domain="[('salesman_id','=',uid)]" help="Sales Order Lines related to a Sales Order of mine"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id"/>
+                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">
@@ -498,7 +502,7 @@
                     <separator/>
                     <filter string="My Sales Order Lines" icon="terp-personal" domain="[('salesman_id','=',uid)]" help="My Sales Order Lines"/>
                     <field name="order_id"/>
-                    <field name="order_partner_id"/>
+                    <field name="order_partner_id" filter_domain="[('order_partner_id', 'child_of', self)]"/>
                     <field name="product_id"/>
                     <field name="salesman_id"/>
                     <group expand="0" string="Group By...">
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 656e21a2963..3b04319f5c7 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import osv, fields
 from openerp.tools.translate import _
+from openerp import netsvc
 
 class sale_order_line_make_invoice(osv.osv_memory):
     _name = "sale.order.line.make.invoice"
@@ -80,6 +81,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
 
         sales_order_line_obj = self.pool.get('sale.order.line')
         sales_order_obj = self.pool.get('sale.order')
+        wf_service = netsvc.LocalService('workflow')
         for line in sales_order_line_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if (not line.invoiced) and (line.state not in ('draft', 'cancel')):
                 if not line.order_id in invoices:
@@ -128,6 +130,5 @@ class sale_order_line_make_invoice(osv.osv_memory):
             'type': 'ir.actions.act_window',
         }
 
-sale_order_line_make_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 47716018caa..3712feda20b 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -67,6 +67,5 @@ class sale_make_invoice(osv.osv_memory):
 
         return result
 
-sale_make_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 5d3cc165b46..4cb00245ade 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -210,6 +210,5 @@ class sale_advance_payment_inv(osv.osv_memory):
             'type': 'ir.actions.act_window',
         }
 
-sale_advance_payment_inv()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 90d9eb5c3b9..8995b7b45c0 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2010-12-25 22:14+0000\n"
+"PO-Revision-Date: 2013-06-03 08:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:32+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Разнесение аналитики"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Заказ продаж"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 2abbab7ab38..522f6b6f0fb 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -37,7 +37,6 @@ class sale_order_line(osv.osv):
             i = i + 1
         return create_ids
 
-sale_order_line()
 
 class sale_order(osv.osv):
     _inherit = "sale.order"
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 6c788866520..121efbdf12e 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -38,5 +38,31 @@
         </field>
     </record>
 
+
+    <!-- Replace analytic_id with analytics_id in account.invoice.line -->
+
+    <record model="ir.ui.view" id="view_invoice_line_form_inherit">
+        <field name="name">account.invoice.line.form.inherit</field>
+        <field name="model">account.invoice.line</field>
+        <field name="inherit_id" ref="account.view_invoice_line_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_invoice_form_analytic_inherit">
+        <field name="name">account.invoice.form.analytic.inherit</field>
+        <field name="model">account.invoice</field>
+        <field name="inherit_id" ref="account.invoice_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]" groups="analytic.group_analytic_accounting"/>
+            </field>
+        </field>
+    </record>
+
+
   </data>
 </openerp>
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 6591589342e..7db1aa1eff0 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -47,7 +47,11 @@ modules.
         'security/ir.model.access.csv',
         'report/sale_crm_account_invoice_report_view.xml',
     ],
-    'demo': [],
+    'js': [
+        'static/lib/justgage.js',
+        'static/src/js/sale_crm.js',
+    ],
+    'demo': ['sale_crm_demo.xml'],
     'test': ['test/sale_crm.yml'],
     'installable': True,
     'auto_install': True,
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index 8ae90e42303..f6266edf8ca 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-03-23 13:50+0000\n"
+"PO-Revision-Date: 2013-06-03 08:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:10+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-04 05:20+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Недостаточно данных!"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -31,12 +31,12 @@ msgstr "Преобразовать в предложение"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Статистика по счетам"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Отметить \"Выиграна\""
 
 #. module: sale_crm
 #: field:res.users,default_section_id:0
@@ -51,23 +51,23 @@ msgstr "Мои отделы продаж"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sales order."
-msgstr ""
+msgstr "Отметьте, для закрытия предложения после создания заказа продажи."
 
 #. module: sale_crm
 #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
 msgid "Quotation Send"
-msgstr ""
+msgstr "Отправить предложение"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:124
@@ -94,7 +94,7 @@ msgstr "Продать"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Счет"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:93
@@ -106,7 +106,7 @@ msgstr "Предложение: %s"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "Предложение <b>преобразовано</b> в заявку <em>%s</em>."
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -117,12 +117,12 @@ msgstr "Магазин"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Не задан адрес для этого заказчика"
 
 #. module: sale_crm
 #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
 msgid "Sales Order Confirmed"
-msgstr ""
+msgstr "Заказ продаж подтвержден"
 
 #. module: sale_crm
 #: view:account.invoice:0
@@ -136,7 +136,7 @@ msgstr "Отдел продаж"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "Создать заявку"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -156,7 +156,7 @@ msgstr "Заказ продаж"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #~ msgid "Create"
 #~ msgstr "Создать"
diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index 721508a2ba5..21297e12dbd 100644
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -42,8 +42,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Crm opportunity quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opportunity goes into the quotation&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="sale.process_node_quotation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_crmopportunity0"/>
+            <field name="target_node_id" ref="sale.process_node_quotation0"/>
+            <field name="source_node_id" ref="process_node_crmopportunity0"/>
         </record>
 
 
@@ -51,24 +51,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Quotation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opportunity convert into quotation&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_crmquotation0"/>
-            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_crmquotation0"/>
+            <field name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         <record id="process_transition_opportunitypricelist0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Pricelist&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Opporunity convert to the Pricelist&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
-            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_contractpricelist0"/>
+            <field name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         <record id="process_transition_opportunityanalytic0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Opportunity Analytic&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Analytic Account&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
-            <field model="process.node" name="source_node_id" ref="crm.process_node_opportunities0"/>
+            <field name="target_node_id" ref="process_node_contractanalytic0"/>
+            <field name="source_node_id" ref="crm.process_node_opportunities0"/>
         </record>
 
         -->
diff --git a/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml b/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml
index 41166d56713..983701d9690 100644
--- a/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml
+++ b/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml
@@ -10,7 +10,7 @@
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//field[@name='date']" position="after">
-                    <field name="section_id"/>
+                    <field name="section_id" groups="base.group_multi_salesteams"/>
                 </xpath>
             </data>
         </field>
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 1f3f85d5ed1..97c5f4579e0 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -19,8 +19,13 @@
 #
 ##############################################################################
 
+from datetime import date
+from dateutil import relativedelta
+
+from openerp import tools
 from openerp.osv import osv, fields
 
+
 class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
@@ -29,6 +34,61 @@ class sale_order(osv.osv):
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
+    def _prepare_invoice(self, cr, uid, order, lines, context=None):
+        invoice_vals = super(sale_order, self)._prepare_invoice(cr, uid, order, lines, context=context)
+        if order.section_id and order.section_id.id:
+            invoice_vals['section_id'] = order.section_id.id
+        return invoice_vals
+
+
+class crm_case_section(osv.osv):
+    _inherit = 'crm.case.section'
+
+    def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool.get('sale.order')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            res[id] = dict()
+            created_domain = [('section_id', '=', id), ('state', 'in', ['draft', 'sent']), ('date_order', '>=', groupby_begin)]
+            res[id]['monthly_quoted'] = self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context)
+            validated_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'sent']), ('date_confirm', '>=', groupby_begin)]
+            res[id]['monthly_confirmed'] = self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_confirm'], 'amount_total', 'date_confirm', context=context)
+        return res
+
+    def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
+        obj = self.pool.get('account.invoice.report')
+        res = dict.fromkeys(ids, False)
+        month_begin = date.today().replace(day=1)
+        groupby_begin = (month_begin + relativedelta.relativedelta(months=-4)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        for id in ids:
+            created_domain = [('section_id', '=', id), ('state', 'not in', ['draft', 'cancel']), ('date', '>=', groupby_begin)]
+            res[id] = self.__get_bar_values(cr, uid, obj, created_domain, ['price_total', 'date'], 'price_total', 'date', context=context)
+        return res
+
+    _columns = {
+        'invoiced_forecast': fields.integer(string='Invoice Forecast',
+            help="Forecast of the invoice revenue for the current month. This is the amount the sales \n"
+                    "team should invoice this month. It is used to compute the progression ratio \n"
+                    " of the current and forecast revenue on the kanban view."),
+        'invoiced_target': fields.integer(string='Invoice Target',
+            help="Target of invoice revenue for the current month. This is the amount the sales \n"
+                    "team estimates to be able to invoice this month."),
+        'monthly_quoted': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of created quotation per duration'),
+        'monthly_confirmed': fields.function(_get_sale_orders_data,
+            type='string', readonly=True, multi='_get_sale_orders_data',
+            string='Rate of validate sales orders per duration'),
+        'monthly_invoiced': fields.function(_get_invoices_data,
+            type='string', readonly=True,
+            string='Rate of sent invoices per duration'),
+    }
+
+    def action_forecast(self, cr, uid, id, value, context=None):
+        return self.write(cr, uid, [id], {'invoiced_forecast': value}, context=context)
+
 
 class res_users(osv.Model):
     _inherit = 'res.users'
@@ -36,13 +96,29 @@ class res_users(osv.Model):
         'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
     }
 
+
+class sale_crm_lead(osv.Model):
+    _inherit = 'crm.lead'
+
+    def on_change_user(self, cr, uid, ids, user_id, context=None):
+        """ Override of on change user_id on lead/opportunity; when having sale
+            the new logic is :
+            - use user.default_section_id
+            - or fallback on previous behavior """
+        if user_id:
+            user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
+            if user.default_section_id and user.default_section_id.id:
+                return {'value': {'section_id': user.default_section_id.id}}
+        return super(sale_crm_lead, self).on_change_user(cr, uid, ids, user_id, context=context)
+
+
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
     _defaults = {
-        'section_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
+        'section_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm_demo.xml b/addons/sale_crm/sale_crm_demo.xml
new file mode 100644
index 00000000000..0c2822719dd
--- /dev/null
+++ b/addons/sale_crm/sale_crm_demo.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="crm.case.section" id="crm.section_sales_department">
+            <field name="invoiced_forecast">52700</field>
+            <field name="invoiced_target">60000</field>
+        </record>
+        
+        <record model="crm.case.section" id="crm.crm_case_section_1">
+            <field name="name">Indirect Sales</field>
+            <field name="code">IM</field>
+            <field name="invoiced_forecast">36000</field>
+            <field name="invoiced_target">40000</field>
+        </record>
+
+        <!-- Invoice for Direct Marketing -->
+
+        <record id="test_crm_sale_invoice_1" model="account.invoice">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="name">Test invoice 1</field>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_1" model="account.invoice.line">
+            <field name="name">Basic computer with Dvorak keyboard and left-handed mouse</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">250</field>
+            <field name="quantity">1</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
+            <field name="name">Little server with raid 1 and 512ECC ram</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">800</field>
+            <field name="quantity">2</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <record id="test_crm_sale_invoice_1_line_2" model="account.invoice.line">
+            <field name="name">Server with raid 10 and 2048ECC ram</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_1"/>
+            <field name="price_unit">4800</field>
+            <field name="quantity">4</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_1"/>
+        <function model="account.invoice" name="pay_and_reconcile">
+            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_1')]"/>
+            <!-- pay_amount = -->            <value eval="1850"/>
+            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
+        </function>
+
+        <!-- Invoice for Indirect Marketing -->
+
+        <record id="test_crm_sale_invoice_2" model="account.invoice">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="partner_id" ref="base.res_partner_1"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="name">Test invoice 1</field>
+        </record>
+        <record id="test_crm_sale_invoice_2_line_1" model="account.invoice.line">
+            <field name="name">Basic formation with Dvorak</field>
+            <field name="invoice_id" ref="test_crm_sale_invoice_2"/>
+            <field name="price_unit">500</field>
+            <field name="quantity">1</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="test_crm_sale_invoice_2"/>
+        <function model="account.invoice" name="pay_and_reconcile">
+            <!-- ids = -->                    <value eval="[ref('test_crm_sale_invoice_2')]"/>
+            <!-- pay_amount = -->            <value eval="500"/>
+            <!-- pay_account_id = -->        <value eval="ref('account.cash')"/>
+            <!-- period_id = -->            <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- pay_journal_id = -->        <value eval="ref('account.bank_journal')"/>
+            <!-- writeoff_acc_id = -->        <value eval="ref('account.cash')"/>
+            <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
+            <!-- writeoff_journal_id = -->    <value eval="ref('account.bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
+        </function>
+
+
+        <record id="sale.sale_order_1" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_2" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_3" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+        </record>
+        <record id="sale.sale_order_4" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+        </record>
+        <record id="sale.sale_order_5" model="sale.order">
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+            <field name="date_order" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_6" model="sale.order">
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+        </record>
+        <record id="sale.sale_order_7" model="sale.order">
+            <field name="section_id" ref="crm.section_sales_department"/>
+            <field name="date_confirm" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="sale.sale_order_8" model="sale.order">
+            <field name="section_id" ref="crm.crm_case_section_1"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 0b5fce2f5cd..ae21934ce61 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -16,13 +16,18 @@
             </field>
         </record>
 
+        <!-- add needaction_menu_ref to reload quotation needaction when opportunity needaction is reloaded -->
+        <record model="ir.actions.act_window" id="crm.crm_case_category_act_oppor11">
+            <field name="context">{'stage_type': 'opportunity', 'default_type': 'opportunity', 'default_user_id': uid, 'needaction_menu_ref': 'sale.menu_sale_quotations'}</field>
+        </record>
+
         <record model="ir.ui.view" id="sale_view_inherit123">
             <field name="name">sale.order.inherit</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="section_id" widget="selection"/>
+                    <field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
                     <field name="categ_ids" widget="many2many_tags"/>
                 </field>
             </field>
@@ -38,10 +43,10 @@
                     <filter string="My Sales Team(s)"
                         icon="terp-personal+"
                         domain="[('section_id.user_id','=',uid)]"
-                        help="My Sales Team(s)"/>
+                        help="My Sales Team(s)"  groups="base.group_multi_salesteams"/>
                 </xpath>
                 <xpath expr="//field[@name='user_id']" position="after">
-                    <field name="section_id" string="Sales Team"/>
+                    <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
                 </xpath>
             </field>
         </record>
@@ -53,20 +58,24 @@
             <field name="inherit_id" ref="account.invoice_tree"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='date_invoice']" position="after">
-                        <field name="section_id" invisible="1"/>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
                     </xpath>
                 </data>
             </field>
         </record>
 
+        <!-- Update account invoice search view!-->
         <record id="account_invoice_groupby_inherit" model="ir.ui.view">
             <field name="name">account.invoice.groupby</field>
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.view_account_invoice_filter"/>
             <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="after">
+                    <field name="section_id"/>
+                </xpath>
                 <xpath expr="//group/filter[@string='Due Date']" position="after">
-                    <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}" groups="base.group_multi_salesteams"/>
                 </xpath>
             </field>
         </record>
@@ -79,7 +88,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//field[@name='user_id']" position="after">
-                        <field name="section_id"/>
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
                     </xpath>
                 </data>
             </field>
@@ -92,7 +101,7 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='email']" position="after">
+                    <xpath expr="//field[@name='tz']" position="after">
                         <field name="default_section_id"/>
                     </xpath>
                 </data>
@@ -106,12 +115,168 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                    <xpath expr="//field[@name='company_id']" position="after">
+                    <xpath expr="//field[@name='company_id']" position="before">
                         <field name="default_section_id"/>
                     </xpath>
                 </data>
             </field>
         </record>
 
+        <!-- search by Salesteams -->
+
+        <record id="action_orders_salesteams" model="ir.actions.act_window">
+            <field name="name">Sales Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+            <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id,
+                }
+            </field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a quotation that can be converted into a sales
+                order.
+              </p><p>
+                OpenERP will help you efficiently handle the complete sales flow:
+                quotation, sales order, delivery, invoicing and payment.
+              </p>
+            </field>
+        </record>
+
+        <record id="action_quotations_salesteams" model="ir.actions.act_window">
+            <field name="name">Quotations</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="sale.view_quotation_tree"/>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id,
+                    'show_address': 1,
+                }
+            </field>
+            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
+            <field name="search_view_id" ref="sale.view_sales_order_filter"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a quotation, the first step of a new sale.
+              </p><p>
+                OpenERP will help you handle efficiently the complete sale flow:
+                from the quotation to the sales order, the
+                delivery, the invoicing and the payment collection.
+              </p><p>
+                The social feature helps you organize discussions on each sales
+                order, and allow your customers to keep track of the evolution
+                of the sales order.
+              </p>
+            </field>
+        </record>
+
+        <record id="action_invoice_salesteams" model="ir.actions.act_window">
+            <field name="name">Invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_id" ref="account.invoice_tree"/>
+            <field name="domain">[
+                ('state', 'not in', ['draft', 'cancel']),
+                ('type', '=', 'out_invoice')]</field>
+            <field name="context">{
+                    'search_default_section_id': [active_id],
+                    'default_section_id': active_id,
+                    'default_type':'out_invoice',
+                    'type':'out_invoice',
+                    'journal_type': 'sale',
+                }
+            </field>
+            <field name="search_view_id" ref="account.view_account_invoice_filter"/>
+        </record>
+
+        <record id="action_invoice_salesteams_view_tree" model="ir.actions.act_window.view">
+            <field name="sequence">1</field>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="sale_crm.action_invoice_salesteams"/>
+        </record>
+
+        <record id="action_invoice_salesteams_view_form" model="ir.actions.act_window.view">
+            <field name="sequence">2</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account.invoice_form"/>
+            <field name="act_window_id" ref="sale_crm.action_invoice_salesteams"/>
+        </record>
+
+        <record id="crm_case_section_salesteams_view_form" model="ir.ui.view">
+            <field name="name">crm.case.section.form</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="crm.crm_case_section_view_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='code']" position="after">
+                    <field name="invoiced_target"/>
+                    <field name="invoiced_forecast"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="crm_case_section_salesteams_view_kanban" model="ir.ui.view">
+            <field name="name">crm.case.section.kanban</field>
+            <field name="model">crm.case.section</field>
+            <field name="inherit_id" ref="crm.crm_case_section_salesteams_view_kanban"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="monthly_quoted"/>
+                    <field name="monthly_confirmed"/>
+                    <field name="monthly_invoiced"/>
+                    <field name="invoiced_forecast"/>
+                    <field name="invoiced_target"/>
+                </xpath>
+                <xpath expr="//div[@class='oe_salesteams_leads']" position="after">
+                    <div class="oe_salesteams_orders">
+                        <a name="%(action_orders_salesteams)d" type="action">Sales Orders</a>
+                        <a name="%(sale.action_order_report_all)d" type="action" class="oe_sparkline_bar_link">
+                            <field name="monthly_confirmed" widget="sparkline_bar">
+                                Revenue of confirmed sales orders per month.<br/>Click the acces to Sales Analysis
+                            </field>
+                        </a>
+                    </div>
+                </xpath>
+                <xpath expr="//div[@class='oe_salesteams_opportunities']" position="after">
+                    <div class="oe_salesteams_invoices">
+                        <a name="%(action_invoice_salesteams)d" type="action" groups="account.group_account_invoice">Invoices</a>
+                        <a name="%(account.action_account_invoice_report_all)d" type="action" class="oe_sparkline_bar_link">
+                            <field name="monthly_invoiced" widget="sparkline_bar">
+                                Revenue of sent invoices per month.<br/>Click to see a detailed analysis of invoices.
+                            </field>
+                        </a>
+                    </div>
+                    <div class="oe_salesteams_quotations">
+                        <a name="%(action_quotations_salesteams)d" type="action" class="oe_sparkline_bar_link">Quotations</a>
+                        <a name="%(sale.action_order_report_all)d" type="action" class="oe_sparkline_bar_link">
+                            <field name="monthly_quoted" widget="sparkline_bar">
+                                Revenue of created quotation per month.<br/>Click to see a detailed analysis of sales.
+                            </field>
+                        </a>
+                    </div>
+                </xpath>
+                <xpath expr="//div[@class='oe_items_list']" position="after">
+                    <div class="oe_center" t-if="record.invoiced_target.raw_value">
+                        <field name="monthly_invoiced" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target'}">Invoiced</field>
+                        <field name="invoiced_forecast" widget="gage" style="width:160px; height: 120px;" options="{'max_field': 'invoiced_target', 'action_change': 'action_forecast'}">Forecast</field>
+                    </div>
+                    <div class="oe_center" style="color:#bbbbbb;" t-if="!record.invoiced_target.raw_value">
+                        <br/>Define an invoicing target in the sales team settings to see the period's achievement and forecast at a glance.
+                    </div>
+                </xpath>
+            </data>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/sale_crm/static/lib/justgage.js b/addons/sale_crm/static/lib/justgage.js
new file mode 100644
index 00000000000..52b5c6ea0c3
--- /dev/null
+++ b/addons/sale_crm/static/lib/justgage.js
@@ -0,0 +1,883 @@
+/**
+ * JustGage - this is work-in-progress, unreleased, unofficial code, so it might not work top-notch :)
+ * Check http://www.justgage.com for official releases
+ * Licensed under MIT.
+ * @author Bojan Djuricic  (@Toorshia)
+ *
+ * LATEST UPDATES
+
+ * -----------------------------
+ * April 01, 2013.
+ * -----------------------------
+     * fix - https://github.com/toorshia/justgage/issues/46
+
+ * -----------------------------
+ * March 26, 2013.
+ * -----------------------------
+     * customSectors - define specific color for value range (0-10 : red, 10-30 : blue etc.)
+
+ * -----------------------------
+ * March 23, 2013.
+ * -----------------------------
+     * counter - option to animate value  in counting fashion
+     * fix - https://github.com/toorshia/justgage/issues/45
+
+ * -----------------------------
+ * March 13, 2013.
+ * -----------------------------
+     * refresh method - added optional 'max' parameter to use when you need to update max value
+
+ * -----------------------------
+ * February 26, 2013.
+ * -----------------------------
+     * decimals - option to define/limit number of decimals when not using humanFriendly or customRenderer to display value
+     * fixed a missing parameters bug when calling generateShadow()  for IE < 9
+
+ * -----------------------------
+ * December 31, 2012.
+ * -----------------------------
+     * fixed text y-position for hidden divs - workaround for Raphael <tspan> 'dy' bug - https://github.com/DmitryBaranovskiy/raphael/issues/491
+     * 'show' parameters, like showMinMax are now 'hide' because I am lame developer - please update these in your setups
+     * Min and Max labels are now auto-off when in donut mode
+     * Start angle in donut mode is now 90
+     * donutStartAngle - option to define start angle for donut
+
+ * -----------------------------
+ * November 25, 2012.
+ * -----------------------------
+     * Option to define custom rendering function for displayed value
+
+ * -----------------------------
+ * November 19, 2012.
+ * -----------------------------
+     * Config.value is now updated after gauge refresh
+
+ * -----------------------------
+ * November 13, 2012.
+ * -----------------------------
+     * Donut display mode added
+     * Option to hide value label
+     * Option to enable responsive gauge size
+     * Removed default title attribute
+     * Option to accept min and max defined as string values
+     * Option to configure value symbol
+     * Fixed bad aspect ratio calculations
+     * Option to configure minimum font size for all texts
+     * Option to show shorthand big numbers (human friendly)
+     */
+
+ JustGage = function(config) {
+
+  if (!config.id) {alert("Missing id parameter for gauge!"); return false;}
+  if (!config.node) {
+    if (!document.getElementById(config.id)) {alert("No element with id: \""+config.id+"\" found!"); return false;}
+    config.node = document.getElementById(config.id);
+  }
+
+  var obj = this;
+
+  // configurable parameters
+  obj.config =
+  {
+    // id : string
+    // this is container element id
+    id : config.id,
+
+    // node : string
+    // the node to use instead of DOM
+    node : config.node,
+
+    // title : string
+    // gauge title
+    title : (config.title) ? config.title : "",
+
+    // titleFontColor : string
+    // color of gauge title
+    titleFontColor : (config.titleFontColor) ? config.titleFontColor : "#999999",
+
+    // value : int
+    // value gauge is showing
+    value : (config.value) ? config.value : 0,
+
+
+    // valueFontColor : string
+    // color of label showing current value
+    valueFontColor : (config.valueFontColor) ? config.valueFontColor : "#010101",
+
+    // symbol : string
+    // special symbol to show next to value
+    symbol : (config.symbol) ? config.symbol : "",
+
+    // min : int
+    // min value
+    min : (config.min) ? parseFloat(config.min) : 0,
+
+    // max : int
+    // max value
+    max : (config.max) ? parseFloat(config.max) : 100,
+
+    // humanFriendlyDecimal : int
+    // number of decimal places for our human friendly number to contain
+    humanFriendlyDecimal : (config.humanFriendlyDecimal) ? config.humanFriendlyDecimal : 0,
+
+    // textRenderer: func
+    // function applied before rendering text
+    textRenderer  : (config.textRenderer) ? config.textRenderer : null,
+
+    // gaugeWidthScale : float
+    // width of the gauge element
+    gaugeWidthScale : (config.gaugeWidthScale) ? config.gaugeWidthScale : 1.0,
+
+    // gaugeColor : string
+    // background color of gauge element
+    gaugeColor : (config.gaugeColor) ? config.gaugeColor : "#edebeb",
+
+    // label : string
+    // text to show below value
+    label : (config.label) ? config.label : "",
+
+    // labelFontColor : string
+    // color of label showing label under value
+    labelFontColor : (config.labelFontColor) ? config.labelFontColor : "#b3b3b3",
+
+    // shadowOpacity : int
+    // 0 ~ 1
+    shadowOpacity : (config.shadowOpacity) ? config.shadowOpacity : 0.2,
+
+    // shadowSize: int
+    // inner shadow size
+    shadowSize : (config.shadowSize) ? config.shadowSize : 5,
+
+    // shadowVerticalOffset : int
+    // how much shadow is offset from top
+    shadowVerticalOffset : (config.shadowVerticalOffset) ? config.shadowVerticalOffset : 3,
+
+    // levelColors : string[]
+    // colors of indicator, from lower to upper, in RGB format
+    levelColors : (config.levelColors) ? config.levelColors : [
+    "#a9d70b",
+    "#f9c802",
+    "#ff0000"
+    ],
+
+    // startAnimationTime : int
+    // length of initial animation
+    startAnimationTime : (config.startAnimationTime) ? config.startAnimationTime : 700,
+
+    // startAnimationType : string
+    // type of initial animation (linear, >, <,  <>, bounce)
+    startAnimationType : (config.startAnimationType) ? config.startAnimationType : ">",
+
+    // refreshAnimationTime : int
+    // length of refresh animation
+    refreshAnimationTime : (config.refreshAnimationTime) ? config.refreshAnimationTime : 700,
+
+    // refreshAnimationType : string
+    // type of refresh animation (linear, >, <,  <>, bounce)
+    refreshAnimationType : (config.refreshAnimationType) ? config.refreshAnimationType : ">",
+
+    // donutStartAngle : int
+    // angle to start from when in donut mode
+    donutStartAngle : (config.donutStartAngle) ? config.donutStartAngle : 90,
+
+    // valueMinFontSize : int
+    // absolute minimum font size for the value
+    valueMinFontSize : config.valueMinFontSize || 16,
+
+    // titleMinFontSize
+    // absolute minimum font size for the title
+    titleMinFontSize : config.titleMinFontSize || 10,
+
+    // labelMinFontSize
+    // absolute minimum font size for the label
+    labelMinFontSize : config.labelMinFontSize || 10,
+
+    // minLabelMinFontSize
+    // absolute minimum font size for the minimum label
+    minLabelMinFontSize : config.minLabelMinFontSize || 10,
+
+    // maxLabelMinFontSize
+    // absolute minimum font size for the maximum label
+    maxLabelMinFontSize : config.maxLabelMinFontSize || 10,
+
+    // hideValue : bool
+    // hide value text
+    hideValue : (config.hideValue) ? config.hideValue : false,
+
+    // hideMinMax : bool
+    // hide min and max values
+    hideMinMax : (config.hideMinMax) ? config.hideMinMax : false,
+
+    // hideInnerShadow : bool
+    // hide inner shadow
+    hideInnerShadow : (config.hideInnerShadow) ? config.hideInnerShadow : false,
+
+    // humanFriendly : bool
+    // convert large numbers for min, max, value to human friendly (e.g. 1234567 -> 1.23M)
+    humanFriendly : (config.humanFriendly) ? config.humanFriendly : false,
+
+    // noGradient : bool
+    // whether to use gradual color change for value, or sector-based
+    noGradient : (config.noGradient) ? config.noGradient : false,
+
+    // donut : bool
+    // show full donut gauge
+    donut : (config.donut) ? config.donut : false,
+
+    // relativeGaugeSize : bool
+    // whether gauge size should follow changes in container element size
+    relativeGaugeSize : (config.relativeGaugeSize) ? config.relativeGaugeSize : false,
+
+    // counter : bool
+    // animate level number change
+    counter : (config.counter) ? config.counter : false,
+
+    // decimals : int
+    // number of digits after floating point
+    decimals : (config.decimals) ? config.decimals : 0,
+
+    // customSectors : [] of objects
+    // number of digits after floating point
+    customSectors : (config.customSectors) ? config.customSectors : []
+  };
+
+  // variables
+  var
+  canvasW,
+  canvasH,
+  widgetW,
+  widgetH,
+  aspect,
+  dx,
+  dy,
+  titleFontSize,
+  titleX,
+  titleY,
+  valueFontSize,
+  valueX,
+  valueY,
+  labelFontSize,
+  labelX,
+  labelY,
+  minFontSize,
+  minX,
+  minY,
+  maxFontSize,
+  maxX,
+  maxY;
+
+  // overflow values
+  if (this.config.value > this.config.max) this.config.value = this.config.max;
+  if (this.config.value < this.config.min) this.config.value = this.config.min;
+  this.originalValue = config.value;
+
+  // canvas
+  this.canvas = Raphael(this.config.node, "100%", "100%");
+  if (this.config.relativeGaugeSize === true) {
+    this.canvas.setViewBox(0, 0, 200, 150, true);
+  }
+
+  // canvas dimensions
+  if (this.config.relativeGaugeSize === true) {
+    canvasW = 200;
+    canvasH = 150;
+  } else {
+    canvasW = getStyle(this.config.node, "width").slice(0, -2) * 1;
+    canvasH = getStyle(this.config.node, "height").slice(0, -2) * 1;
+  }
+
+  // widget dimensions
+  if (this.config.donut === true) {
+
+    // DONUT *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH;
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > 10) ? (widgetH / 10) : 10;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 11;
+
+    // value
+    valueFontSize = ((widgetH / 6.4) > 16) ? (widgetH / 5.4) : 18;
+    valueX = dx + widgetW / 2;
+    if(this.config.label !== '') {
+      valueY = dy + widgetH / 1.85;
+    } else {
+      valueY = dy + widgetH / 1.7;
+    }
+
+    // label
+    labelFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + labelFontSize;
+
+    // min
+    minFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > 10) ? (widgetH / 16) : 10;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+
+  } else {
+    // HALF *******************************
+
+    // width more than height
+    if(canvasW > canvasH) {
+      widgetH = canvasH;
+      widgetW = widgetH * 1.25;
+      //if width doesn't fit, rescale both
+      if(widgetW > canvasW) {
+        aspect = widgetW / canvasW;
+        widgetW = widgetW / aspect;
+        widgetH = widgetH / aspect;
+      }
+    // width less than height
+  } else if (canvasW < canvasH) {
+    widgetW = canvasW;
+    widgetH = widgetW / 1.25;
+      // if height don't fit, rescale both
+      if(widgetH > canvasH) {
+        aspect = widgetH / canvasH;
+        widgetH = widgetH / aspect;
+        widgetW = widgetH / aspect;
+      }
+    // equal
+  } else {
+    widgetW = canvasW;
+    widgetH = widgetW * 0.75;
+  }
+
+    // delta
+    dx = (canvasW - widgetW)/2;
+    dy = (canvasH - widgetH)/2;
+
+    // title
+    titleFontSize = ((widgetH / 8) > this.config.titleMinFontSize) ? (widgetH / 10) : this.config.titleMinFontSize;
+    titleX = dx + widgetW / 2;
+    titleY = dy + widgetH / 6.4;
+
+    // value
+    valueFontSize = ((widgetH / 6.5) > this.config.valueMinFontSize) ? (widgetH / 6.5) : this.config.valueMinFontSize;
+    valueX = dx + widgetW / 2;
+    valueY = dy + widgetH / 1.275;
+
+    // label
+    labelFontSize = ((widgetH / 16) > this.config.labelMinFontSize) ? (widgetH / 16) : this.config.labelMinFontSize;
+    labelX = dx + widgetW / 2;
+    labelY = valueY + valueFontSize / 2 + 5;
+
+    // min
+    minFontSize = ((widgetH / 16) > this.config.minLabelMinFontSize) ? (widgetH / 16) : this.config.minLabelMinFontSize;
+    minX = dx + (widgetW / 10) + (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    minY = labelY;
+
+    // max
+    maxFontSize = ((widgetH / 16) > this.config.maxLabelMinFontSize) ? (widgetH / 16) : this.config.maxLabelMinFontSize;
+    maxX = dx + widgetW - (widgetW / 10) - (widgetW / 6.666666666666667 * this.config.gaugeWidthScale) / 2 ;
+    maxY = labelY;
+  }
+
+  // parameters
+  this.params  = {
+    canvasW : canvasW,
+    canvasH : canvasH,
+    widgetW : widgetW,
+    widgetH : widgetH,
+    dx : dx,
+    dy : dy,
+    titleFontSize : titleFontSize,
+    titleX : titleX,
+    titleY : titleY,
+    valueFontSize : valueFontSize,
+    valueX : valueX,
+    valueY : valueY,
+    labelFontSize : labelFontSize,
+    labelX : labelX,
+    labelY : labelY,
+    minFontSize : minFontSize,
+    minX : minX,
+    minY : minY,
+    maxFontSize : maxFontSize,
+    maxX : maxX,
+    maxY : maxY
+  };
+
+  // var clear
+  canvasW, canvasH, widgetW, widgetH, aspect, dx, dy, titleFontSize, titleX, titleY, valueFontSize, valueX, valueY, labelFontSize, labelX, labelY, minFontSize, minX, minY, maxFontSize, maxX, maxY = null
+
+  // pki - custom attribute for generating gauge paths
+  this.canvas.customAttributes.pki = function (value, min, max, w, h, dx, dy, gws, donut) {
+
+    var alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path;
+
+    if (donut) {
+      alpha = (1 - 2 * (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 7;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.95 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ro + "," + Ro + " 0 0 1 " + (Cx + Ro) + "," + Cy + " ";
+      }
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      if (value > ((max - min) / 2)) {
+        path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx + Ri) + "," + Cy + " ";
+      }
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+
+    } else {
+      alpha = (1 - (value - min) / (max - min)) * Math.PI;
+      Ro = w / 2 - w / 10;
+      Ri = Ro - w / 6.666666666666667 * gws;
+
+      Cx = w / 2 + dx;
+      Cy = h / 1.25 + dy;
+
+      Xo = w / 2 + dx + Ro * Math.cos(alpha);
+      Yo = h - (h - Cy) + 0 - Ro * Math.sin(alpha);
+      Xi = w / 2 + dx + Ri * Math.cos(alpha);
+      Yi = h - (h - Cy) + 0 - Ri * Math.sin(alpha);
+
+      path += "M" + (Cx - Ri) + "," + Cy + " ";
+      path += "L" + (Cx - Ro) + "," + Cy + " ";
+      path += "A" + Ro + "," + Ro + " 0 0 1 " + Xo + "," + Yo + " ";
+      path += "L" + Xi + "," + Yi + " ";
+      path += "A" + Ri + "," + Ri + " 0 0 0 " + (Cx - Ri) + "," + Cy + " ";
+      path += "Z ";
+
+      return { path: path };
+    }
+
+    // var clear
+    alpha, Ro, Ri, Cx, Cy, Xo, Yo, Xi, Yi, path = null;
+  };
+
+  // gauge
+  this.gauge = this.canvas.path().attr({
+    "stroke": "none",
+    "fill": this.config.gaugeColor,
+    pki: [this.config.max, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+  });
+  this.gauge.id = this.config.id+"-gauge";
+
+  // level
+  this.level = this.canvas.path().attr({
+    "stroke": "none",
+    "fill": getColor(this.config.value, (this.config.value - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors),
+    pki: [this.config.min, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]
+  });
+  if(this.config.donut) {
+    this.level.transform("r" + this.config.donutStartAngle + ", " + (this.params.widgetW/2 + this.params.dx) + ", " + (this.params.widgetH/1.95 + this.params.dy));
+  }
+  this.level.id = this.config.id+"-level";
+
+  // title
+  this.txtTitle = this.canvas.text(this.params.titleX, this.params.titleY, this.config.title);
+  this.txtTitle.attr({
+    "font-size":this.params.titleFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":this.config.titleFontColor,
+    "fill-opacity":"1"
+  });
+  setDy(this.txtTitle, this.params.titleFontSize, this.params.titleY);
+  this.txtTitle.id = this.config.id+"-txttitle";
+
+  // value
+  this.txtValue = this.canvas.text(this.params.valueX, this.params.valueY, 0);
+  this.txtValue.attr({
+    "font-size":this.params.valueFontSize,
+    "font-weight":"bold",
+    "font-family":"Arial",
+    "fill":this.config.valueFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(this.txtValue, this.params.valueFontSize, this.params.valueY);
+  this.txtValue.id = this.config.id+"-txtvalue";
+
+  // label
+  this.txtLabel = this.canvas.text(this.params.labelX, this.params.labelY, this.config.label);
+  this.txtLabel.attr({
+    "font-size":this.params.labelFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity":"0"
+  });
+  setDy(this.txtLabel, this.params.labelFontSize, this.params.labelY);
+  this.txtLabel.id = this.config.id+"-txtlabel";
+
+  // min
+  this.txtMinimum = this.config.min;
+  if( this.config.humanFriendly ) this.txtMinimum = humanFriendlyNumber( this.config.min, this.config.humanFriendlyDecimal );
+  this.txtMin = this.canvas.text(this.params.minX, this.params.minY, this.txtMinimum);
+  this.txtMin.attr({
+    "font-size":this.params.minFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+  });
+  setDy(this.txtMin, this.params.minFontSize, this.params.minY);
+  this.txtMin.id = this.config.id+"-txtmin";
+
+  // max
+  this.txtMaximum = this.config.max;
+  if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+  this.txtMax = this.canvas.text(this.params.maxX, this.params.maxY, this.txtMaximum);
+  this.txtMax.attr({
+    "font-size":this.params.maxFontSize,
+    "font-weight":"normal",
+    "font-family":"Arial",
+    "fill":this.config.labelFontColor,
+    "fill-opacity": (this.config.hideMinMax || this.config.donut)? "0" : "1"
+  });
+  setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+  this.txtMax.id = this.config.id+"-txtmax";
+
+  var defs = this.canvas.canvas.childNodes[1];
+  var svg = "http://www.w3.org/2000/svg";
+
+  if (ie < 9) {
+    onCreateElementNsReady(function() {
+      this.generateShadow(svg, defs);
+    });
+  } else {
+    this.generateShadow(svg, defs);
+  }
+
+  // var clear
+  defs, svg = null;
+
+  // execute on each animation frame
+  function onAnimate() {
+    if (obj.config.counter) {
+      var currentValue = obj.level.attr("pki");
+
+      if(obj.config.textRenderer) {
+        // this.originalValue = this.config.textRenderer(this.originalValue);
+        obj.txtValue.attr("text", obj.config.textRenderer(Math.floor(currentValue[0])));
+      } else if(obj.config.humanFriendly) {
+        // this.originalValue = humanFriendlyNumber( this.originalValue, this.config.humanFriendlyDecimal ) + this.config.symbol;
+        obj.txtValue.attr("text", humanFriendlyNumber( Math.floor(currentValue[0]), obj.config.humanFriendlyDecimal ) + obj.config.symbol);
+      } else {
+        // this.originalValue += this.config.symbol;
+        obj.txtValue.attr("text", (currentValue[0] * 1).toFixed(obj.config.decimals) + obj.config.symbol);
+      }
+
+      setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+      currentValue = null;
+    }
+  }
+
+  if(!obj.config.counter) {
+    if(obj.config.textRenderer) {
+      obj.originalValue = obj.config.textRenderer(obj.originalValue);
+    } else if(obj.config.humanFriendly) {
+      obj.originalValue = humanFriendlyNumber( obj.originalValue, obj.config.humanFriendlyDecimal ) + obj.config.symbol;
+    } else {
+      obj.originalValue = (obj.originalValue * 1).toFixed(obj.config.decimals) + obj.config.symbol;
+    }
+
+    obj.txtValue.attr("text", obj.originalValue);
+    setDy(obj.txtValue, obj.params.valueFontSize, obj.params.valueY);
+  }
+
+  //event fired on each animation frame
+  eve.on("raphael.anim.frame.*", onAnimate);
+
+  // animate gauge level
+  this.level.animate({pki: [this.config.value, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut]},  this.config.startAnimationTime, this.config.startAnimationType);
+
+  // animate value
+  this.txtValue.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+
+  // animate label
+  this.txtLabel.animate({"fill-opacity":"1"}, this.config.startAnimationTime, this.config.startAnimationType);
+};
+
+/** Refresh gauge level */
+JustGage.prototype.refresh = function(val, max) {
+
+  var originalVal, displayVal, color, max = max || null;
+
+  // set new max
+  if(max !== null) {
+    this.config.max = max;
+
+    this.txtMaximum = this.config.max;
+    if( this.config.humanFriendly ) this.txtMaximum = humanFriendlyNumber( this.config.max, this.config.humanFriendlyDecimal );
+    this.txtMax.attr({"text" : this.config.max});
+    setDy(this.txtMax, this.params.maxFontSize, this.params.maxY);
+  }
+
+  // overflow values
+  originalVal = val;
+  displayVal = val;
+  if ((val * 1) > (this.config.max * 1)) {val = (this.config.max * 1);}
+  if ((val * 1) < (this.config.min * 1)) {val = (this.config.min * 1);}
+
+  color = getColor(val, (val - this.config.min) / (this.config.max - this.config.min), this.config.levelColors, this.config.noGradient, this.config.customSectors);
+
+  if(this.config.textRenderer) {
+    displayVal = this.config.textRenderer(displayVal);
+  } else if( this.config.humanFriendly ) {
+    displayVal = humanFriendlyNumber( displayVal, this.config.humanFriendlyDecimal ) + this.config.symbol;
+  } else {
+    displayVal = (displayVal * 1).toFixed(this.config.decimals) + this.config.symbol;
+  }
+
+  if(!this.config.counter) {
+    this.canvas.getById(this.config.id+"-txtvalue").attr({"text":displayVal});
+    setDy(this.canvas.getById(this.config.id+"-txtvalue"), this.params.valueFontSize, this.params.valueY);
+  }
+
+  this.canvas.getById(this.config.id+"-level").animate({pki: [val, this.config.min, this.config.max, this.params.widgetW, this.params.widgetH,  this.params.dx, this.params.dy, this.config.gaugeWidthScale, this.config.donut], "fill":color},  this.config.refreshAnimationTime, this.config.refreshAnimationType);
+  this.config.value = val * 1;
+
+  // var clear
+  originalVal, displayVal, color, max = null;
+};
+
+/** Generate shadow */
+JustGage.prototype.generateShadow = function(svg, defs) {
+
+  var gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3;
+
+  // FILTER
+  gaussFilter=document.createElementNS(svg,"filter");
+  gaussFilter.setAttribute("id", this.config.id + "-inner-shadow");
+  defs.appendChild(gaussFilter);
+
+  // offset
+  feOffset = document.createElementNS(svg,"feOffset");
+  feOffset.setAttribute("dx", 0);
+  feOffset.setAttribute("dy", this.config.shadowVerticalOffset);
+  gaussFilter.appendChild(feOffset);
+
+  // blur
+  feGaussianBlur = document.createElementNS(svg,"feGaussianBlur");
+  feGaussianBlur.setAttribute("result","offset-blur");
+  feGaussianBlur.setAttribute("stdDeviation", this.config.shadowSize);
+  gaussFilter.appendChild(feGaussianBlur);
+
+  // composite 1
+  feComposite1 = document.createElementNS(svg,"feComposite");
+  feComposite1.setAttribute("operator","out");
+  feComposite1.setAttribute("in", "SourceGraphic");
+  feComposite1.setAttribute("in2","offset-blur");
+  feComposite1.setAttribute("result","inverse");
+  gaussFilter.appendChild(feComposite1);
+
+  // flood
+  feFlood = document.createElementNS(svg,"feFlood");
+  feFlood.setAttribute("flood-color","black");
+  feFlood.setAttribute("flood-opacity", this.config.shadowOpacity);
+  feFlood.setAttribute("result","color");
+  gaussFilter.appendChild(feFlood);
+
+  // composite 2
+  feComposite2 = document.createElementNS(svg,"feComposite");
+  feComposite2.setAttribute("operator","in");
+  feComposite2.setAttribute("in", "color");
+  feComposite2.setAttribute("in2","inverse");
+  feComposite2.setAttribute("result","shadow");
+  gaussFilter.appendChild(feComposite2);
+
+  // composite 3
+  feComposite3 = document.createElementNS(svg,"feComposite");
+  feComposite3.setAttribute("operator","over");
+  feComposite3.setAttribute("in", "shadow");
+  feComposite3.setAttribute("in2","SourceGraphic");
+  gaussFilter.appendChild(feComposite3);
+
+  // set shadow
+  if (!this.config.hideInnerShadow) {
+    this.canvas.canvas.childNodes[2].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+    this.canvas.canvas.childNodes[3].setAttribute("filter", "url(#" + this.config.id + "-inner-shadow)");
+  }
+
+  // var clear
+  gaussFilter, feOffset, feGaussianBlur, feComposite1, feFlood, feComposite2, feComposite3 = null;
+
+};
+
+/** Get color for value */
+function getColor(val, pct, col, noGradient, custSec) {
+
+  var no, inc, colors, percentage, rval, gval, bval, lower, upper, range, rangePct, pctLower, pctUpper, color;
+  var noGradient = noGradient || custSec.length > 0;
+
+  if(custSec.length > 0) {
+    for(var i = 0; i < custSec.length; i++) {
+      if(val > custSec[i].lo && val <= custSec[i].hi) {
+        return custSec[i].color;
+      }
+    }
+  }
+
+  no = col.length;
+  if (no === 1) return col[0];
+  inc = (noGradient) ? (1 / no) : (1 / (no - 1));
+  colors = [];
+  for (var i = 0; i < col.length; i++) {
+    percentage = (noGradient) ? (inc * (i + 1)) : (inc * i);
+    rval = parseInt((cutHex(col[i])).substring(0,2),16);
+    gval = parseInt((cutHex(col[i])).substring(2,4),16);
+    bval = parseInt((cutHex(col[i])).substring(4,6),16);
+    colors[i] = { pct: percentage, color: { r: rval, g: gval, b: bval  } };
+  }
+
+  if(pct === 0) {
+    return 'rgb(' + [colors[0].color.r, colors[0].color.g, colors[0].color.b].join(',') + ')';
+  }
+
+  for (var j = 0; j < colors.length; j++) {
+    if (pct <= colors[j].pct) {
+      if (noGradient) {
+        return 'rgb(' + [colors[j].color.r, colors[j].color.g, colors[j].color.b].join(',') + ')';
+      } else {
+        lower = colors[j - 1];
+        upper = colors[j];
+        range = upper.pct - lower.pct;
+        rangePct = (pct - lower.pct) / range;
+        pctLower = 1 - rangePct;
+        pctUpper = rangePct;
+        color = {
+          r: Math.floor(lower.color.r * pctLower + upper.color.r * pctUpper),
+          g: Math.floor(lower.color.g * pctLower + upper.color.g * pctUpper),
+          b: Math.floor(lower.color.b * pctLower + upper.color.b * pctUpper)
+        };
+        return 'rgb(' + [color.r, color.g, color.b].join(',') + ')';
+      }
+    }
+  }
+
+}
+
+/** Fix Raphael display:none tspan dy attribute bug */
+function setDy(elem, fontSize, txtYpos) {
+  if ((!ie || ie > 9) && (elem.node.firstChild.attributes.dy)) {
+    elem.node.firstChild.attributes.dy.value = 0;
+  }
+}
+
+/** Random integer  */
+function getRandomInt (min, max) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+/**  Cut hex  */
+function cutHex(str) {
+  return (str.charAt(0)=="#") ? str.substring(1,7):str;
+}
+
+/**  Human friendly number suffix - From: http://stackoverflow.com/questions/2692323/code-golf-friendly-number-abbreviator */
+function humanFriendlyNumber( n, d ) {
+  var p, d2, i, s;
+
+  p = Math.pow;
+  d2 = p(10, d);
+  i = 7;
+  while( i ) {
+    s = p(10,i--*3);
+    if( s <= n ) {
+     n = Math.round(n*d2/s)/d2+"KMGTPE"[i];
+   }
+ }
+ return n;
+}
+
+/**  Get style  */
+function getStyle(oElm, strCssRule){
+  var strValue = "";
+  if(document.defaultView && document.defaultView.getComputedStyle){
+    strValue = document.defaultView.getComputedStyle(oElm).getPropertyValue(strCssRule);
+  }
+  else if(oElm.currentStyle){
+    strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
+      return p1.toUpperCase();
+    });
+    strValue = oElm.currentStyle[strCssRule];
+  }
+  return strValue;
+}
+
+/**  Create Element NS Ready  */
+function onCreateElementNsReady(func) {
+  if (document.createElementNS !== undefined) {
+    func();
+  } else {
+    setTimeout(function() { onCreateElementNsReady(func); }, 100);
+  }
+}
+
+/**  Get IE version  */
+// ----------------------------------------------------------
+// A short snippet for detecting versions of IE in JavaScript
+// without resorting to user-agent sniffing
+// ----------------------------------------------------------
+// If you're not in IE (or IE version is less than 5) then:
+// ie === undefined
+// If you're in IE (>=5) then you can determine which version:
+// ie === 7; // IE7
+// Thus, to detect IE:
+// if (ie) {}
+// And to detect the version:
+// ie === 6 // IE6
+// ie > 7 // IE8, IE9 ...
+// ie < 9 // Anything less than IE9
+// ----------------------------------------------------------
+// UPDATE: Now using Live NodeList idea from @jdalton
+var ie = (function(){
+
+  var undef,
+  v = 3,
+  div = document.createElement('div'),
+  all = div.getElementsByTagName('i');
+
+  while (
+    div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
+    all[0]
+    );
+    return v > 4 ? v : undef;
+}());
\ No newline at end of file
diff --git a/addons/sale_crm/static/src/js/sale_crm.js b/addons/sale_crm/static/src/js/sale_crm.js
new file mode 100644
index 00000000000..207ac959af3
--- /dev/null
+++ b/addons/sale_crm/static/src/js/sale_crm.js
@@ -0,0 +1,108 @@
+openerp.sale_crm = function(openerp) {
+var _t = openerp.web._t;
+
+openerp.sale_crm.GaugeWidget = openerp.web_kanban.AbstractField.extend({
+    className: "oe_gage",
+    start: function() {
+        var self = this;
+
+        var parent = this.getParent();
+        var max = this.options.max_field ? parent.record[this.options.max_field].raw_value : 100;
+        var label = this.options.label_field ? parent.record[this.options.label_field].raw_value : "";
+        var title = this.$node.html();
+        var val = this.field.value;
+        var value = _.isArray(val) && val.length ? val[val.length-1]['value'] : val;
+        var unique_id = _.uniqueId("JustGage");
+        
+        this.$el.empty()
+            .attr('style', this.$node.attr('style') + ';position:relative; display:inline-block;')
+            .attr('id', unique_id);
+        this.gage = new JustGage({
+            id: unique_id,
+            node: this.$el[0],
+            title: title,
+            value: value,
+            min: 0,
+            max: max,
+            relativeGaugeSize: true,
+            humanFriendly: true,
+            titleFontColor: '#333333',
+            valueFontColor: '#333333',
+            labelFontColor: '#000',
+            label: label,
+            levelColors: [
+                "#ff0000",
+                "#f9c802",
+                "#a9d70b"
+            ],
+        });
+
+        var flag_open = false;
+        if (self.options.action_change) {
+            var $svg = self.$el.find('svg');
+            var css = {
+                'text-align': 'center',
+                'position': 'absolute',
+                'width': self.$el.outerWidth() + 'px',
+                'top': (self.$el.outerHeight()/2-5) + 'px'
+            };
+
+            self.$el.click(function (event) {
+                event.stopPropagation();
+                flag_open = false;
+                if (!parent.view.is_action_enabled('edit')) {
+                    return;
+                }
+                if (!self.$el.find(".oe_justgage_edit").size()) {
+                    $div = $('<div class="oe_justgage_edit" style="z-index:1"/>');
+                    $div.css(css);
+                    $input = $('<input/>').val(value);
+                    $input.css({
+                        'text-align': 'center',
+                        'margin': 'auto',
+                        'width': ($svg.outerWidth()-40) + 'px'
+                    });
+                    $div.append($input);
+                    self.$el.prepend($div)
+                    $input.focus()
+                        .keydown(function (event) {
+                            event.stopPropagation();
+                            if (event.keyCode == 13 || event.keyCode == 9) {
+                                if ($input.val() != value) {
+                                    parent.view.dataset.call(self.options.action_change, [parent.id, $input.val()]).then(function () {
+                                        parent.do_reload();
+                                    });
+                                } else {
+                                    $div.remove();
+                                }
+                            }
+                        })
+                        .click(function (event) {
+                            event.stopPropagation();
+                            flag_open = false;
+                        })
+                        .blur(function (event) {
+                            if(!flag_open) {
+                                self.$el.find(".oe_justgage_edit").remove();
+                            } else {
+                                flag_open = false;
+                                setTimeout(function () {$input.focus();}, 0);
+                            }
+                        });
+                }
+            }).mousedown(function () {
+                flag_open = true;
+            });
+
+            if (!+value) {
+                $svg.fadeTo(0, 0.3);
+                $div = $('<div/>').text(_t("Click to change value"));
+                $div.css(css);
+                self.$el.append($div);
+            }
+        }
+    },
+});
+openerp.web_kanban.fields_registry.add("gage", "openerp.sale_crm.GaugeWidget");
+
+};
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index a052f47ca1f..da770af6d82 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -87,7 +87,7 @@ class crm_make_sale(osv.osv_memory):
                             ['default', 'invoice', 'delivery', 'contact'])
                     pricelist = partner.property_product_pricelist.id
                 if False in partner_addr.values():
-                    raise osv.except_osv(_('Insufficient Data!'), _('No addresse(s) defined for this customer.'))
+                    raise osv.except_osv(_('Insufficient Data!'), _('No address(es) defined for this customer.'))
 
                 vals = {
                     'origin': _('Opportunity: %s') % str(case.id),
@@ -153,6 +153,5 @@ class crm_make_sale(osv.osv_memory):
         'partner_id': _selectPartner,
     }
 
-crm_make_sale()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index b4830dcfcd7..9a4370f5d61 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-01-20 08:56+0000\n"
+"PO-Revision-Date: 2013-06-05 11:29+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:27+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-06 05:21+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -31,6 +31,8 @@ msgstr "Способ выставления счета"
 msgid ""
 "This invoicing type will be used, by default, to invoice the current partner."
 msgstr ""
+"Этот тип счета будет использоваться по умолчанию для выставления текущего "
+"счета партнера."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -45,7 +47,7 @@ msgstr "Выставление счета"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Поступающие ТМЦ"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -103,7 +105,7 @@ msgstr ""
 #. module: sale_journal
 #: help:sale.order,invoice_type_id:0
 msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "Генерировать счет на основе выбранного варианта."
 
 #. module: sale_journal
 #: view:sale.order:0
@@ -137,7 +139,7 @@ msgstr "Заказ продаж"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Заказы доставки"
 
 #~ msgid "Monthly sales"
 #~ msgstr "Продажи в месяце"
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 8463ab3f3bd..9e10c826898 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -34,7 +34,6 @@ class sale_journal_invoice_type(osv.osv):
         'active': True,
         'invoicing_method': 'simple'
     }
-sale_journal_invoice_type()
 
 #==============================================
 # sale journal inherit
@@ -52,28 +51,28 @@ class res_partner(osv.osv):
             group_name = "Accounting Properties",
             help = "This invoicing type will be used, by default, to invoice the current partner."),
     }
-res_partner()
+
+    def _commercial_fields(self, cr, uid, context=None):
+        return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_invoice_type']
+
 
 class picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
     }
-picking()
 
 class stock_picking_in(osv.osv):
     _inherit = "stock.picking.in"
     _columns = {
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
     }
-stock_picking_in()
 
 class stock_picking_out(osv.osv):
     _inherit = "stock.picking.out"
     _columns = {
         'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
     }
-stock_picking_out()
 
 
 class sale(osv.osv):
@@ -95,6 +94,5 @@ class sale(osv.osv):
                 result['value']['invoice_type_id'] = itype.id
         return result
 
-sale()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index bcd83b5be84..9d41103252e 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -146,7 +146,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
-                    <group colspan="2" col="2">
+                    <group colspan="2" col="2" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                         <separator string="Invoicing" colspan="2"/>
                         <field name="property_invoice_type"/>
                     </group>
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index 7c764c89223..cac4fe13548 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2011-01-20 08:51+0000\n"
+"PO-Revision-Date: 2013-06-04 13:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:40+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -44,6 +44,7 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and the cost price."
 msgstr ""
+"Дает прибыльность как разницу между стоимостью единицы и себестоимостью."
 
 #~ msgid "Customer Invoice"
 #~ msgstr "Счета клиентам"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index dc8c4dfff3c..4c2e9ffc4f4 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -56,7 +56,6 @@ class sale_order_line(osv.osv):
         'purchase_price': fields.float('Cost Price', digits=(16,2))
     }
 
-sale_order_line()
 
 class sale_order(osv.osv):
     _inherit = "sale.order"
@@ -82,6 +81,5 @@ class sale_order(osv.osv):
                 }),
     }
 
-sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 88647ea3c46..be16429526a 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -9,7 +9,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group[@name='sale_total']" position="after">
                 <group name="sale_margin_grp">
-                    <field name="margin" widget='monetary' options="{'currency_field': 'currency_id'}"/>
+                    <field name="margin" widget='monetary' options="{'currency_field': 'currency_id'}" groups="base.group_user"/>
                 </group>
             </xpath>
         </field>
diff --git a/addons/sale_mrp/i18n/lt.po b/addons/sale_mrp/i18n/lt.po
new file mode 100644
index 00000000000..185753c3663
--- /dev/null
+++ b/addons/sale_mrp/i18n/lt.po
@@ -0,0 +1,43 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-29 15:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index a5043d3b7d5..77a35972638 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -74,6 +74,5 @@ class mrp_production(osv.osv):
         'sale_ref': fields.function(_ref_calc, multi='sale_name', type='char', string='Sale Reference', help='Indicate the Customer Reference from sales order.'),
     }
 
-mrp_production()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index d54eca88ca5..64b939de088 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -59,6 +59,5 @@ class sale_order_dates(osv.osv):
         'effective_date': fields.function(_get_effective_date, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
     }
 
-sale_order_dates()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_stock/company.py b/addons/sale_stock/company.py
index 67440ed6c67..5be1dbd524d 100644
--- a/addons/sale_stock/company.py
+++ b/addons/sale_stock/company.py
@@ -24,13 +24,15 @@ from openerp.osv import fields, osv
 class company(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'security_lead': fields.float('Security Days', required=True,
-            help="This is the days added to what you promise to customers "\
-            "for security purpose"),
+        'security_lead': fields.float(
+            'Security Days', required=True,
+            help="Margin of error for dates promised to customers. "\
+                 "Products will be scheduled for procurement and delivery "\
+                 "that many days earlier than the actual promised date, to "\
+                 "cope with unexpected delays in the supply chain."),
     }
     _defaults = {
         'security_lead': 0.0,
     }
-company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_stock/i18n/ru.po b/addons/sale_stock/i18n/ru.po
index f5c54417077..28f156fb871 100644
--- a/addons/sale_stock/i18n/ru.po
+++ b/addons/sale_stock/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-01-04 16:04+0000\n"
+"PO-Revision-Date: 2013-06-06 11:30+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:51+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -22,11 +22,13 @@ msgid ""
 "To allow your salesman to make invoices for Delivery Orders using the menu "
 "'Deliveries to Invoice'."
 msgstr ""
+"Позволяет вашему продавцу создавать счета для заказов доставки используя "
+"меню \"Доставки в счета\"."
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr "Заказ на доставку"
+msgstr "Заказ доставки"
 
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
@@ -86,12 +88,12 @@ msgstr ""
 #. module: sale_stock
 #: model:process.transition,name:sale_stock.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr "Создать заказ на снабжение"
+msgstr "Создать заказ снабжения"
 
 #. module: sale_stock
 #: field:stock.picking.out,sale_id:0
 msgid "Sale Order"
-msgstr "Заказ"
+msgstr "Заказ продажи"
 
 #. module: sale_stock
 #: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
@@ -99,8 +101,8 @@ msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
 msgstr ""
-"Для каждой позиции заказа на продажу создается заказ на снабжение для "
-"поставки проданных ТМЦ."
+"Для каждой позиции заказа продаж создается заказ снабжения для поставки "
+"проданных ТМЦ."
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:615
@@ -129,8 +131,7 @@ msgstr "Магазин"
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
-"Управление заказами на снабжение для каждой позиции заказа на продажу."
+msgstr "Управление заказами снабжения для каждой позиции заказа продаж."
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_move
@@ -151,7 +152,7 @@ msgstr "Табель проекта"
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
-msgstr ""
+msgstr "Разрешить различные адреса для доставки и выставления счета "
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:546
@@ -163,18 +164,18 @@ msgstr "Ошибка конфигурации!"
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr "Заказ на закупку"
+msgstr "Заказ снабжения"
 
 #. module: sale_stock
 #: selection:sale.config.settings,default_order_policy:0
 msgid "Invoice based on deliveries"
-msgstr "Счет основанный на отгрузке"
+msgstr "Счет основанный на доставках"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_order
 #: field:stock.picking,sale_id:0
 msgid "Sales Order"
-msgstr "Заказ на продажу"
+msgstr "Заказ продаж"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_picking_out
@@ -185,7 +186,7 @@ msgstr "Заказы доставки"
 #: model:ir.model,name:sale_stock.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr "Позиция заказа на продажу"
+msgstr "Позиция заказа продаж"
 
 #. module: sale_stock
 #: model:process.transition,note:sale_stock.process_transition_packing0
@@ -195,11 +196,11 @@ msgid ""
 "parts to the sales order. There is 1 pick list by sales order line which "
 "evolves with the availability of parts."
 msgstr ""
-"Форма комплектовочного листа создастся как только заказ на продажу будет "
-"подтвержден, в одно время с заказом на снабжение. Он представляет собой "
-"определение комплектующих для заказа на продажу. Один комплектовочный лист "
-"на позицию заказа на продажу, который будет меняться в соответствии с "
-"наличием комплектующих."
+"Форма комплектовочного листа создастся как только заказ продаж будет "
+"подтвержден, в одно время с заказом снабжения. Он представляет собой "
+"определение комплектующих для заказа продаж. Один комплектовочный лист на "
+"позицию заказа продаж, который будет меняться в соответствии с наличием "
+"комплектующих."
 
 #. module: sale_stock
 #: help:res.company,security_lead:0
@@ -240,7 +241,7 @@ msgstr "Документ перемещения к заказчику."
 #. module: sale_stock
 #: view:sale.order:0
 msgid "View Delivery Order"
-msgstr ""
+msgstr "Вид заказа доставки"
 
 #. module: sale_stock
 #: field:sale.order.line,move_ids:0
@@ -276,7 +277,7 @@ msgstr "Снабжение"
 #: field:sale.report,shipped:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped"
-msgstr "Доставлено"
+msgstr "Отправлено"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:240
@@ -292,24 +293,24 @@ msgid ""
 "production of products regarding to the rules and to the sales order's "
 "parameters. "
 msgstr ""
-"Заказ на снабжение создастся автоматически как только заказ на продажу будет "
+"Заказ снабжения создастся автоматически как только заказ продаж будет "
 "подтвержден или счет будет оплачен. Он определяет закупку и производство ТМЦ "
-"по правилам и параметрам заказа на продажу. "
+"по правилам и параметрам заказа продаж. "
 
 #. module: sale_stock
 #: help:sale.config.settings,group_mrp_properties:0
 msgid "Allows you to tag sales order lines with properties."
-msgstr ""
+msgstr "Позволяет отмечать тегами позиции заказа продажи со свойствами"
 
 #. module: sale_stock
 #: field:sale.config.settings,group_invoice_deli_orders:0
 msgid "Generate invoices after and based on delivery orders"
-msgstr ""
+msgstr "Генерировать счета после и из заказов доставки"
 
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
 msgid "Allow adding shipping costs"
-msgstr ""
+msgstr "Позволяет добавлять стоимость доставки"
 
 #. module: sale_stock
 #: view:sale.order:0
@@ -327,6 +328,8 @@ msgid ""
 "International Commercial Terms are a series of predefined commercial terms "
 "used in international transactions."
 msgstr ""
+"Международные правила по толкованию наиболее широко используемых торговых "
+"терминов в области внешней торговли."
 
 #. module: sale_stock
 #: help:sale.config.settings,module_delivery:0
@@ -345,7 +348,7 @@ msgstr "Доставка всего сразу, если все готово."
 #. module: sale_stock
 #: model:res.groups,name:sale_stock.group_invoice_deli_orders
 msgid "Enable Invoicing Delivery orders"
-msgstr ""
+msgstr "Разрешить выставлять счета на заказы доставки"
 
 #. module: sale_stock
 #: field:res.company,security_lead:0
@@ -362,6 +365,8 @@ msgstr "Закупка проданного материала"
 msgid ""
 "Pick 'Deliver each product when available' if you allow partial delivery."
 msgstr ""
+"Выбрать \"Доставить каждый товар по готовности\" если вы разрешили частичную "
+"доставки"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:206
@@ -380,7 +385,7 @@ msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
 msgstr ""
-"Показывает, что заказ на продажу был доставлен. Это поле обновляется только "
+"Показывает, что заказ продаж был доставлен. Это поле обновляется только "
 "после запуска планировщика."
 
 #. module: sale_stock
@@ -398,12 +403,12 @@ msgstr "Свойства изделия в позиции заказа"
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
 msgstr ""
-"Вы можете создать счет на основе заказов на продажу или на основе доставок."
+"Вы можете создать счет на основе заказов продаж или на основе доставок."
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr "Статистика заказов на продажу"
+msgstr "Статистика заказов продаж"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_res_company
@@ -428,6 +433,8 @@ msgid ""
 "Allows you to specify different delivery and invoice addresses on a sales "
 "order."
 msgstr ""
+"Позволяет задавать разные адреса для доставки и выставления счета в заказе "
+"продажи."
 
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_saleprocurement0
@@ -435,7 +442,7 @@ msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
 msgstr ""
-"Один заказ на снабжение для каждой позиции заказа на продажу и для каждого "
+"Один заказ снабжения для каждой позиции заказа продаж и для каждого "
 "компонента."
 
 #. module: sale_stock
@@ -455,6 +462,7 @@ msgid ""
 "Number of days between the order confirmation and the shipping of the "
 "products to the customer"
 msgstr ""
+"Количество дней между подтверждением заказа и отгрузкой продукции заказчику"
 
 #. module: sale_stock
 #: help:sale.config.settings,default_picking_policy:0
@@ -467,7 +475,7 @@ msgstr ""
 #. module: sale_stock
 #: selection:sale.config.settings,default_order_policy:0
 msgid "Invoice based on sales orders"
-msgstr ""
+msgstr "Счет основан на заказах продаж"
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -487,6 +495,9 @@ msgid ""
 "In order to delete a confirmed sales order, you must cancel it.\n"
 "To do so, you must first cancel related picking for delivery orders."
 msgstr ""
+"Для того, чтобы удалить подтвержденный заказ, вы должны отменить его.\n"
+"Чтобы сделать это, Вы должны сначала отменить комплектование для заказов "
+"доставки."
 
 #. module: sale_stock
 #: field:sale.order.line,number_packages:0
@@ -506,7 +517,7 @@ msgstr "Создать счет"
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
-msgstr ""
+msgstr "Подготовка счетов основанных на действиях по задачам"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
@@ -519,7 +530,7 @@ msgstr "Счет на авансовый платеж"
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 "Сначала вы должны отменить перемещения ТМЦ связанные с этой позицией заказа "
-"на продажу."
+"продаж."
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:535
@@ -536,7 +547,7 @@ msgstr "Инкотерм"
 #: code:addons/sale_stock/sale_stock.py:496
 #, python-format
 msgid "Cannot cancel sales order line!"
-msgstr ""
+msgstr "Нельзя отменить позицию заказа продаж!"
 
 #. module: sale_stock
 #: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
@@ -551,7 +562,7 @@ msgstr "На основании отгруженного или заказанн
 #. module: sale_stock
 #: selection:sale.order,picking_policy:0
 msgid "Deliver all products at once"
-msgstr "Отгрузка всех товаров за раз"
+msgstr "Доставка всех товаров за раз"
 
 #. module: sale_stock
 #: field:sale.order,picking_ids:0
@@ -561,7 +572,7 @@ msgstr "Связанное комплектование"
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale_stock
 #: help:sale.order,picking_ids:0
@@ -569,21 +580,22 @@ msgid ""
 "This is a list of delivery orders that has been generated for this sales "
 "order."
 msgstr ""
+"Это список заказов доставки который был создан для этого заказа продажи."
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr "Запрос заказа на продажу"
+msgstr "Запрос заказа продаж"
 
 #. module: sale_stock
 #: model:process.transition,name:sale_stock.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr "Создать заказ на доставку"
+msgstr "Создать заказ доставки"
 
 #. module: sale_stock
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr "Игнорировать исключение"
+msgstr "Игнорировать исключительную ситуацию"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:588
@@ -598,12 +610,12 @@ msgstr ""
 #. module: sale_stock
 #: view:sale.order:0
 msgid "Recreate Delivery Order"
-msgstr ""
+msgstr "Воссоздать заказ доставки"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_multiple_shops:0
 msgid "This allows to configure and use multiple shops."
-msgstr ""
+msgstr "Это позволяет настроить и использовать несколько магазинов."
 
 #. module: sale_stock
 #: field:sale.order,picked_rate:0
@@ -628,5 +640,5 @@ msgid ""
 "automatically."
 msgstr ""
 "В зависимости от настройки исходящего места хранения, перемещение между "
-"зоной отгрузки и заказчиком выполняется с помощью заказа на доставку вручную "
+"зоной отгрузки и заказчиком выполняется с помощью заказа доставки вручную "
 "или автоматически."
diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml
index 666f6ba6502..1ebebec7809 100644
--- a/addons/sale_stock/process/sale_stock_process.xml
+++ b/addons/sale_stock/process/sale_stock_process.xml
@@ -64,17 +64,6 @@
         </record>
 
 
-        <!--
-            Process Condition
-        -->
-
-        <record id="process_condition_conditionafterdelivery0" model="process.condition">
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="node_id" ref="process_node_invoiceafterdelivery0"/>
-            <field eval="&quot;&quot;&quot;object.order_policy=='postpaid'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="&quot;&quot;&quot;condition_after_delivery&quot;&quot;&quot;" name="name"/>
-        </record>
-
         <!--
             Process Transition
         -->
@@ -83,40 +72,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
-            <field model="process.node" name="source_node_id" ref="sale.process_node_saleorder0"/>
+            <field name="target_node_id" ref="process_node_saleprocurement0"/>
+            <field name="source_node_id" ref="sale.process_node_saleorder0"/>
         </record>
 
         <record id="process_transition_packing0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
+            <field name="target_node_id" ref="process_node_packinglist0"/>
+            <field name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
 
         <record id="process_transition_deliver0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Delivery Order&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+            <field name="target_node_id" ref="process_node_deliveryorder0"/>
+            <field name="source_node_id" ref="process_node_packinglist0"/>
         </record>
 
         <record id="process_transition_invoiceafterdelivery0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+            <field eval="&quot;&quot;&quot;If the sale order was set to create the invoice 'On Delivery Order', then an invoice is automatically created based on what you delivered. If you rather want to create your invoice based on your sale order, you can set the sale order to create invoice 'On Demand', then track and process the sales order that have been fully delivered and invoice them from there.&quot;&quot;&quot;" name="note"/>
+            <field name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
+            <field name="source_node_id" ref="process_node_packinglist0"/>
         </record>
 
         <record id="process_transition_saleorderprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;For every sales order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
+            <field name="target_node_id" ref="procurement.process_node_procureproducts0"/>
+            <field name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
 
         <!--
diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py
index 1f1e4a625be..63641020d98 100644
--- a/addons/sale_stock/report/sale_report.py
+++ b/addons/sale_stock/report/sale_report.py
@@ -91,6 +91,5 @@ class sale_report(osv.osv):
                     s.project_id
             )
         """)
-sale_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index bd4eb2b8256..e71fb92f842 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -24,6 +24,8 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FO
 from dateutil.relativedelta import relativedelta
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+import pytz
+from openerp import SUPERUSER_ID
 
 class sale_shop(osv.osv):
     _inherit = "sale.shop"
@@ -31,7 +33,6 @@ class sale_shop(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
     }
 
-sale_shop()
 
 class sale_order(osv.osv):
     _inherit = "sale.order"
@@ -229,6 +230,29 @@ class sale_order(osv.osv):
                     res.append(line.procurement_id.id)
         return res
 
+    def date_to_datetime(self, cr, uid, userdate, context=None):
+        """ Convert date values expressed in user's timezone to
+        server-side UTC timestamp, assuming a default arbitrary
+        time of 12:00 AM - because a time is needed.
+    
+        :param str userdate: date string in in user time zone
+        :return: UTC datetime string for server-side use
+        """
+        # TODO: move to fields.datetime in server after 7.0
+        user_date = datetime.strptime(userdate, DEFAULT_SERVER_DATE_FORMAT)
+        if context and context.get('tz'):
+            tz_name = context['tz']
+        else:
+            tz_name = self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
+        if tz_name:
+            utc = pytz.timezone('UTC')
+            context_tz = pytz.timezone(tz_name)
+            user_datetime = user_date + relativedelta(hours=12.0)
+            local_timestamp = context_tz.localize(user_datetime, is_dst=False)
+            user_datetime = local_timestamp.astimezone(utc)
+            return user_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return user_date.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
     # if mode == 'finished':
     #   returns True if all lines are done, False otherwise
     # if mode == 'canceled':
@@ -311,7 +335,7 @@ class sale_order(osv.osv):
         return {
             'name': pick_name,
             'origin': order.name,
-            'date': order.date_order,
+            'date': self.date_to_datetime(cr, uid, order.date_order, context),
             'type': 'out',
             'state': 'auto',
             'move_type': order.picking_policy,
@@ -345,7 +369,8 @@ class sale_order(osv.osv):
         return True
 
     def _get_date_planned(self, cr, uid, order, line, start_date, context=None):
-        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
+        start_date = self.date_to_datetime(cr, uid, start_date, context)
+        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=line.delay or 0.0)
         date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         return date_planned
 
@@ -605,11 +630,6 @@ class sale_advance_payment_inv(osv.osv_memory):
         sale_line_obj = self.pool.get('sale.order.line')
         wizard = self.browse(cr, uid, [result], context)
         sale = sale_obj.browse(cr, uid, sale_id, context=context)
-        if sale.order_policy == 'postpaid':
-            raise osv.except_osv(
-                _('Error!'),
-                _("You cannot make an advance on a sales order \
-                     that is defined as 'Automatic Invoice after delivery'."))
 
         # If invoice on picking: add the cost on the SO
         # If not, the advance will be deduced when generating the final invoice
diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py
index e1070998ae8..ad19684c4cf 100644
--- a/addons/sale_stock/stock.py
+++ b/addons/sale_stock/stock.py
@@ -54,7 +54,7 @@ class stock_picking(osv.osv):
             We select the partner of the sales order as the partner of the customer invoice
         """
         if picking.sale_id:
-            return picking.sale_id.partner_id
+            return picking.sale_id.partner_invoice_id
         return super(stock_picking, self)._get_partner_to_invoice(cr, uid, picking, context=context)
 
     def _get_comment_invoice(self, cursor, user, picking):
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index d06526902fd..0f5b9c4f1e6 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="stock_picking_inherit_sale" model="ir.ui.view">
-            <field name="name">stock.picking.form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
-            <field name="arch" type="xml">
-                <field name="move_type" position="before">
-                    <field name="sale_id"/>
-                </field>
-            </field>
-        </record>
 
         <record id="stock_move_sale" model="ir.ui.view">
             <field name="name">stock.move.form</field>
@@ -51,7 +41,7 @@
 
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
             <field name="name">Outgoing picking Inherited</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
                 <field name="move_type" position="after">
diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml
index 9081cac9fa3..d970e0c9cad 100644
--- a/addons/sale_stock/test/cancel_order_sale_stock.yml
+++ b/addons/sale_stock/test/cancel_order_sale_stock.yml
@@ -8,7 +8,7 @@
 -
   !python {model: stock.picking}: |
     delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
-    first_picking = self.browse(cr, uid, delivery_orders[0], context=context)
+    first_picking = self.browse(cr, uid, delivery_orders[-1], context=context)
     if first_picking.force_assign(cr, uid, first_picking):
       first_move = first_picking.move_lines[0]
       values = {'move%s'%(first_move.id): {'product_qty': 2, 'product_uom':ref('product.product_uom_unit')}}
@@ -18,7 +18,7 @@
 -
   !python {model: stock.picking}: |
     delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
-    last_delivery_order_id = delivery_orders[0]
+    last_delivery_order_id = delivery_orders[-1]
     self.pool.get('stock.picking').signal_button_cancel(cr, uid, [last_delivery_order_id])
 -
   I run the scheduler.
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index 1df3626880f..afffda1ef21 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -5,6 +5,12 @@
 -
   !assert {model: sale.order, id: sale.sale_order_6, string: The amount of the Quotation is not correctly computed}:
     - sum([l.price_subtotal for l in order_line]) == amount_untaxed
+- 
+  I set an explicit invoicing partner that is different from the main SO Customer
+-
+  !python {model: sale.order, id: sale.sale_order_6}: |
+    order = self.browse(cr, uid, ref("sale.sale_order_6"))
+    order.write({'partner_invoice_id': ref('base.res_partner_address_29')})
 -
   I confirm the quotation with Invoice based on deliveries policy.
 -
@@ -26,7 +32,8 @@
     order = self.browse(cr, uid, ref("sale.sale_order_6"))
     for order_line in order.order_line:
         procurement = order_line.procurement_id
-        date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
+        sale_order_date = self.date_to_datetime(cr, uid, order.date_order, context)
+        date_planned = datetime.strptime(sale_order_date, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=order_line.delay or 0.0)
         date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         assert procurement.date_planned == date_planned, "Scheduled date is not correspond."
         assert procurement.product_id.id == order_line.product_id.id, "Product is not correspond."
@@ -60,7 +67,8 @@
       output_id = sale_order.shop_id.warehouse_id.lot_output_id.id
       for move in picking.move_lines:
          order_line = move.sale_line_id
-         date_planned = datetime.strptime(sale_order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
+         sale_order_date = self.date_to_datetime(cr, uid, sale_order.date_order, context)
+         date_planned = datetime.strptime(sale_order_date, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=order_line.delay or 0.0)
          date_planned = (date_planned - timedelta(days=sale_order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
          assert datetime.strptime(move.date_expected, DEFAULT_SERVER_DATETIME_FORMAT) == datetime.strptime(date_planned, DEFAULT_SERVER_DATETIME_FORMAT), "Excepted Date is not correspond with Planned Date."
          assert move.product_id.id == order_line.product_id.id,"Product is not correspond."
@@ -108,13 +116,13 @@
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref("sale.sale_order_6"))
     assert order.invoice_ids, "Invoice is not created."
-    ac = order.partner_id.property_account_receivable.id
+    ac = order.partner_invoice_id.property_account_receivable.id
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)])
     for invoice in order.invoice_ids:
         assert invoice.type == 'out_invoice',"Invoice should be Customer Invoice."
         assert invoice.account_id.id == ac,"Invoice account is not correspond."
         assert invoice.reference == order.client_order_ref or order.name,"Reference is not correspond."
-        assert invoice.partner_id.id == order.partner_id.id,"Customer is not correspond."
+        assert invoice.partner_id.id == order.partner_invoice_id.id,"Customer does not correspond."
         assert invoice.currency_id.id == order.pricelist_id.currency_id.id, "Currency is not correspond."
         assert invoice.comment == (order.note or ''),"Note is not correspond."
         assert invoice.journal_id.id in journal_ids,"Sales Journal is not link on Invoice."
diff --git a/addons/share/i18n/lt.po b/addons/share/i18n/lt.po
new file mode 100644
index 00000000000..497de8b405d
--- /dev/null
+++ b/addons/share/i18n/lt.po
@@ -0,0 +1,617 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-29 15:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:841
+#, python-format
+msgid "Invitation to collaborate about %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:779
+#, python-format
+msgid ""
+"The share engine has not been able to fetch a record_id for your invitation."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Include an Optional Personal Message"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_option_title:0
+msgid "Display title"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access granted!"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,record_name:0
+msgid "Record name"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,message:0
+msgid ""
+"An optional personal message, to be included in the email notification."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Sharing method"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,name:0
+msgid "Share Title"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
+#, python-format
+msgid ""
+"The documents are not attached, you can view them online directly on my "
+"OpenERP server at:\n"
+"    %s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: model:ir.module.category,name:share.module_category_share
+msgid "Sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
+#, python-format
+msgid ""
+"Hello,\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Share Access URL"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,email_1:0
+#: field:share.wizard,email_2:0
+#: field:share.wizard,email_3:0
+msgid "New user email"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:886
+#, python-format
+msgid "You may use your current login (%s) and password to view them.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:620
+#, python-format
+msgid "(Modified)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:664
+#, python-format
+msgid "You must be a member of the Share/User group to use the share wizard."
+msgstr ""
+
+#. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_url:0
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
+#, python-format
+msgid "These are your credentials to access this protected area:\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr ""
+
+#. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
+#: view:share.wizard:0
+#, python-format
+msgid "Share"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:570
+#, python-format
+msgid "(Duplicated for modified sharing permissions)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:668
+#, python-format
+msgid ""
+"Please indicate the emails of the persons to share with, one per line."
+msgstr ""
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:661
+#, python-format
+msgid "Action and Access Mode are required to create a shared access."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing Options"
+msgstr ""
+
+#. module: share
+#. openerp-web
+#: code:addons/share/static/src/xml/share.xml:9
+#, python-format
+msgid "Invite"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Embedded code options"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Configuration"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Non-Share Groups"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"An email notification with instructions has been sent to the following "
+"people:"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:77
+#, python-format
+msgid "Direct link or embed code"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
+#, python-format
+msgid ""
+"OpenERP is a powerful and user-friendly suite of Business Applications (CRM, "
+"Sales, HR, etc.)\n"
+"It is open source and can be found on http://www.openerp.com."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,record_name:0
+msgid "Name of the shared record, if sharing a precise record"
+msgstr ""
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,user_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:61
+#: code:addons/share/wizard/share_wizard.py:656
+#, python-format
+msgid "Sharing access cannot be created."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:779
+#, python-format
+msgid "Record id not found"
+msgstr ""
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Share Groups"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:545
+#, python-format
+msgid "(Copy for sharing)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,name:0
+msgid "Title for the share (displayed to users as menu and shortcut name)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:635
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,share_root_url:0
+msgid "Main access page for users that are granted shared access"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:206
+#, python-format
+msgid ""
+"You must configure your email address in the user preferences before using "
+"the Share button."
+msgstr ""
+
+#. module: share
+#: model:res.groups,name:share.group_share_user
+msgid "User"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:657
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Use this link"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
+#, python-format
+msgid "Database"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share with these People (one email per line)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "{'search_default_no_share':1}"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,embed_code:0
+msgid ""
+"Embed this code in your documents to provide a link to the shared document."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:512
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:816
+#, python-format
+msgid "Invitation"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+msgid "Share your documents"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Or insert the following code where you want to embed your documents"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:885
+#, python-format
+msgid ""
+"The documents have been automatically added to your current OpenERP "
+"documents.\n"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_code:0
+msgid "Code"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:843
+#, python-format
+msgid ""
+"I have shared %s (%s) with you!\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,view_type:0
+msgid "Current View Type"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can view"
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Can edit"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:792
+#, python-format
+msgid "Shared access created!"
+msgstr ""
+
+#. module: share
+#: model:res.groups,comment:share.group_share_user
+msgid ""
+"\n"
+"Members of this groups have access to the sharing wizard, which allows them "
+"to invite external users to view or edit some of their documents."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:852
+#, python-format
+msgid ""
+"The documents have been automatically added to your subscriptions.\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:875
+#, python-format
+msgid ""
+"I've shared %s with you!\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,invite:0
+msgid "Invite users to OpenSocial record"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:77
+#: field:share.wizard,new_users:0
+#, python-format
+msgid "Emails"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,embed_option_search:0
+msgid "Display search view"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,message:0
+msgid "Personal Message"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:205
+#, python-format
+msgid "No email address configured"
+msgstr ""
+
+#. module: share
+#: field:share.wizard.result.line,login:0
+msgid "Login"
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Sharing: preparation"
+msgstr ""
+
+#. module: share
+#: model:ir.model,name:share.model_ir_model_access
+msgid "ir.model.access"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: share
+#: help:share.wizard,access_mode:0
+msgid "Access rights to be granted on the shared documents."
+msgstr ""
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index 25fd25c234f..30200133f8e 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -34,7 +34,6 @@ class res_groups(osv.osv):
         domain.append(('share', '=', False))
         return super(res_groups, self).get_application_groups(cr, uid, domain=domain, context=context)
 
-res_groups()
 
 class res_users(osv.osv):
     _name = 'res.users'
@@ -43,6 +42,5 @@ class res_users(osv.osv):
         'share': fields.boolean('Share User', readonly=True,
                     help="External user with limited access, created only for the purpose of sharing data.")
      }
-res_users()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 429a1dc2f08..22ed7c3e39c 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -205,7 +205,7 @@ class share_wizard(osv.TransientModel):
             raise osv.except_osv(_('No email address configured'),
                                  _('You must configure your email address in the user preferences before using the Share button.'))
         model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'share', 'action_share_wizard_step1')
-        action = self.pool.get(model).read(cr, uid, res_id, context=context)
+        action = self.pool[model].read(cr, uid, res_id, context=context)
         action['res_id'] = ids[0]
         action.pop('context', '')
         return action
@@ -230,6 +230,7 @@ class share_wizard(osv.TransientModel):
         current_user = user_obj.browse(cr, UID_ROOT, uid, context=context)
         # modify context to disable shortcuts when creating share users
         context['noshortcut'] = True
+        context['no_reset_password'] = True
         created_ids = []
         existing_ids = []
         if wizard_data.user_type == 'emails':
@@ -404,7 +405,7 @@ class share_wizard(osv.TransientModel):
         local_rel_fields = []
         models = [x[1].model for x in relation_fields]
         model_obj = self.pool.get('ir.model')
-        model_osv = self.pool.get(model.model)
+        model_osv = self.pool[model.model]
         for colinfo in model_osv._all_columns.itervalues():
             coldef = colinfo.column
             coltype = coldef._type
@@ -412,8 +413,9 @@ class share_wizard(osv.TransientModel):
             if coltype in ttypes and colinfo.column._obj not in models:
                 relation_model_id = model_obj.search(cr, UID_ROOT, [('model','=',coldef._obj)])[0]
                 relation_model_browse = model_obj.browse(cr, UID_ROOT, relation_model_id, context=context)
-                relation_osv = self.pool.get(coldef._obj)
-                if coltype == 'one2many':
+                relation_osv = self.pool[coldef._obj]
+                #skip virtual one2many fields (related, ...) as there is no reverse relationship
+                if coltype == 'one2many' and hasattr(coldef, '_fields_id'):
                     # don't record reverse path if it's not a real m2o (that happens, but rarely)
                     dest_model_ci = relation_osv._all_columns
                     reverse_rel = coldef._fields_id
@@ -422,7 +424,7 @@ class share_wizard(osv.TransientModel):
                 local_rel_fields.append((relation_field, relation_model_browse))
                 for parent in relation_osv._inherits:
                     if parent not in models:
-                        parent_model = self.pool.get(parent)
+                        parent_model = self.pool[parent]
                         parent_colinfos = parent_model._all_columns
                         parent_model_browse = model_obj.browse(cr, UID_ROOT,
                                                                model_obj.search(cr, UID_ROOT, [('model','=',parent)]))[0]
@@ -458,7 +460,7 @@ class share_wizard(osv.TransientModel):
            """
         # obj0 class and its parents
         obj0 = [(None, model)]
-        model_obj = self.pool.get(model.model)
+        model_obj = self.pool[model.model]
         ir_model_obj = self.pool.get('ir.model')
         for parent in model_obj._inherits:
             parent_model_browse = ir_model_obj.browse(cr, UID_ROOT,
@@ -777,7 +779,7 @@ class share_wizard(osv.TransientModel):
             # Record id not found: issue
             if res_id <= 0:
                 raise osv.except_osv(_('Record id not found'), _('The share engine has not been able to fetch a record_id for your invitation.'))
-            self.pool.get(model.model).message_subscribe(cr, uid, [res_id], new_ids + existing_ids, context=context)
+            self.pool[model.model].message_subscribe(cr, uid, [res_id], new_ids + existing_ids, context=context)
             # self.send_invite_email(cr, uid, wizard_data, context=context)
             # self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
         
@@ -823,7 +825,7 @@ class share_wizard(osv.TransientModel):
             elif tmp_idx == len(wizard_data.result_line_ids)-2:
                 body += ' and'
         body += '.'
-        return self.pool.get(model_name).message_post(cr, uid, [res_id], body=body, context=context)
+        return self.pool[model_name].message_post(cr, uid, [res_id], body=body, context=context)
     
     def send_invite_email(self, cr, uid, wizard_data, context=None):
         # TDE Note: not updated because will disappear
@@ -831,7 +833,7 @@ class share_wizard(osv.TransientModel):
         notification_obj = self.pool.get('mail.notification')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.email:
-            raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
+            raise osv.except_osv(_('Email Required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
         
         # TODO: also send an HTML version of this mail
         for result_line in wizard_data.result_line_ids:
@@ -862,7 +864,7 @@ class share_wizard(osv.TransientModel):
         mail_mail = self.pool.get('mail.mail')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.email:
-            raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
+            raise osv.except_osv(_('Email Required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
         
         # TODO: also send an HTML version of this mail
         mail_ids = []
@@ -902,7 +904,6 @@ class share_wizard(osv.TransientModel):
         options = dict(title=opt_title, search=opt_search)
         return {'value': {'embed_code': self._generate_embedded_code(wizard, options)}}
 
-share_wizard()
 
 class share_result_line(osv.osv_memory):
     _name = 'share.wizard.result.line'
diff --git a/addons/share/wizard/share_wizard_view.xml b/addons/share/wizard/share_wizard_view.xml
index 859245b46a9..e0e800ab150 100644
--- a/addons/share/wizard/share_wizard_view.xml
+++ b/addons/share/wizard/share_wizard_view.xml
@@ -96,6 +96,7 @@
                     <footer>
                         <field name="user_type" invisible="1"/>
                         <field name="access_mode" invisible="1"/>
+                        <button string="Close" class="oe_highlight" special="cancel" />
                     </footer>
 
                 </form>
diff --git a/addons/stock/html/Didier-Georgieff.jpg b/addons/stock/html/Didier-Georgieff.jpg
new file mode 100644
index 00000000000..ccf3007b86e
Binary files /dev/null and b/addons/stock/html/Didier-Georgieff.jpg differ
diff --git a/addons/stock/html/Mario-Riva.png b/addons/stock/html/Mario-Riva.png
new file mode 100644
index 00000000000..35b030a4265
Binary files /dev/null and b/addons/stock/html/Mario-Riva.png differ
diff --git a/addons/stock/html/index.html b/addons/stock/html/index.html
new file mode 100644
index 00000000000..aac71e529ae
--- /dev/null
+++ b/addons/stock/html/index.html
@@ -0,0 +1,240 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Warehouse Management System</h2>
+            <h3 class="oe_slogan">A revolutionary double entry inventory system</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=stock">
+                    <img src="stock_main.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Decrease your process times, automate transactions, reduce your stock levels and get complete traceability on all operations with the OpenERP double entry inventory system.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Double Entry Inventory Management</h2>
+        <h3 class="oe_slogan">Nothing is lost, everything is moved</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Based on the concept of double entry that revolutionized accounting, OpenERP's
+inventory management isn't about consumption, loss or missing products;
+products are just moved from one location to another.
+            </p><p>
+This allows full traceability (from customer to supplier, not limited to your
+warehouse), advanced reporting (e.g. inventory valuation on manufacturing
+counter-parts locations) and a very simple user interface.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="warehouse_illu_02.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Decrease your process time</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="stock_calendar.png">
+        </div>
+        <div class="oe_span6">
+           <p class='oe_mt32'>
+OpenERP prepares all operations for you, according to your own logistic rules:
+push rules, pull rules, make-to-order, minimum stock rules, etc. Optimizes the
+planning and jobs with the scheduler to reduce your process time.
+           </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Automate transactions</h2>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Get your pickings, packings, receptions and internal moves scheduled
+automatically by OpenERP using your own routing rules.  Define push and pull
+rules to organize a warehouse or to manage produts's moves between several
+warehouses.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="stock_procurement.png">
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Get Full Traceability</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture" src="stock_product_form.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Keep an eye on all your stock by tracing all your past and future inventory
+transactions. Track in detail all stock moves, not only in your warehouse but
+also in counter-parts of the double entry moves (customers, suppliers or
+manufacturing locations).
+          </p><p>
+          Browse through the upstream or downstream traceability flows to
+          have a clear vision to what happened to a specific product or lot.
+          </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_centeralign oe_padded oe_mb32">
+    <div class='oe_cover'>
+        <img src="http://www.openerp.com/ebooks/logistic.png">
+    </div>
+    <a href="http://www.openerp.com/ebooks/logistic" target="_blank" class="oe_button oe_big">Download our free E-book</a>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Reduce your stock level</h2>
+        <h3 class="oe_slogan">Fine-tune procurement methods according to your need</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Reduce your stock while always staying replenished! You can setup minimum stock
+rules to have automatic procurements with the right quantities computed to get
+to the optimum level specified. Get rid of the stress of your stock and let the
+system help you with fullfilment propositions. 
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="warehouse_illu_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Fully Integrated with Operations</h2>
+        <h3 class="oe_slogan">Sales, Purchases and Accounting integration</h3>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="stock_integrate.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Get your procurements accurate as the OpenERP WMS is fully integrated with
+sales and purchases for accurate forecasts. The accounting integration allows
+real time accounting valuation and deeper reporting on costs and revenues on
+your inventory operations.
+          </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Track Serial Numbers</h2>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Assign serial numbers at every step of your reception or delivery flow.
+OpenERP handles production lots (batches of identical products) or logistic
+lots (pallets, boxes, etc) to help you get full upstream or downstream
+traceability.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="stock_product.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Scale Your WMS easily</h2>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="warehouse_illu_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+Manage your own internal and external locations, customers, suppliers or
+manufacturing inventories with the OpenERP multi-warehouse management system
+based on a hierarchical location structure.
+          </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_spaced oe_row">
+        <h2 class="oe_slogan">Reporting and Dashboards</h2>
+        <h3 class="oe_slogan">Analyse your warehouse efficiency to improve performance</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Get the insights you need to make smarter decisions. Design custom dashboards
+to get a picture of your warehouse efficiency at a glance. Dig deeper with
+real-time reports that anyone can create and share.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="stock_reporting.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We found the WMS apps to be a powerful tool for mid­size companies to better
+                    organize the warehouse. It's simple and easily customizable.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Mario-Riva.png">
+                    <div class="oe_author">Mario Riva</div>
+                    <div class="oe_job">COO, <a href="http://www.agilebg.com" target="_blank">Agile Business Group</a>.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We saved hundreds of thousands of dollars with OpenERP.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="Didier-Georgieff.jpg">
+                    <div class="oe_author">Didier Georgieff</div>
+                    <div class="oe_job">Chief Technical Officer, ENA</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/stock/html/stock_calendar.png b/addons/stock/html/stock_calendar.png
new file mode 100644
index 00000000000..58fb2bb077a
Binary files /dev/null and b/addons/stock/html/stock_calendar.png differ
diff --git a/addons/stock/html/stock_integrate.png b/addons/stock/html/stock_integrate.png
new file mode 100644
index 00000000000..92a0b0950d6
Binary files /dev/null and b/addons/stock/html/stock_integrate.png differ
diff --git a/addons/stock/html/stock_main.png b/addons/stock/html/stock_main.png
new file mode 100644
index 00000000000..b9b44c702aa
Binary files /dev/null and b/addons/stock/html/stock_main.png differ
diff --git a/addons/stock/html/stock_procurement.png b/addons/stock/html/stock_procurement.png
new file mode 100644
index 00000000000..cb315e08224
Binary files /dev/null and b/addons/stock/html/stock_procurement.png differ
diff --git a/addons/stock/html/stock_product.png b/addons/stock/html/stock_product.png
new file mode 100644
index 00000000000..cbfd054d72e
Binary files /dev/null and b/addons/stock/html/stock_product.png differ
diff --git a/addons/stock/html/stock_product_form.png b/addons/stock/html/stock_product_form.png
new file mode 100644
index 00000000000..a25c85b6496
Binary files /dev/null and b/addons/stock/html/stock_product_form.png differ
diff --git a/addons/stock/html/stock_reporting.png b/addons/stock/html/stock_reporting.png
new file mode 100644
index 00000000000..1ec54d18813
Binary files /dev/null and b/addons/stock/html/stock_reporting.png differ
diff --git a/addons/stock/html/warehouse_illu_01.png b/addons/stock/html/warehouse_illu_01.png
new file mode 100644
index 00000000000..60ccb3bf1ba
Binary files /dev/null and b/addons/stock/html/warehouse_illu_01.png differ
diff --git a/addons/stock/html/warehouse_illu_02.png b/addons/stock/html/warehouse_illu_02.png
new file mode 100644
index 00000000000..1543e2e3ae1
Binary files /dev/null and b/addons/stock/html/warehouse_illu_02.png differ
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 4a79cec4b89..817b8aceaa5 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-01-22 08:16+0000\n"
+"PO-Revision-Date: 2013-06-04 12:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 04:58+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-05 05:32+0000\n"
+"X-Generator: Launchpad (build 16660)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -660,6 +660,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Принудительно установить порядковый номер для всех перемещений этой "
+"продукции в место хранения заказчика"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
@@ -845,6 +847,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Принудительно установить порядковый номер для всех перемещений этой "
+"продукции из мест хранения поставщика"
 
 #. module: stock
 #: help:stock.config.settings,group_uos:0
@@ -1973,7 +1977,7 @@ msgstr "Полка 2"
 #: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
-msgstr ""
+msgstr "Нельзя удалить позицию партии"
 
 #. module: stock
 #: help:stock.location,posx:0
@@ -2402,7 +2406,7 @@ msgstr "Место хранения поставщика"
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Products Inventory"
-msgstr ""
+msgstr "Новая инвентаризация продукции"
 
 #. module: stock
 #: view:stock.move:0
@@ -2535,6 +2539,7 @@ msgid ""
 "Current quantity of products with this Serial Number available in company "
 "warehouses"
 msgstr ""
+"Текущее количество продукции с этим серийный номером на складах компании"
 
 #. module: stock
 #: view:stock.inventory:0
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index f5f02b7cd19..b8bad4faf95 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -41,6 +41,5 @@ class res_partner(osv.osv):
           help="This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"),
     }
 
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 1d56ce64988..29445f671ee 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -479,7 +479,6 @@ class product_product(osv.osv):
                         res['fields']['qty_available']['string'] = _('Produced Qty')
         return res
 
-product_product()
 
 class product_template(osv.osv):
     _name = 'product.template'
@@ -528,7 +527,6 @@ class product_template(osv.osv):
     _defaults = {
         'sale_delay': 7,
     }
-product_template()
 
 class product_category(osv.osv):
 
@@ -558,6 +556,5 @@ class product_category(osv.osv):
             help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
     }
 
-product_category()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index dc80c0f950a..e52a0181206 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -110,12 +110,11 @@
                     </group>
                 </group>
                 <group name="status" position="after" version="7.0">
-                     <group name="store" string="Storage Location">
-                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                         <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
-                         <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
-                         <field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
-                     </group>
+                    <group name="store" string="Storage Location" attrs="{'invisible':[('type','=','service')]}">
+                        <field name="loc_rack"/>
+                        <field name="loc_row"/>
+                        <field name="loc_case"/>
+                    </group>
                 </group>
                 <group name="Weights" position="after">
                      <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index 0315c44281b..d213db673dc 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -30,6 +30,7 @@ from openerp.report.render import render
 
 import stock_graph
 import StringIO
+import unicodedata
 
 class external_pdf(render):
     def __init__(self, pdf):
@@ -107,7 +108,12 @@ class report_stock(report_int):
         io = StringIO.StringIO()
         gt = stock_graph.stock_graph(io)
         for prod_id in products:
-            gt.add(prod_id, names.get(prod_id, 'Unknown'), products[prod_id])
+            prod_name = names.get(prod_id,'Unknown')
+            if isinstance(prod_name, str):
+                 prod_name = prod_name.decode('utf-8')
+                 prod_name = unicodedata.normalize('NFKD',prod_name)
+                 prod_name = prod_name.encode('ascii','replace')
+            gt.add(prod_id, prod_name, products[prod_id])   
         gt.draw()
         gt.close()
         self.obj = external_pdf(io.getvalue())
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 0aac0d6599b..d4bbb3ab127 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -77,7 +77,6 @@ class stock_report_prodlots(osv.osv):
     def unlink(self, cr, uid, ids, context=None):
         raise osv.except_osv(_('Error!'), _('You cannot delete any record!'))
 
-stock_report_prodlots()
 
 class stock_report_tracklots(osv.osv):
     _name = "stock.report.tracklots"
@@ -133,7 +132,6 @@ class stock_report_tracklots(osv.osv):
     def unlink(self, cr, uid, ids, context=None):
         raise osv.except_osv(_('Error!'), _('You cannot delete any record!'))
 
-stock_report_tracklots()
 
 class report_stock_lines_date(osv.osv):
     _name = "report.stock.lines.date"
@@ -162,6 +160,5 @@ class report_stock_lines_date(osv.osv):
                 group by p.id
             )""")
 
-report_stock_lines_date()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 39591021735..b8c22062fa5 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -142,7 +142,6 @@ class report_stock_move(osv.osv):
                )
         """)
 
-report_stock_move()
 
 
 class report_stock_inventory(osv.osv):
@@ -193,6 +192,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
                 LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_id=l.id)
+            WHERE m.state != 'cancel'
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id,  m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, l.scrap_location, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
@@ -216,13 +216,13 @@ CREATE OR REPLACE view report_stock_inventory AS (
                 LEFT JOIN product_uom pu2 ON (m.product_uom=pu2.id)
             LEFT JOIN product_uom u ON (m.product_uom=u.id)
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
+            WHERE m.state != 'cancel'
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id,
         m.prodlot_id, m.date, m.state, l.usage, l.scrap_location, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
     )
 );
         """)
-report_stock_inventory()
 
 
 
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 4f3e256389c..fcf99f6e51e 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -149,7 +149,7 @@
                 <field name="location_id" filter_domain="[('location_id', 'child_of', self)]"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="partner_id" context="{'contact_display':'partner'}"/>
+                    <field name="partner_id" context="{'contact_display':'partner'}" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="product_categ_id" />
                     <field name="prodlot_id"/>
                     <field name="state"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index be0dd59468c..d5fb48a60f0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -29,7 +29,7 @@ from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp import netsvc
 from openerp import tools
-from openerp.tools import float_compare
+from openerp.tools import float_compare, DEFAULT_SERVER_DATETIME_FORMAT
 import openerp.addons.decimal_precision as dp
 import logging
 _logger = logging.getLogger(__name__)
@@ -49,7 +49,6 @@ class stock_incoterms(osv.osv):
         'active': True,
     }
 
-stock_incoterms()
 
 class stock_journal(osv.osv):
     _name = "stock.journal"
@@ -62,7 +61,6 @@ class stock_journal(osv.osv):
         'user_id': lambda s, c, u, ctx: u
     }
 
-stock_journal()
 
 #----------------------------------------------------------
 # Stock Location
@@ -472,7 +470,6 @@ class stock_location(osv.osv):
                     continue
         return False
 
-stock_location()
 
 
 class stock_tracking(osv.osv):
@@ -538,7 +535,6 @@ class stock_tracking(osv.osv):
         """
         return self.pool.get('action.traceability').action_traceability(cr,uid,ids,context)
 
-stock_tracking()
 
 #----------------------------------------------------------
 # Stock Picking
@@ -547,6 +543,7 @@ class stock_picking(osv.osv):
     _name = "stock.picking"
     _inherit = ['mail.thread']
     _description = "Picking List"
+    _order = "id desc"
 
     def _set_maximum_date(self, cr, uid, ids, name, value, arg, context=None):
         """ Calculates planned date if it is greater than 'value'.
@@ -651,7 +648,7 @@ class stock_picking(osv.osv):
         ),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"),
-        'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+        'date': fields.datetime('Creation Date', help="Creation date, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'date_done': fields.datetime('Date of Transfer', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
@@ -1113,7 +1110,7 @@ class stock_picking(osv.osv):
             if isinstance(partner, int):
                 partner = partner_obj.browse(cr, uid, [partner], context=context)[0]
             if not partner:
-                raise osv.except_osv(_('Error, no partner !'),
+                raise osv.except_osv(_('Error, no partner!'),
                     _('Please put a partner on the picking list if you want to generate invoice.'))
 
             if not inv_type:
@@ -1491,7 +1488,6 @@ class stock_production_lot(osv.osv):
         default.update(date=time.strftime('%Y-%m-%d %H:%M:%S'), move_ids=[])
         return super(stock_production_lot, self).copy(cr, uid, id, default=default, context=context)
 
-stock_production_lot()
 
 class stock_production_lot_revision(osv.osv):
     _name = 'stock.production.lot.revision'
@@ -1512,7 +1508,6 @@ class stock_production_lot_revision(osv.osv):
         'date': fields.date.context_today,
     }
 
-stock_production_lot_revision()
 
 # ----------------------------------------------------
 # Move
@@ -1769,7 +1764,7 @@ class stock_move(osv.osv):
             for move in self.browse(cr, uid, ids, context=context):
                 if move.state == 'done':
                     if frozen_fields.intersection(vals):
-                        raise osv.except_osv(_('Operation forbidden !'),
+                        raise osv.except_osv(_('Operation Forbidden!'),
                                              _('Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).'))
         return  super(stock_move, self).write(cr, uid, ids, vals, context=context)
 
@@ -2329,7 +2324,6 @@ class stock_move(osv.osv):
                          'line_id': move_lines,
                          'ref': move.picking_id and move.picking_id.name})
 
-
     def action_done(self, cr, uid, ids, context=None):
         """ Makes the move done and if all moves are done, it will finish the picking.
         @return:
@@ -2375,7 +2369,7 @@ class stock_move(osv.osv):
         if todo:
             self.action_confirm(cr, uid, todo, context=context)
 
-        self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+        self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
         for id in move_ids:
              wf_service.trg_trigger(uid, 'stock.move', id, cr)
 
@@ -2418,14 +2412,14 @@ class stock_move(osv.osv):
         # or if it's the same as that of the secondary amount being posted.
         account_obj = self.pool.get('account.account')
         src_acct, dest_acct = account_obj.browse(cr, uid, [src_account_id, dest_account_id], context=context)
-        src_main_currency_id = src_acct.company_id.currency_id.id
-        dest_main_currency_id = dest_acct.company_id.currency_id.id
+        src_main_currency_id = src_acct.currency_id and src_acct.currency_id.id or src_acct.company_id.currency_id.id
+        dest_main_currency_id = dest_acct.currency_id and dest_acct.currency_id.id or dest_acct.company_id.currency_id.id
         cur_obj = self.pool.get('res.currency')
         if reference_currency_id != src_main_currency_id:
             # fix credit line:
             credit_line_vals['credit'] = cur_obj.compute(cr, uid, reference_currency_id, src_main_currency_id, reference_amount, context=context)
             if (not src_acct.currency_id) or src_acct.currency_id.id == reference_currency_id:
-                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=reference_amount)
+                credit_line_vals.update(currency_id=reference_currency_id, amount_currency=-reference_amount)
         if reference_currency_id != dest_main_currency_id:
             # fix debit line:
             debit_line_vals['debit'] = cur_obj.compute(cr, uid, reference_currency_id, dest_main_currency_id, reference_amount, context=context)
@@ -2737,7 +2731,6 @@ class stock_move(osv.osv):
 
         return [move.id for move in complete]
 
-stock_move()
 
 class stock_inventory(osv.osv):
     _name = "stock.inventory"
@@ -2860,7 +2853,6 @@ class stock_inventory(osv.osv):
             self.write(cr, uid, [inv.id], {'state': 'cancel'}, context=context)
         return True
 
-stock_inventory()
 
 class stock_inventory_line(osv.osv):
     _name = "stock.inventory.line"
@@ -2900,7 +2892,6 @@ class stock_inventory_line(osv.osv):
         result = {'product_qty': amount, 'product_uom': uom, 'prod_lot_id': False}
         return {'value': result}
 
-stock_inventory_line()
 
 #----------------------------------------------------------
 # Stock Warehouse
@@ -2932,7 +2923,6 @@ class stock_warehouse(osv.osv):
         'lot_output_id': _default_lot_output_id,
     }
 
-stock_warehouse()
 
 #----------------------------------------------------------
 # "Empty" Classes that are used to vary from the original stock.picking  (that are dedicated to the internal pickings)
@@ -2944,6 +2934,12 @@ class stock_picking_in(osv.osv):
     _table = "stock_picking"
     _description = "Incoming Shipments"
 
+    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        return self.pool.get('stock.picking').search(cr, user, args, offset, limit, order, context, count)
+
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        return self.pool.get('stock.picking').read(cr, uid, ids, fields=fields, context=context, load=load)
+
     def check_access_rights(self, cr, uid, operation, raise_exception=True):
         #override in order to redirect the check of acces rights on the stock.picking object
         return self.pool.get('stock.picking').check_access_rights(cr, uid, operation, raise_exception=raise_exception)
@@ -2999,6 +2995,12 @@ class stock_picking_out(osv.osv):
     _table = "stock_picking"
     _description = "Delivery Orders"
 
+    def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        return self.pool.get('stock.picking').search(cr, user, args, offset, limit, order, context, count)
+
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        return self.pool.get('stock.picking').read(cr, uid, ids, fields=fields, context=context, load=load)
+
     def check_access_rights(self, cr, uid, operation, raise_exception=True):
         #override in order to redirect the check of acces rights on the stock.picking object
         return self.pool.get('stock.picking').check_access_rights(cr, uid, operation, raise_exception=raise_exception)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6162d073fde..b1a1fa048be 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -817,7 +817,7 @@
                     <filter icon="terp-check" name="available" string="Ready" domain="[('state','=','assigned')]" help="Assigned Internal Moves"/>
                     <filter icon="terp-camera_test" name="confirmed" string="Waiting" domain="[('state','=','confirmed')]" help="Confirmed Internal Moves"/>
                     <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Pickings already processed"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="product_id"/>
                     <field name="stock_journal_id"/>
                     <group expand="0" string="Group By...">
@@ -944,6 +944,7 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="stock_journal_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <group expand="0" string="Group By...">
@@ -1069,6 +1070,7 @@
                     <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
                     <separator/>
                     <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
+                    <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
                     <field name="stock_journal_id"/>
                     <field name="product_id"/>
                     <group expand="0" string="Group By...">
@@ -1260,8 +1262,8 @@
                             <field name="location_dest_id" groups="stock.group_locations"/>
                             <field name="partner_id" context="{'contact_display':'partner'}"
                                 groups="stock.group_locations"/>
-                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                            <field name="date" groups="base.group_no_one"/>
+                            <field name="date_expected" on_change="onchange_date(date,date_expected)" attrs="{'invisible': [('state', '=', 'done')]}"/>
+                            <field name="date" attrs="{'invisible': [('state', '!=', 'done')]}"/>
                         </group>
                         <group string="Traceability"
                             groups="stock.group_tracking_lot">
@@ -1380,7 +1382,7 @@
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
                     <field name="product_id"/>
                     <field name="name" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','ilike',self)]"/>
+                    <field name="partner_id" string="Partner"  filter_domain="[('picking_id.partner_id','child_of',self)]"/>
                     <field name="prodlot_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Product" name="by_product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 881b5fd9af7..e6614724454 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -116,6 +116,5 @@ class change_standard_price(osv.osv_memory):
         prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
         return {'type': 'ir.actions.act_window_close'}
 
-change_standard_price()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 237033bb7b0..e3341bd6a80 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -143,6 +143,5 @@ class stock_fill_inventory(osv.osv_memory):
 
         return {'type': 'ir.actions.act_window_close'}
 
-stock_fill_inventory()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index 171a193e173..e2b5cff513d 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -86,7 +86,6 @@ class stock_inventory_merge(osv.osv_memory):
 
         return {'type': 'ir.actions.act_window_close'}
 
-stock_inventory_merge()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 7c960c5e617..c95508cd71b 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -39,7 +39,7 @@ class stock_invoice_onshipping(osv.osv_memory):
         if not model or 'stock.picking' not in model:
             return []
 
-        model_pool = self.pool.get(model)
+        model_pool = self.pool[model]
         journal_obj = self.pool.get('account.journal')
         res_ids = context and context.get('active_ids', [])
         vals = []
@@ -119,7 +119,7 @@ class stock_invoice_onshipping(osv.osv_memory):
         elif inv_type == "in_refund":
             action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree4")
         if action_model:
-            action_pool = self.pool.get(action_model)
+            action_pool = self.pool[action_model]
             action = action_pool.read(cr, uid, action_id, context=context)
             action['domain'] = "[('id','in', ["+','.join(map(str,invoice_ids))+"])]"
         return action
@@ -146,6 +146,5 @@ class stock_invoice_onshipping(osv.osv_memory):
               context=context)
         return res
 
-stock_invoice_onshipping()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 59d99167e6a..ef7c9848160 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -57,6 +57,5 @@ class stock_location_product(osv.osv_memory):
                 'domain': [('type', '<>', 'service')],
             }
 
-stock_location_product()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 09f684aa691..a98d0ebda02 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -78,7 +78,6 @@ class stock_move_consume(osv.osv_memory):
                              context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-stock_move_consume()
 
 
 class stock_move_scrap(osv.osv_memory):
@@ -139,7 +138,6 @@ class stock_move_scrap(osv.osv_memory):
                              context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-stock_move_scrap()
 
 
 class split_in_production_lot(osv.osv_memory):
@@ -255,7 +253,6 @@ class split_in_production_lot(osv.osv_memory):
 
         return new_move
 
-split_in_production_lot()
 
 class stock_move_split_lines_exist(osv.osv_memory):
     _name = "stock.move.split.lines"
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 47599d5f99e..8c2c5839989 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -144,7 +144,7 @@ class stock_partial_picking(osv.osv_memory):
     def _partial_move_for(self, cr, uid, move):
         partial_move = {
             'product_id' : move.product_id.id,
-            'quantity' : move.product_qty if move.state in ('assigned','draft','confirmed') else 0,
+            'quantity' : move.product_qty if move.state == 'assigned' else 0,
             'product_uom' : move.product_uom.id,
             'prodlot_id' : move.prodlot_id.id,
             'move_id' : move.id,
@@ -178,7 +178,7 @@ class stock_partial_picking(osv.osv_memory):
 
             if line_uom.factor and line_uom.factor <> 0:
                 if float_compare(qty_in_line_uom, wizard_line.quantity, precision_rounding=line_uom.rounding) != 0:
-                    raise osv.except_osv(_('Warning!'), _('The unit of measure rounding does not allow you to ship "%s %s", only roundings of "%s %s" is accepted by the Unit of Measure.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
+                    raise osv.except_osv(_('Warning!'), _('The unit of measure rounding does not allow you to ship "%s %s", only rounding of "%s %s" is accepted by the Unit of Measure.') % (wizard_line.quantity, line_uom.name, line_uom.rounding, line_uom.name))
             if move_id:
                 #Check rounding Quantity.ex.
                 #picking: 1kg, uom kg rounding = 0.01 (rounding to 10g),
@@ -189,7 +189,7 @@ class stock_partial_picking(osv.osv_memory):
                 qty_in_initial_uom = uom_obj._compute_qty(cr, uid, line_uom.id, wizard_line.quantity, initial_uom.id)
                 without_rounding_qty = (wizard_line.quantity / line_uom.factor) * initial_uom.factor
                 if float_compare(qty_in_initial_uom, without_rounding_qty, precision_rounding=initial_uom.rounding) != 0:
-                    raise osv.except_osv(_('Warning!'), _('The rounding of the initial uom does not allow you to ship "%s %s", as it would let a quantity of "%s %s" to ship and only roundings of "%s %s" is accepted by the uom.') % (wizard_line.quantity, line_uom.name, wizard_line.move_id.product_qty - without_rounding_qty, initial_uom.name, initial_uom.rounding, initial_uom.name))
+                    raise osv.except_osv(_('Warning!'), _('The rounding of the initial uom does not allow you to ship "%s %s", as it would let a quantity of "%s %s" to ship and only rounding of "%s %s" is accepted by the uom.') % (wizard_line.quantity, line_uom.name, wizard_line.move_id.product_qty - without_rounding_qty, initial_uom.name, initial_uom.rounding, initial_uom.name))
             else:
                 seq_obj_name =  'stock.picking.' + picking_type
                 move_id = stock_move.create(cr,uid,{'name' : self.pool.get('ir.sequence').get(cr, uid, seq_obj_name),
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index e9bc0f7626f..c51e1415249 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -38,7 +38,6 @@ class stock_return_picking_memory(osv.osv_memory):
 
     }
 
-stock_return_picking_memory()
 
 
 class stock_return_picking(osv.osv_memory):
@@ -225,6 +224,5 @@ class stock_return_picking(osv.osv_memory):
             'context':context,
         }
 
-stock_return_picking()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 3485a6e8264..76a80595be6 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -80,7 +80,6 @@ class stock_split_into(osv.osv_memory):
 
 
         return {'type': 'ir.actions.act_window_close'}
-stock_split_into()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 8d5fd1ed10d..c13fc1cf7a6 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -62,7 +62,6 @@ class action_traceability(osv.osv_memory):
         }
         return value
 
-action_traceability()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 5de6490dc0f..ba41de626da 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -45,6 +45,5 @@ class invoice_directly(osv.osv_memory):
             }
         return {'type': 'ir.actions.act_window_close'}
 
-invoice_directly()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 1258ddb529f..e22ccf80f8f 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -54,7 +54,6 @@ class stock_location_path(osv.osv):
         'invoice_state': 'none',
         'picking_type': 'internal',
     }
-stock_location_path()
 
 class product_pulled_flow(osv.osv):
     _name = 'product.pulled.flow'
@@ -85,7 +84,6 @@ class product_pulled_flow(osv.osv):
         'invoice_state': 'none',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.pulled.flow', context=c),
     }
-product_pulled_flow()
 
 class product_product(osv.osv):
     _inherit = 'product.product'
@@ -96,7 +94,6 @@ class product_product(osv.osv):
             help="These rules set the right path of the product in the "\
             "whole location tree.")
     }
-product_product()
 
 class stock_move(osv.osv):
     _inherit = 'stock.move'
@@ -114,7 +111,6 @@ class stock_move(osv.osv):
         res = super(stock_move, self)._prepare_chained_picking(cr, uid, picking_name, picking, picking_type, moves_todo, context=context)
         res.update({'invoice_state': moves_todo[0][1][6] or 'none'})
         return res
-stock_move()
 
 class stock_location(osv.osv):
     _inherit = 'stock.location'
@@ -124,5 +120,4 @@ class stock_location(osv.osv):
                 if path.location_from_id.id == location.id:
                     return path.location_dest_id, path.auto, path.delay, path.journal_id and path.journal_id.id or False, path.company_id and path.company_id.id or False, path.picking_type, path.invoice_state
         return super(stock_location, self).chained_location_get(cr, uid, location, partner, product, context)
-stock_location()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index 6578a961ff3..d9a220daef6 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
          <record id="product.product_product_9" model="product.product">
@@ -73,7 +72,7 @@
             <field name="company_id" ref="stock.res_company_1"/>
             <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
             <field name="location_id" ref="stock.stock_location_shop0"/>
-            <field model="product.product" name="product_id" ref="product.product_product_9"/>
+            <field name="product_id" ref="product.product_product_9"/>
         </record>
 
         <record id="sale_shop2" model="sale.shop">
@@ -89,4 +88,4 @@
             <field model="account.payment.term" name="payment_default_id" search="[]"/>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/stock_no_autopicking/stock_no_autopicking.py b/addons/stock_no_autopicking/stock_no_autopicking.py
index 904854f3533..dd8fb31f59f 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking.py
+++ b/addons/stock_no_autopicking/stock_no_autopicking.py
@@ -29,12 +29,10 @@ class product(osv.osv):
     _defaults = {
         'auto_pick': True
     }
-product()
 
 class mrp_production(osv.osv):
     _inherit = "mrp.production"
     def _get_auto_picking(self, cr, uid, production):
         return production.product_id.auto_pick
-mrp_production()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 92bde135bc6..98e1d78b3be 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -38,7 +38,6 @@ class subscription_document(osv.osv):
     _defaults = {
         'active' : lambda *a: True,
     }
-subscription_document()
 
 class subscription_document_fields(osv.osv):
     _name = "subscription.document.fields"
@@ -50,7 +49,6 @@ class subscription_document_fields(osv.osv):
         'document_id': fields.many2one('subscription.document', 'Subscription Document', ondelete='cascade'),
     }
     _defaults = {}
-subscription_document_fields()
 
 def _get_document_types(self, cr, uid, context=None):
     cr.execute('select m.model, s.name from subscription_document s, ir_model m WHERE s.model = m.id order by s.name')
@@ -115,9 +113,9 @@ class subscription_subscription(osv.osv):
             try:
                 (model_name, id) = row['doc_source'].split(',')
                 id = int(id)
-                model = self.pool.get(model_name)
+                model = self.pool[model_name]
             except:
-                raise osv.except_osv(_('Wrong Source Document !'), _('Please provide another source document.\nThis one does not exist !'))
+                raise osv.except_osv(_('Wrong Source Document!'), _('Please provide another source document.\nThis one does not exist!'))
 
             default = {'state':'draft'}
             doc_obj = self.pool.get('subscription.document')
@@ -136,7 +134,7 @@ class subscription_subscription(osv.osv):
             # the subscription is over and we mark it as being done
             if remaining == 1:
                 state = 'done'
-            id = self.pool.get(model_name).copy(cr, uid, id, default, context)
+            id = self.pool[model_name].copy(cr, uid, id, default, context)
             self.pool.get('subscription.subscription.history').create(cr, uid, {'subscription_id': row['id'], 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'document_id': model_name+','+str(id)})
             self.write(cr, uid, [row['id']], {'state':state})
         return True
@@ -144,7 +142,7 @@ class subscription_subscription(osv.osv):
     def unlink(self, cr, uid, ids, context=None):
         for record in self.browse(cr, uid, ids, context or {}):
             if record.state=="running":
-                raise osv.except_osv(_('Error!'),_('You cannot delete an active subscription !'))
+                raise osv.except_osv(_('Error!'),_('You cannot delete an active subscription!'))
         return super(subscription_subscription, self).unlink(cr, uid, ids, context)
 
     def set_done(self, cr, uid, ids, context=None):
@@ -157,7 +155,6 @@ class subscription_subscription(osv.osv):
     def set_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
-subscription_subscription()
 
 class subscription_subscription_history(osv.osv):
     _name = "subscription.subscription.history"
@@ -168,7 +165,6 @@ class subscription_subscription_history(osv.osv):
         'subscription_id': fields.many2one('subscription.subscription', 'Subscription', ondelete='cascade'),
         'document_id': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
     }
-subscription_subscription_history()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index d0c59159a3d..ad96145741b 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -36,7 +36,6 @@ class survey_type(osv.osv):
         'name': fields.char("Name", size=128, required=1, translate=True),
         'code': fields.char("Code", size=64),
     }
-survey_type()
 
 class survey(osv.osv):
     _name = 'survey'
@@ -196,7 +195,6 @@ class survey(osv.osv):
             'context': context
         }
 
-survey()
 
 class survey_history(osv.osv):
     _name = 'survey.history'
@@ -210,7 +208,6 @@ class survey_history(osv.osv):
     _defaults = {
          'date': lambda * a: datetime.datetime.now()
     }
-survey_history()
 
 class survey_page(osv.osv):
     _name = 'survey.page'
@@ -260,7 +257,6 @@ class survey_page(osv.osv):
         vals.update({'title':title})
         return super(survey_page, self).copy(cr, uid, ids, vals, context=context)
 
-survey_page()
 
 class survey_question(osv.osv):
     _name = 'survey.question'
@@ -561,7 +557,6 @@ class survey_question(osv.osv):
             data['page_id']= context.get('page_id', False)
         return data
 
-survey_question()
 
 
 class survey_question_column_heading(osv.osv):
@@ -594,7 +589,6 @@ class survey_question_column_heading(osv.osv):
        'in_visible_rating_weight': _get_in_visible_rating_weight,
        'in_visible_menu_choice': _get_in_visible_menu_choice,
     }
-survey_question_column_heading()
 
 class survey_answer(osv.osv):
     _name = 'survey.answer'
@@ -651,7 +645,6 @@ class survey_answer(osv.osv):
         data = super(survey_answer, self).default_get(cr, uid, fields, context)
         return data
 
-survey_answer()
 
 class survey_response(osv.osv):
     _name = "survey.response"
@@ -684,7 +677,6 @@ class survey_response(osv.osv):
     def copy(self, cr, uid, id, default=None, context=None):
         raise osv.except_osv(_('Warning!'),_('You cannot duplicate the resource!'))
 
-survey_response()
 
 class survey_response_line(osv.osv):
     _name = 'survey.response.line'
@@ -708,7 +700,6 @@ class survey_response_line(osv.osv):
         'state' : lambda * a: "draft",
     }
 
-survey_response_line()
 
 class survey_tbl_column_heading(osv.osv):
     _name = 'survey.tbl.column.heading'
@@ -720,7 +711,6 @@ class survey_tbl_column_heading(osv.osv):
         'response_table_id': fields.many2one('survey.response.line', 'Answer', ondelete='cascade'),
     }
 
-survey_tbl_column_heading()
 
 class survey_response_answer(osv.osv):
     _name = 'survey.response.answer'
@@ -736,7 +726,6 @@ class survey_response_answer(osv.osv):
         'comment_field': fields.char('Comment', size = 255)
     }
 
-survey_response_answer()
 
 class res_users(osv.osv):
     _inherit = "res.users"
@@ -745,7 +734,6 @@ class res_users(osv.osv):
         'survey_id': fields.many2many('survey', 'survey_users_rel', 'uid', 'sid', 'Groups'),
     }
 
-res_users()
 
 class survey_request(osv.osv):
     _name = "survey.request"
@@ -786,6 +774,5 @@ class survey_request(osv.osv):
             return {'value': {'email': user.email}}
         return {}
 
-survey_request()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 903937af441..6d473754988 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -25,7 +25,8 @@ from lxml import etree
 import os
 from time import strftime
 
-from openerp import addons, tools
+from openerp import tools
+from openerp.modules.module import get_module_resource
 from openerp.osv import fields, osv
 import openerp.report
 from openerp.tools import to_xml
@@ -402,16 +403,17 @@ class survey_question_wiz(osv.osv_memory):
                     sur_response_obj.write(cr, uid, [sur_name_read.response], {'state' : 'done'})
 
                     # mark the survey request as done; call 'survey_req_done' on its actual model
-                    survey_req_obj = self.pool.get(context.get('active_model'))
-                    if survey_req_obj and hasattr(survey_req_obj, 'survey_req_done'): 
-                        survey_req_obj.survey_req_done(cr, uid, context.get('active_ids', []), context=context)
+                    if context.get('active_model') in self.pool:
+                        survey_req_obj = self.pool[context.get('active_model')]
+                        if hasattr(survey_req_obj, 'survey_req_done'): 
+                            survey_req_obj.survey_req_done(cr, uid, context.get('active_ids', []), context=context)
 
                     if sur_rec.send_response:
                         survey_data = survey_obj.browse(cr, uid, survey_id)
                         response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
                         report = self.create_report(cr, uid, [survey_id], 'report.survey.browse.response', survey_data.title,context)
                         attachments = {}
-                        pdf_filename = addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf"
+                        pdf_filename = get_module_resource('survey', 'report') + survey_data.title + ".pdf"
                         if os.path.exists(pdf_filename):
                             file = open(pdf_filename)
                             file_data = ""
@@ -423,7 +425,7 @@ class survey_question_wiz(osv.osv_memory):
 
                             attachments[survey_data.title + ".pdf"] = file_data
                             file.close()
-                            os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
+                            os.remove(get_module_resource('survey', 'report') + survey_data.title + ".pdf")
                         context.update({'response_id':response_id})
                         user_email = user_obj.browse(cr, uid, uid, context).email
                         resp_email = survey_data.responsible_id and survey_data.responsible_id.email or False
@@ -465,7 +467,7 @@ class survey_question_wiz(osv.osv_memory):
         try:
             uid = 1
             result, format = openerp.report.render_report(cr, uid, res_ids, report_name[len('report.'):], {}, context)
-            ret_file_name = addons.get_module_resource('survey', 'report') + file_name + '.pdf'
+            ret_file_name = get_module_resource('survey', 'report') + file_name + '.pdf'
             fp = open(ret_file_name, 'wb+');
             fp.write(result);
             fp.close();
@@ -609,10 +611,10 @@ class survey_question_wiz(osv.osv_memory):
             survey_obj.write(cr, uid, survey_id,  {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
             if context.has_key('cur_id'):
                 if context.has_key('request') and context.get('request',False):
-                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
-                    self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
+                    self.pool[context.get('object')].write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
+                    self.pool[context.get('object')].survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
-                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})        
+                    self.pool[context.get('object')].write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})        
         if sur_name_read['store_ans'] and type(safe_eval(sur_name_read['store_ans'])) == dict:
             sur_name_read['store_ans'] = safe_eval(sur_name_read['store_ans'])
             for key,val in sur_name_read['store_ans'].items():
@@ -1252,6 +1254,5 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-survey_question_wiz()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index a37a4e4f7ca..1b461761bb5 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -55,6 +55,5 @@ class survey_browse_answer(osv.osv_memory):
             'context' : context
          }
 
-survey_browse_answer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index 9f0b21affa6..f0e39f99cb9 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -63,6 +63,5 @@ class survey_print(osv.osv_memory):
             'report_name': 'survey.form',
             'datas': datas,
         }
-survey_print()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index 0cadd6bf832..417d1bb732f 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -68,6 +68,5 @@ class survey_print_answer(osv.osv_memory):
             'datas': datas,
         }
 
-survey_print_answer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index f2e25eb8d53..d005dbee31a 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -45,6 +45,5 @@ class survey_print_statistics(osv.osv_memory):
             'datas': datas,
         }
 
-survey_print_statistics()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 5d96d0246f9..44d3bec7f6e 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -26,7 +26,8 @@ import os
 import datetime
 import socket
 
-from openerp import addons, tools
+from openerp import tools
+from openerp.modules.module import get_module_resource
 from openerp.osv import fields, osv
 import openerp.report
 from openerp.tools.translate import _
@@ -85,7 +86,7 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
         if not report_name or not res_ids:
             return (False, Exception('Report name and Resources ids are required !!!'))
         try:
-            ret_file_name = addons.get_module_resource('survey', 'report') + file_name + '.pdf'
+            ret_file_name = get_module_resource('survey', 'report') + file_name + '.pdf'
             result, format = openerp.report.render_report(cr, uid, res_ids, report_name[len('report.'):], {}, {})
             fp = open(ret_file_name, 'wb+');
             fp.write(result);
@@ -128,7 +129,7 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
                 new_user.append(use.id)
         for id in survey_ref.browse(cr, uid, survey_ids):
             report = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title)
-            file = open(addons.get_module_resource('survey', 'report') + id.title +".pdf")
+            file = open(get_module_resource('survey', 'report') + id.title +".pdf")
             file_data = ""
             while 1:
                 line = file.readline()
@@ -137,7 +138,7 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
                     break
             file.close()
             attachments[id.title +".pdf"] = file_data
-            os.remove(addons.get_module_resource('survey', 'report') + id.title +".pdf")
+            os.remove(get_module_resource('survey', 'report') + id.title +".pdf")
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
             if not partner.email:
@@ -190,7 +191,8 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
                                 'action_id': act_id[0],
                                 'survey_id': [[6, 0, survey_ids]]
                                }
-                    user = user_ref.create(cr, uid, res_data)
+                    create_ctx = dict(context, no_reset_password=True)
+                    user = user_ref.create(cr, uid, res_data, context=create_ctx)
                     if user not in new_user:
                         new_user.append(user)
                     created+= "- %s (Login: %s,  Password: %s)\n" % (partner.name or _('Unknown'),\
@@ -220,7 +222,6 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
             'target': 'new',
             'context': context
         }
-survey_send_invitation()
 
 class survey_send_invitation_log(osv.osv_memory):
     _name = 'survey.send.invitation.log'
@@ -235,6 +236,5 @@ class survey_send_invitation_log(osv.osv_memory):
         data['note'] = context.get('note', '')
         return data
 
-survey_send_invitation_log()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/warning/i18n/th.po b/addons/warning/i18n/th.po
new file mode 100644
index 00000000000..24ae791caae
--- /dev/null
+++ b/addons/warning/i18n/th.po
@@ -0,0 +1,215 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-05-15 07:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16626)\n"
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order_line
+#: field:product.product,purchase_line_warn:0
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking_in
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: warning
+#: field:product.product,purchase_line_warn_msg:0
+msgid "Message for Purchase Order Line"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Purchasing this Product"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+#: view:res.partner:0
+msgid "Warnings"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Blocking Message"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Invoice"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "No Message"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_account_invoice
+#: field:res.partner,invoice_warn:0
+msgid "Invoice"
+msgstr ""
+
+#. module: warning
+#: view:product.product:0
+msgid "Warning when Selling this Product"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_purchase_order
+#: field:res.partner,purchase_warn:0
+msgid "Purchase Order"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,purchase_warn_msg:0
+msgid "Message for Purchase Order"
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:32
+#: help:product.product,purchase_line_warn:0
+#: help:product.product,sale_line_warn:0
+#: help:res.partner,invoice_warn:0
+#: help:res.partner,picking_warn:0
+#: help:res.partner,purchase_warn:0
+#: help:res.partner,sale_warn:0
+#, python-format
+msgid ""
+"Selecting the \"Warning\" option will notify user with the message, "
+"Selecting \"Blocking Message\" will throw an exception with the message and "
+"block the flow. The Message has to be written in the next field."
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:130
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
+#, python-format
+msgid "Alert for %s !"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Picking"
+msgstr ""
+
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Purchase Order"
+msgstr ""
+
+#. module: warning
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
+#, python-format
+msgid "Warning for %s"
+msgstr ""
+
+#. module: warning
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
+msgstr ""
+
+#. module: warning
+#: selection:product.product,purchase_line_warn:0
+#: selection:product.product,sale_line_warn:0
+#: selection:res.partner,invoice_warn:0
+#: selection:res.partner,picking_warn:0
+#: selection:res.partner,purchase_warn:0
+#: selection:res.partner,sale_warn:0
+msgid "Warning"
+msgstr ""
+
+#. module: warning
+#: field:res.partner,picking_warn_msg:0
+msgid "Message for Stock Picking"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: warning
+#: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
+msgid "Sales Order Line"
+msgstr ""
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 4bdada396bc..8e1168e5d35 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -50,7 +50,6 @@ class res_partner(osv.osv):
          'invoice_warn' : 'no-message',
     }
 
-res_partner()
 
 
 class sale_order(osv.osv):
@@ -64,7 +63,7 @@ class sale_order(osv.osv):
         partner = self.pool.get('res.partner').browse(cr, uid, part, context=context)
         if partner.sale_warn != 'no-message':
             if partner.sale_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.sale_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.sale_warn_msg)
             title =  _("Warning for %s") % partner.name
             message = partner.sale_warn_msg
             warning = {
@@ -79,7 +78,6 @@ class sale_order(osv.osv):
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
 
         return {'value': result.get('value',{}), 'warning':warning}
-sale_order()
 
 
 class purchase_order(osv.osv):
@@ -93,7 +91,7 @@ class purchase_order(osv.osv):
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.purchase_warn != 'no-message':
             if partner.purchase_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.purchase_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.purchase_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.purchase_warn_msg
             warning = {
@@ -108,7 +106,6 @@ class purchase_order(osv.osv):
 
         return {'value': result.get('value',{}), 'warning':warning}
 
-purchase_order()
 
 
 class account_invoice(osv.osv):
@@ -127,7 +124,7 @@ class account_invoice(osv.osv):
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
         if partner.invoice_warn != 'no-message':
             if partner.invoice_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.invoice_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.invoice_warn_msg)
 
             title = _("Warning for %s") % partner.name
             message = partner.invoice_warn_msg
@@ -145,7 +142,6 @@ class account_invoice(osv.osv):
 
         return {'value': result.get('value',{}), 'warning':warning}
 
-account_invoice()
 
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
@@ -159,7 +155,7 @@ class stock_picking(osv.osv):
         message = False
         if partner.picking_warn != 'no-message':
             if partner.picking_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.picking_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.picking_warn_msg
             warning = {
@@ -173,7 +169,6 @@ class stock_picking(osv.osv):
 
         return {'value': result.get('value',{}), 'warning':warning}
 
-stock_picking()
 
 # FIXME:(class stock_picking_in and stock_picking_out) this is a temporary workaround because of a framework bug (ref: lp:996816). 
 # It should be removed as soon as the bug is fixed
@@ -189,7 +184,7 @@ class stock_picking_in(osv.osv):
         message = False
         if partner.picking_warn != 'no-message':
             if partner.picking_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.picking_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.picking_warn_msg
             warning = {
@@ -215,7 +210,7 @@ class stock_picking_out(osv.osv):
         message = False
         if partner.picking_warn != 'no-message':
             if partner.picking_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.picking_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.picking_warn_msg
             warning = {
@@ -243,7 +238,6 @@ class product_product(osv.osv):
          'purchase_line_warn' : 'no-message',
     }
 
-product_product()
 
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
@@ -263,7 +257,7 @@ class sale_order_line(osv.osv):
 
         if product_info.sale_line_warn != 'no-message':
             if product_info.sale_line_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (product_info.name), product_info.sale_line_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (product_info.name), product_info.sale_line_warn_msg)
             title = _("Warning for %s") % product_info.name
             message = product_info.sale_line_warn_msg
             warning['title'] = title
@@ -279,7 +273,6 @@ class sale_order_line(osv.osv):
 
         return {'value': result.get('value',{}), 'warning':warning}
 
-sale_order_line()
 
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
@@ -296,7 +289,7 @@ class purchase_order_line(osv.osv):
 
         if product_info.purchase_line_warn != 'no-message':
             if product_info.purchase_line_warn == 'block':
-                raise osv.except_osv(_('Alert for %s !') % (product_info.name), product_info.purchase_line_warn_msg)
+                raise osv.except_osv(_('Alert for %s!') % (product_info.name), product_info.purchase_line_warn_msg)
             title = _("Warning for %s") % product_info.name
             message = product_info.purchase_line_warn_msg
             warning['title'] = title
@@ -311,7 +304,6 @@ class purchase_order_line(osv.osv):
 
         return {'value': result.get('value',{}), 'warning':warning}
 
-purchase_order_line()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/i18n/lt.po b/addons/web_shortcuts/i18n/lt.po
new file mode 100644
index 00000000000..70fc0a04b6c
--- /dev/null
+++ b/addons/web_shortcuts/i18n/lt.po
@@ -0,0 +1,25 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-04-24 18:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Pridėti / pašalinti trumpinį..."
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
index 8424e146d06..5d4e34f53b9 100644
--- a/addons/web_shortcuts/static/src/css/web_shortcuts.css
+++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css
@@ -54,4 +54,7 @@
     border-left: none;
     padding-left: 0;
 }
-
+.oe_systray_shortcuts_items > li > a:hover {
+    overflow:visible;
+    white-space: normal;
+}
\ No newline at end of file