diff --git a/addons/.bzrignore b/addons/.bzrignore
index 8d98f9debde..8c348710117 100644
--- a/addons/.bzrignore
+++ b/addons/.bzrignore
@@ -1 +1,2 @@
 .*
+**/node_modules
diff --git a/addons/account/account.py b/addons/account/account.py
index d65c5d62c0a..33b52b643ed 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -648,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
 
@@ -719,7 +719,7 @@ class account_journal(osv.osv):
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
-        'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
+        'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
         'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
 
@@ -1015,14 +1015,14 @@ class account_period(osv.osv):
         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
@@ -2317,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,
@@ -2329,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,
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index 44411cd637a..acb0e640a7a 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -65,12 +65,11 @@ class bank(osv.osv):
                 # Find the code and parent of the bank account to create
                 dig = 6
                 current_num = 1
-                ids = obj_acc.search(cr, uid, [('type','=','liquidity'), ('company_id', '=', bank.company_id.id)], context=context)
+                ids = obj_acc.search(cr, uid, [('type','=','liquidity'), ('company_id', '=', bank.company_id.id), ('parent_id', '!=', False)], context=context)
                 # No liquidity account exists, no template available
                 if not ids: continue
 
-                ref_acc_bank_temp = obj_acc.browse(cr, uid, ids[0], context=context)
-                ref_acc_bank = ref_acc_bank_temp.parent_id
+                ref_acc_bank = obj_acc.browse(cr, uid, ids[0], context=context).parent_id
                 while True:
                     new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
                     ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', bank.company_id.id)])
@@ -82,7 +81,7 @@ class bank(osv.osv):
                     'name': name,
                     'code': new_code,
                     'type': 'liquidity',
-                    'user_type': ref_acc_bank_temp.user_type.id,
+                    'user_type': ref_acc_bank.user_type.id,
                     'reconcile': False,
                     'parent_id': ref_acc_bank.id,
                     'company_id': bank.company_id.id,
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 023765d73f0..8a15321b9c6 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -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)
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 40f0ca80738..8e3e250d41c 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -252,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}
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 0c49bed2fb5..bf1da5cb71b 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -51,9 +51,12 @@ class account_invoice(osv.osv):
         company_id = context.get('company_id', user.company_id.id)
         type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
         journal_obj = self.pool.get('account.journal')
-        res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
-                                            ('company_id', '=', company_id)],
-                                                limit=1)
+        domain = [('company_id', '=', company_id)]
+        if isinstance(type_inv, list):
+            domain.append(('type', 'in', [type2journal.get(type) for type in type_inv if type2journal.get(type)]))
+        else:
+            domain.append(('type', '=', type2journal.get(type_inv, 'sale')))
+        res = journal_obj.search(cr, uid, domain, limit=1)
         return res and res[0] or False
 
     def _get_currency(self, cr, uid, context=None):
@@ -69,7 +72,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):
@@ -218,8 +221,8 @@ class account_invoice(osv.osv):
         'type': {
         },
         'state': {
-            'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'paid' and obj['type'] in ('out_invoice', 'out_refund'),
-            'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open' and obj['type'] in ('out_invoice', 'out_refund'),
+            'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj.state == 'paid' and obj.type in ('out_invoice', 'out_refund'),
+            'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj.state == 'open' and obj.type in ('out_invoice', 'out_refund'),
         },
     }
     _columns = {
@@ -558,10 +561,14 @@ class account_invoice(osv.osv):
 
     def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
         res = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         if not date_invoice:
             date_invoice = time.strftime('%Y-%m-%d')
         if not payment_term_id:
-            return {'value':{'date_due': date_invoice}} #To make sure the invoice has a due date when no payment term
+            inv = self.browse(cr, uid, ids[0])
+            #To make sure the invoice due date should contain due date which is entered by user when there is no payment term defined
+            return {'value':{'date_due': inv.date_due and inv.date_due or date_invoice}}
         pterm_list = self.pool.get('account.payment.term').compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
         if pterm_list:
             pterm_list = [line[0] for line in pterm_list]
@@ -578,6 +585,10 @@ class account_invoice(osv.osv):
         return {'value': {}}
 
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id, context=None):
+        #TODO: add the missing context parameter when forward-porting in trunk so we can remove
+        #      this hack!
+        context = self.pool['res.users'].context_get(cr, uid)
+
         val = {}
         dom = {}
         obj_journal = self.pool.get('account.journal')
@@ -630,18 +641,17 @@ 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:
-            if type in ('out_invoice'):
-                journal_type = 'sale'
-            elif type in ('out_refund'):
-                journal_type = 'sale_refund'
-            elif type in ('in_refund'):
-                journal_type = 'purchase_refund'
-            else:
-                journal_type = 'purchase'
+            journal_mapping = {
+               'out_invoice': 'sale',
+               'out_refund': 'sale_refund',
+               'in_refund': 'purchase_refund',
+               'in_invoice': 'purchase',
+            }
+            journal_type = journal_mapping[type]
             journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
             if journal_ids:
                 val['journal_id'] = journal_ids[0]
@@ -651,7 +661,12 @@ class account_invoice(osv.osv):
                 if r[1] == 'journal_id' and r[2] in journal_ids:
                     val['journal_id'] = r[2]
             if not val.get('journal_id', False):
-                raise osv.except_osv(_('Configuration Error!'), (_('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Journals\Journals.') % (journal_type)))
+                journal_type_map = dict(obj_journal._columns['type'].selection)
+                journal_type_label = self.pool['ir.translation']._get_source(cr, uid, None, ('code','selection'),
+                                                                             context.get('lang'),
+                                                                             journal_type_map.get(journal_type))
+                raise osv.except_osv(_('Configuration Error!'),
+                                     _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Journals\Journals.') % ('"%s"' % journal_type_label))
             dom = {'journal_id':  [('id', 'in', journal_ids)]}
         else:
             journal_ids = obj_journal.search(cr, uid, [])
@@ -786,7 +801,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'],
@@ -912,7 +927,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
 
@@ -933,7 +948,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
@@ -968,7 +983,7 @@ class account_invoice(osv.osv):
             total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml, context=ctx)
             acc_id = inv.account_id.id
 
-            name = inv['name'] or '/'
+            name = inv['name'] or inv['supplier_invoice_number'] or '/'
             totlines = False
             if inv.payment_term:
                 totlines = payment_term_obj.compute(cr,
@@ -1167,12 +1182,12 @@ class account_invoice(osv.osv):
         if not ids:
             return []
         types = {
-                'out_invoice': 'Invoice ',
-                'in_invoice': 'Sup. Invoice ',
-                'out_refund': 'Refund ',
-                'in_refund': 'Supplier Refund ',
+                'out_invoice': _('Invoice'),
+                'in_invoice': _('Supplier Invoice'),
+                'out_refund': _('Refund'),
+                'in_refund': _('Supplier Refund'),
                 }
-        return [(r['id'], (r['number']) or types[r['type']] + (r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
+        return [(r['id'], '%s %s' % (r['number'] or types[r['type']], r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
@@ -1475,7 +1490,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':[]}}
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index d6c25364784..7f5fa9707c1 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
@@ -800,7 +800,7 @@ class account_move_line(osv.osv):
         r_id = move_rec_obj.create(cr, uid, {
             'type': type,
             'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
-        })
+        }, context=context)
         move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
         return True
 
@@ -1066,12 +1066,12 @@ class account_move_line(osv.osv):
 
         for line in self.browse(cr, uid, ids, context=context):
             ctx = context.copy()
-            if ('journal_id' not in ctx):
+            if not ctx.get('journal_id'):
                 if line.move_id:
                    ctx['journal_id'] = line.move_id.journal_id.id
                 else:
                     ctx['journal_id'] = line.journal_id.id
-            if ('period_id' not in ctx):
+            if not ctx.get('period_id'):
                 if line.move_id:
                     ctx['period_id'] = line.move_id.period_id.id
                 else:
@@ -1101,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 ''),
@@ -1181,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)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e921e639642..91c6d6608fd 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -585,7 +585,10 @@
                                     <field name="date"/>
                                     <field name="name"/>
                                     <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="['|',('parent_id','=',False),('is_company','=',True)]"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[
+                                        '&amp;',
+                                            '|',('parent_id','=',False),('is_company','=',True),
+                                            '|',('customer','=',True),('supplier','=',True)]"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
                                     <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
@@ -609,6 +612,13 @@
                             </field>
                         </page>
                     </notebook>
+                    <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
+                        <div class="oe_subtotal_footer_separator oe_inline">
+                            <label for="balance_end" />
+                        </div>
+                        <field name="balance_end" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
+                    </group>
+                    <div class="oe_clear"/>
                 </sheet>
                 </form>
             </field>
diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py
index 91913920bac..2c2a754de3b 100644
--- a/addons/account/edi/invoice.py
+++ b/addons/account/edi/invoice.py
@@ -266,7 +266,7 @@ class account_invoice(osv.osv, EDIMixin):
                 params = {
                     "cmd": "_xclick",
                     "business": inv.company_id.paypal_account,
-                    "item_name": inv.company_id.name + " Invoice " + inv.number,
+                    "item_name": "%s Invoice %s" % (inv.company_id.name, inv.number or ''),
                     "invoice": inv.number,
                     "amount": inv.residual,
                     "currency_code": inv.currency_id.name,
diff --git a/addons/account/i18n/is.po b/addons/account/i18n/is.po
new file mode 100644
index 00000000000..850ced594cc
--- /dev/null
+++ b/addons/account/i18n/is.po
@@ -0,0 +1,10849 @@
+# Icelandic 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-07-10 11:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@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-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.fiscal.position.account:0
+msgid ""
+"An account fiscal position could be defined only once time on same accounts."
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sequence:0
+msgid ""
+"Determine the display order in the report 'Accounting \\ Reporting \\ "
+"Generic Reporting \\ Taxes \\ Taxes Report'"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma/Open/Paid Invoices"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:369
+#, python-format
+msgid "Journal item \"%s\" is not valid."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#: code:addons/account/account_move_line.py:1210
+#, python-format
+msgid "Bad Account!"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"Error!\n"
+"You cannot create recursive account templates."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: view:account.automatic.reconcile:0
+#: field:account.move.line,reconcile_id:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
+#, python-format
+msgid "Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,name:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+#: xsl:account.transfer:0
+#: field:cash.box.in,ref:0
+msgid "Reference"
+msgstr "Tilvísun"
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1058
+#: code:addons/account/account_invoice.py:820
+#: code:addons/account/account_invoice.py:823
+#: code:addons/account/account_invoice.py:826
+#: code:addons/account/account_invoice.py:1545
+#: code:addons/account/account_move_line.py:98
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#: code:addons/account/account_move_line.py:864
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning!"
+msgstr "Aðvörun!"
+
+#. module: account
+#: code:addons/account/account.py:3197
+#, python-format
+msgid "Miscellaneous Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid ""
+"You have to set the 'End  of Year Entries Journal' for this Fiscal Year "
+"which is set after generating opening entries from 'Generate Opening "
+"Entries'."
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a fiscal period.\n"
+"              </p><p>\n"
+"                An accounting period typically is a month or a quarter. It\n"
+"                usually corresponds to the periods of the tax declaration.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,label_filter:0
+msgid "Column Label"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,code_digits:0
+msgid "No. of digits to use for account code"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When it needs for a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_analytic_collected_id:0
+msgid ""
+"Set the analytic account that will be used by default on the invoice tax "
+"lines for invoices. Leave empty if you don't want to use an analytic account "
+"on the invoice tax lines by default."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_income_view1
+msgid "Income View"
+msgstr ""
+
+#. module: account
+#: help:account.account,user_type:0
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening "
+"entries."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_sequence_next:0
+msgid "Next credit note number"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_voucher:0
+msgid ""
+"This includes all the basic requirements of voucher entries for bank, cash, "
+"sales, purchase, expense, contra, etc.\n"
+"                This installs the module account_voucher."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
+msgid "Manual Recurring"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a customer refund. \n"
+"              </p><p>\n"
+"                A refund is a document that credits an invoice completely "
+"or\n"
+"                partially.\n"
+"              </p><p>\n"
+"                Instead of manually creating a customer refund, you\n"
+"                can generate it directly from the related customer invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_budget:0
+msgid "Budget management"
+msgstr ""
+
+#. module: account
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,style_overwrite:0
+msgid ""
+"You can set up here the format you want this record to be displayed. If you "
+"leave the automatic formatting, it will be computed based on the financial "
+"reports hierarchy (auto-computed field 'level')."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_multi_currency:0
+msgid "Allow multi currencies"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:77
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#, python-format
+msgid "You must select accounts to reconcile."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_analytic_accounting:0
+msgid "Allows you to use the analytic accounting."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_asset:0
+msgid ""
+"This allows you to manage the assets owned by a company or a person.\n"
+"                It keeps track of the depreciation occurred on those assets, "
+"and creates account move for those depreciation lines.\n"
+"                This installs the module account_asset. If you do not check "
+"this box, you will be able to do invoicing & payments,\n"
+"                but not accounting (Journal Items, Chart of Accounts, ...)"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
+#, python-format
+msgid "Period :"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,chart_template_id:0
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,tax_calculation_rounding_method:0
+msgid ""
+"If you select 'Round per line' : for each tax, the tax amount will first be "
+"computed and rounded for each PO/SO/invoice line and then these rounded "
+"amounts will be summed, leading to the total amount for that tax. If you "
+"select 'Round globally': for each tax, the tax amount will be computed for "
+"each PO/SO/invoice line, then these amounts will be summed and eventually "
+"this total tax amount will be rounded. If you sell with tax included, you "
+"should choose 'Round per line' because you certainly want the sum of your "
+"tax-included line subtotals to be equal to the total amount with taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Available Coins"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,enable_filter:0
+msgid "Enable Comparison"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,journal_id:0
+#: view:account.invoice:0
+#: field:account.invoice,journal_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,journal_id:0
+#: view:account.journal:0
+#: field:account.journal.cashbox.line,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: field:validate.account.move,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence of this line when displaying the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,chart_account_id:0
+#: help:account.balance.report,chart_account_id:0
+#: help:account.central.journal,chart_account_id:0
+#: help:account.common.account.report,chart_account_id:0
+#: help:account.common.journal.report,chart_account_id:0
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: help:account.general.journal,chart_account_id:0
+#: help:account.partner.balance,chart_account_id:0
+#: help:account.partner.ledger,chart_account_id:0
+#: help:account.print.journal,chart_account_id:0
+#: help:account.report.general.ledger,chart_account_id:0
+#: help:account.vat.declaration,chart_account_id:0
+#: help:accounting.report,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
+#, python-format
+msgid "Nothing to reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,decimal_precision:0
+msgid "Decimal precision on journal entries"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,period:0
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_report_id:0
+#: selection:account.financial.report,type:0
+msgid "Report Value"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#, python-format
+msgid ""
+"Specified journal does not have any account move entries in draft state for "
+"this period."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly."
+msgstr ""
+
+#. module: account
+#: field:account.journal,profit_account_id:0
+msgid "Profit Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1156
+#, python-format
+msgid "No period found or more than one period found for the given date."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3201
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1591
+#, python-format
+msgid "Cannot create move with currency different from .."
+msgstr ""
+
+#. module: account
+#: model:email.template,report_name:account.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+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
+msgid ""
+"Set the analytic account that will be used by default on the invoice tax "
+"lines for refunds. Leave empty if you don't want to use an analytic account "
+"on the invoice tax lines by default."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:297
+#: code:addons/account/report/account_partner_ledger.py:272
+#, python-format
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Configure your company bank accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1361
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:111
+#, python-format
+msgid ""
+"Cannot %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only refund this invoice."
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children with hierarchy"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/project/wizard/project_account_analytic_line.py:47
+#: model:ir.model,name:account.model_project_account_analytic_line
+#, python-format
+msgid "Analytic Entries by line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Method"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report
+msgid "Financial Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.financial.report,type:0
+#: field:account.invoice,type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,type:0
+#: view:account.journal:0
+#: field:account.journal,type:0
+#: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:826
+#, python-format
+msgid ""
+"Taxes are missing!\n"
+"Click on compute button."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Supplier Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:851
+#, python-format
+msgid "Entry is already reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Send by Email"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+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
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Account Code and Name"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_manual_reconcile
+msgid ""
+"<p>\n"
+"                    No journal items found.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1677
+#, python-format
+msgid ""
+"You cannot unreconcile journal items if they has been generated by the       "
+"                                                  opening/closing fiscal "
+"year process."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: field:account.journal.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_chart
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_journal_id:0
+msgid "Purchase journal"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,supplier_invoice_number:0
+msgid "The reference of this invoice as provided by the supplier."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_liability
+#: model:account.financial.report,name:account.account_financial_report_liability0
+#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:899
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is a tax code account, this field will contain the taxed "
+"amount.If the tax account is base tax code, this field will contain the "
+"basic amount(without tax)."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Features"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_bank_statement.py:424
+#: code:addons/account/account_invoice.py:77
+#: code:addons/account/account_invoice.py:775
+#: code:addons/account/account_move_line.py:195
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add an account.\n"
+"              </p><p>\n"
+"                When doing multi-currency transactions, you may loose or "
+"gain\n"
+"                some amount due to changes of exchange rate. This menu "
+"gives\n"
+"                you a forecast of the Gain or Loss you'd realized if those\n"
+"                transactions were ended today. Only for accounts having a\n"
+"                secondary currency set.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr ""
+
+#. module: account
+#: field:account.journal,with_last_closing_balance:0
+msgid "Opening With Last Closing Balance"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+msgid ""
+"Check this box if you don't want any tax related to this tax code to appear "
+"on invoices"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contains more "
+"information about the account and its specificities."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Refund "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
+#: model:ir.ui.menu,name:account.journal_cash_move_lines
+msgid "Cash Registers"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_journal_id:0
+msgid "Sale refund journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cash log.\n"
+"              </p><p>\n"
+"                A Cash Register allows you to manage cash entries in your "
+"cash\n"
+"                journals. This feature provides an easy way to follow up "
+"cash\n"
+"                payments on a daily basis. You can enter the coins that are "
+"in\n"
+"                your cash box, and then post entries when money comes in or\n"
+"                goes out of the cash box.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_bank
+#: selection:account.bank.accounts.wizard,account_type:0
+#: code:addons/account/account.py:3092
+#, python-format
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Refunds"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: help:account.account,foreign_balance:0
+msgid ""
+"Total amount (in Secondary currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_dest_id:0
+#: field:account.fiscal.position.tax.template,tax_dest_id:0
+msgid "Replacement Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"The amount expressed in the secondary currency must be positif when journal "
+"item are debit and negatif when journal item are credit."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.journal,code:0
+msgid "The code will be displayed on reports."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: view:account.tax.code:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.config.settings,chart_template_id:0
+msgid "Template"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Draft Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.action_account_entries_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
+msgid "Entries Analysis"
+msgstr ""
+
+#. module: account
+#: field:account.account,level:0
+#: field:account.financial.report,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
+#, python-format
+msgid "You can only change currency for Draft Invoice."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_financial_report.py:70
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
+msgid "Profit and Loss"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_reconcile_select
+#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
+msgid "Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to Close"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_sequence_prefix:0
+msgid "Invoice sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the status will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' "
+"status."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:612
+#: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1483
+#, python-format
+msgid ""
+"There is no default debit account defined \n"
+"on journal \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:10
+#, python-format
+msgid ""
+"There is nothing to reconcile. All invoices and payments\n"
+"                    have been reconciled, your partner balance is clean."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,code_digits:0
+#: field:account.config.settings,code_digits:0
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_report_common.py:164
+#, python-format
+msgid "Not implemented."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Credit Note"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "eInvoicing & Payments"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: help:account.fiscal.position,active:0
+msgid ""
+"By unchecking the active field, you may hide a fiscal position without "
+"deleting it."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
+msgid "Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,company_footer:0
+msgid "Bank accounts footer preview"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Advanced Settings"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unposted Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new account type.\n"
+"              </p><p>\n"
+"                An account type is used to determine how an account is used "
+"in\n"
+"                each journal. The deferral method of an account type "
+"determines\n"
+"                the process for the annual closing. Reports such as the "
+"Balance\n"
+"                Sheet and the Profit and Loss report use the category\n"
+"                (profit/loss or balance sheet).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: code:addons/account/account_invoice.py:1157
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.move,balance:0
+msgid "balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_analytic_accounting:0
+msgid "Analytic accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: help:res.company,tax_calculation_rounding_method:0
+msgid ""
+"If you select 'Round per Line' : for each tax, the tax amount will first be "
+"computed and rounded for each PO/SO/invoice line and then these rounded "
+"amounts will be summed, leading to the total amount for that tax. If you "
+"select 'Round Globally': for each tax, the tax amount will be computed for "
+"each PO/SO/invoice line, then these amounts will be summed and eventually "
+"this total tax amount will be rounded. If you sell with tax included, you "
+"should choose 'Round per line' because you certainly want the sum of your "
+"tax-included line subtotals to be equal to the total amount with taxes."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+#: view:report.account_type.sales:0
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
+#, python-format
+msgid ""
+"The journal must have centralized counterpart without the Skipping draft "
+"state option checked."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:854
+#, python-format
+msgid "Some entries are already reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"Select a configuration package to setup automatically your\n"
+"                        taxes and chart of accounts."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Cancel Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_payment:0
+msgid "Manage payment orders"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Duration"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,last_closing_balance:0
+msgid "Last Closing Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the tax declaration."
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_check_writing:0
+msgid "Pay your suppliers by check"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_ids:0
+#: field:account.invoice,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a tax declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"useful because it enables you to preview at any time the tax that you owe at "
+"the start and end of the month or quarter."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1071
+#: code:addons/account/account.py:1073
+#: code:addons/account/account.py:1116
+#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1356
+#: code:addons/account/account.py:1363
+#: code:addons/account/account.py:1587
+#: code:addons/account/account.py:1591
+#: code:addons/account/account.py:1677
+#: code:addons/account/account.py:2358
+#: code:addons/account/account.py:2678
+#: code:addons/account/account.py:3465
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
+#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:419
+#: code:addons/account/account_cash_statement.py:256
+#: code:addons/account/account_cash_statement.py:300
+#: code:addons/account/account_invoice.py:899
+#: code:addons/account/account_invoice.py:933
+#: code:addons/account/account_invoice.py:1124
+#: code:addons/account/account_move_line.py:579
+#: code:addons/account/account_move_line.py:828
+#: code:addons/account/account_move_line.py:851
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/account_move_line.py:1121
+#: code:addons/account/account_move_line.py:1156
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_invoice_refund.py:109
+#: code:addons/account/wizard/account_invoice_refund.py:111
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
+#: code:addons/account/wizard/account_use_model.py:44
+#: code:addons/account/wizard/pos_box.py:31
+#: code:addons/account/wizard/pos_box.py:35
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to record a new supplier invoice.\n"
+"              </p><p>\n"
+"                You can control the invoice from your supplier according to\n"
+"                what you purchased or received. OpenERP can also generate\n"
+"                draft invoices automatically from purchase orders or "
+"receipts.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1058
+#, python-format
+msgid ""
+"This journal already contains items for this period, therefore you cannot "
+"modify its company field."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a bank statement.\n"
+"              </p><p>\n"
+"                A bank statement is a summary of all financial transactions\n"
+"                occurring over a given period of time on a bank account. "
+"You\n"
+"                should receive this periodicaly from your bank.\n"
+"              </p><p>\n"
+"                OpenERP allows you to reconcile a statement line directly "
+"with\n"
+"                the related sale or puchase invoices.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,currency_id:0
+msgid "Default company currency"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+#: field:account.move.line,move_id:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: view:account.treasury.report:0
+#: model:ir.actions.act_window,name:account.action_account_treasury_report_all
+#: model:ir.model,name:account.model_account_treasury_report
+#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
+msgid "Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.invoice.tax,account_analytic_id:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:406
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_follower_ids:0
+#: field:account.invoice,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:656
+#, python-format
+msgid ""
+"You cannot change the type of account to '%s' type as it contains journal "
+"items!"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscal Year"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
+#, python-format
+msgid "Journal :"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.fiscal.position.tax:0
+msgid "A tax fiscal position could be defined only once time on same taxes."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.actions.act_window,name:account.action_account_config
+msgid "Configure Accounting"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: account
+#: help:account.journal,allow_date:0
+msgid ""
+"If set to True then do not accept the entry if the entry date is not into "
+"the period dates"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
+#, python-format
+msgid "Good job!"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_asset:0
+msgid "Assets management"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:274
+#, python-format
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a sale journal."
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Italic Text (smaller)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,cash_control:0
+msgid ""
+"If you want the journal should be control at opening/closing, check this "
+"option"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: field:account.treasury.report,fiscalyear_id:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_sequence_next:0
+msgid "Next supplier credit note number"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:256
+#, python-format
+msgid "You do not have rights to open this %s journal !"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_supplier_inv_check_total
+msgid "Check Total on supplier invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Account Templates"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,default_sale_tax:0
+msgid "This sale tax will be assigned by default on new products."
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: report:account.central.journal:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
+#: view:account.config.settings:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: field:account.general.journal,fiscalyear_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.open.closed.fiscalyear,fyear_id:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id_cmp:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,fiscalyear_id:0
+#: help:account.balance.report,fiscalyear_id:0
+#: help:account.central.journal,fiscalyear_id:0
+#: help:account.common.account.report,fiscalyear_id:0
+#: help:account.common.journal.report,fiscalyear_id:0
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: help:account.general.journal,fiscalyear_id:0
+#: help:account.partner.balance,fiscalyear_id:0
+#: help:account.partner.ledger,fiscalyear_id:0
+#: help:account.print.journal,fiscalyear_id:0
+#: help:account.report.general.ledger,fiscalyear_id:0
+#: help:account.vat.declaration,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id_cmp:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:653
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type as it "
+"contains journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,account_line_id:0
+msgid "Account Line"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account Based on this Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:933
+#, python-format
+msgid ""
+"Cannot create the invoice.\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. In order to avoid rounding "
+"issues, the latest line of your payment term must be of type 'balance'."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:478
+#, python-format
+msgid ""
+"In order to delete a bank statement, you must first cancel it to delete "
+"related journal items."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+msgid "Payment Term"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:579
+#, python-format
+msgid "You cannot create journal items on a closed account %s %s."
+msgstr ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Draft state of an invoice"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Account Properties"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin. Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_advance
+#: model:account.payment.term,note:account.account_payment_term_advance
+msgid "30% Advance End 30 Days"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Unreconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3202
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a journal entry.\n"
+"              </p><p>\n"
+"                A journal entry consists of several journal items, each of\n"
+"                which is either a debit or a credit transaction.\n"
+"              </p><p>\n"
+"                OpenERP automatically creates one journal entry per "
+"accounting\n"
+"                document: invoice, refund, supplier payment, bank "
+"statements,\n"
+"                etc. So, you should record journal entries manually "
+"only/mainly\n"
+"                for miscellaneous operations.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile (writeoff)"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.conf_account_type_tax
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.move.line,account_tax_id:0
+#: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,default_purchase_tax:0
+#: field:account.config.settings,purchase_tax:0
+msgid "Default purchase tax"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.financial.report,account_ids:0
+#: selection:account.financial.report,type:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3541
+#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_invoice.py:507
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:624
+#: code:addons/account/account_invoice.py:632
+#: code:addons/account/account_invoice.py:657
+#: code:addons/account/account_move_line.py:536
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:434
+#, python-format
+msgid "Statement %s confirmed, journal items were created."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,price_average:0
+#: field:account.invoice.report,user_currency_price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:res.partner.bank:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Purchase Tax"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or a tax code account."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to start a new fiscal year.\n"
+"              </p><p>\n"
+"                Define your company's financial year according to your "
+"needs. A\n"
+"                financial year is a period at the end of which a company's\n"
+"                accounts are made up (usually 12 months). The financial year "
+"is\n"
+"                usually referred to by the date in which it ends. For "
+"example,\n"
+"                if a company's financial year ends November 30, 2011, then\n"
+"                everything between December 1, 2010 and November 30, 2011\n"
+"                would be referred to as FY 2011.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:accounting.report:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,parent_id:0
+msgid "Parent Chart Template"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_unread:0
+#: field:account.invoice,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:44
+#, python-format
+msgid ""
+"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1071
+#, python-format
+msgid "You should choose the periods that belong to the same company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+msgid "Sales by Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You cannot delete a posted journal entry \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Accounting Period"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_journal_id:0
+msgid "Sale journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_invoice.py:775
+#: code:addons/account/account_move_line.py:195
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:781
+#, python-format
+msgid ""
+"This journal already contains items, therefore you cannot modify its company "
+"field."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:409
+#, python-format
+msgid ""
+"You need an Opening journal with centralisation checked to set the initial "
+"balance."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Unrealized Gains and losses"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,debit_credit:0
+msgid "Display Debit/Credit Columns"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,only_one_chart_template:0
+msgid "Only One Chart Template Available"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_summary:0
+#: field:account.invoice,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,date_stop:0
+msgid "End date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can choose "
+"between the creation date or the creation date of the entries plus the "
+"partner payment terms."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_report_pl
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:823
+#, python-format
+msgid ""
+"Tax base different!\n"
+"Click on compute to update the tax base."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:431
+#, python-format
+msgid "Unable to adapt the initial balance (negative value)."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: view:account.installer:0
+msgid "Date Range"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,account_report_id:0
+#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
+msgid "Account Reports"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
+msgid "Sale/Purchase Journals"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2678
+#, python-format
+msgid "There is no parent code for the template account."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,code_digits:0
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_accountant:0
+msgid ""
+"Full accounting features: journals, legal statements, chart of accounts, etc."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+#: selection:account.financial.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3460
+#: code:addons/account/account_bank.py:94
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_chart_of_accounts:0
+msgid "Company has a chart of accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: model:email.template,body_html:account.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: #FFF; \">\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"
+"    % 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: account
+#: view:account.period:0
+msgid "Account Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+#: help:account.bank.accounts.wizard,currency_id:0
+msgid "Forces all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+msgid ""
+"This wizard will validate all journal entries of a particular journal and "
+"period. Once journal entries are validated, you can not update them anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_chart_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
+msgid "Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,journal_ids:0
+#: field:account.analytic.cost.ledger.journal.report,journal:0
+#: field:account.balance.report,journal_ids:0
+#: field:account.central.journal,journal_ids:0
+#: field:account.common.account.report,journal_ids:0
+#: field:account.common.journal.report,journal_ids:0
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.journal.period:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,journal_ids:0
+#: field:account.partner.ledger,journal_ids:0
+#: view:account.print.journal:0
+#: field:account.print.journal,journal_ids:0
+#: field:account.report.general.ledger,journal_ids:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,journal_ids:0
+#: field:accounting.report,journal_ids:0
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_account_print_journal
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
+#: model:ir.ui.menu,name:account.menu_journals_report
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.config.settings:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_vat_declaration
+msgid "Account Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1016
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralized journal. Uncheck the "
+"centralized counterpart box in the related journal from the configuration "
+"menu."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+#: field:account.treasury.report,starting_balance:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1465
+#, python-format
+msgid "No Partner Defined !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_close
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.cashbox.line,subtotal_opening:0
+msgid "Opening Subtotal"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You cannot create journal items with a secondary currency without recording "
+"both 'currency' and 'amount currency' field."
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,display_detail:0
+msgid "Display details"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,paypal_account:0
+msgid ""
+"Paypal account (email) for receiving online payments (credit card, etc.) If "
+"you set a paypal account, the customer  will be able to pay your invoices or "
+"quotations with a button \"Pay with  Paypal\" in automated emails or through "
+"the OpenERP portal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:536
+#, python-format
+msgid ""
+"Cannot find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Journals/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,date_start:0
+msgid "Start date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"You will be able to edit and validate this\n"
+"                                    credit note directly or keep it draft,\n"
+"                                    waiting for the document to be issued "
+"by\n"
+"                                    your supplier/customer."
+msgstr ""
+
+#. module: account
+#: view:validate.account.move.lines:0
+msgid ""
+"All selected journal entries will be validated and posted. It means you "
+"won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:98
+#, python-format
+msgid ""
+"You have not supplied enough arguments to compute the initial balance, "
+"please select a period and a journal in the context."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,expects_chart_of_accounts:0
+msgid "This company has its own chart of accounts"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: view:cash.box.out:0
+#: model:ir.actions.act_window,name:account.action_cash_box_out
+msgid "Take Money Out"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a customer invoice.\n"
+"              </p><p>\n"
+"                OpenERP's electronic invoicing allows to ease and fasten "
+"the\n"
+"                collection of customer payments. Your customer receives the\n"
+"                invoice by email and he can pay online and/or import it\n"
+"                in his own system.\n"
+"              </p><p>\n"
+"                The discussions with your customer are automatically "
+"displayed at\n"
+"                the bottom of each invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Options"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period Length (days)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1363
+#, python-format
+msgid ""
+"You cannot modify a posted entry of this journal.\n"
+"First you should set the journal to allow cancelling entries."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
+msgid "Print Sale/Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Continue"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:930
+#, python-format
+msgid ""
+"There is no fiscal year defined for this date.\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
+#, python-format
+msgid "The entries to reconcile should belong to the same company."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unreconciled Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,default_purchase_tax:0
+msgid "This purchase tax will be assigned by default on new products."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: view:account.config.settings:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_cashbox_line
+msgid "account.journal.cashbox.line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.line:0
+#: selection:account.balance.report,filter:0
+#: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice.refund,date:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,date:0
+#: field:account.move.line.reconcile.writeoff,date_p:0
+#: report:account.overdue:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.print.journal,sort_selection:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.report.general.ledger,sortby:0
+#: field:account.subscription.line,date:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: field:analytic.entries.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Post"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2358
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: selection:account.general.journal,filter:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:res.groups,name:account.group_proforma_invoices
+msgid "Pro-forma Invoices"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_check_supplier_invoice_total:0
+msgid "Check the total of supplier invoices"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The status is 'Draft'. At the end of "
+"monthly period it is in 'Done' status."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries cannot be found."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Items"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,complete_tax_set:0
+msgid "Complete set of taxes"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.chart.template,name:0
+#: field:account.model.line,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:115
+#, python-format
+msgid "No unconfigured company !"
+msgstr ""
+
+#. module: account
+#: field:res.company,expects_chart_of_accounts:0
+msgid "Expects a Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_tree
+#: model:ir.ui.menu,name:account.menu_action_bank_tree
+msgid "Setup your Bank Accounts"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_ids:0
+#: help:account.invoice,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.aged.trial.balance:0
+#: constraint:account.balance.report:0
+#: constraint:account.central.journal:0
+#: constraint:account.common.account.report:0
+#: constraint:account.common.journal.report:0
+#: constraint:account.common.partner.report:0
+#: constraint:account.common.report:0
+#: constraint:account.general.journal:0
+#: constraint:account.partner.balance:0
+#: constraint:account.partner.ledger:0
+#: constraint:account.print.journal:0
+#: constraint:account.report.general.ledger:0
+#: constraint:account.vat.declaration:0
+#: constraint:accounting.report:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+
+#. module: account
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any tax related to this tax Code to appear "
+"on invoices."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#, python-format
+msgid "You cannot use an inactive account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_account_config
+#: model:ir.ui.menu,name:account.menu_board_account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current year"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:573
+#: code:addons/account/wizard/account_invoice_refund.py:146
+#, python-format
+msgid "Insufficient Data!"
+msgstr ""
+
+#. module: account
+#: help:account.account,unrealized_gain_loss:0
+msgid ""
+"Value of Loss or Gain due to changes in exchange rate when doing multi-"
+"currency transactions."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"entries of all fiscal years. Note that you should define it with default "
+"debit/credit accounts, of type 'situation' and with a centralized "
+"counterpart."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Accounting & Finance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_analytic_collected_id:0
+msgid "Invoice Tax Analytic Account"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid ""
+"If you put \"%(year)s\" in the prefix, it will be replaced by the current "
+"year."
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Posted Journal Items"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,decimal_precision:0
+msgid ""
+"As an example, a decimal precision of 2 will allow journal entries  like: "
+"9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
+"0.0231 EUR."
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.account.type,name:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: selection:account.financial.report,type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:424
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to setup a new bank account. \n"
+"          </p><p>\n"
+"            Configure your company's bank account and select those that "
+"must\n"
+"            appear on the report footer.\n"
+"          </p><p>\n"
+"            If you use the accounting application of OpenERP, journals and\n"
+"            accounts will be created automatically based on these data.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid ""
+"Error!\n"
+"You cannot create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Error!\n"
+"The duration of the Period(s) is/are invalid."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:668
+#, python-format
+msgid "You cannot change the code of account which contains journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_sequence_prefix:0
+msgid "Supplier invoice sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:610
+#: code:addons/account/account_invoice.py:625
+#, python-format
+msgid ""
+"Cannot find a chart of account, you should create one from Settings\\"
+"Configuration\\Accounting menu."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product Unit of Measure"
+msgstr ""
+
+#. module: account
+#: field:res.company,paypal_account:0
+msgid "Paypal Account"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Reverse balance sign"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:191
+#, python-format
+msgid "Balance Sheet (Liability account)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.cashbox.line,subtotal_closing:0
+msgid "Closing Subtotal"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:864
+#, python-format
+msgid ""
+"You have to provide an account for the write off/exchange difference entry."
+msgstr ""
+
+#. module: account
+#: help:res.company,paypal_account:0
+msgid "Paypal username (usually email) for receiving online payments."
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:68
+#, python-format
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,opening_reconciliation:0
+msgid "Opening Entries Reconciliation"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
+#, python-format
+msgid "Last Reconciliation:"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,state:0
+msgid "Balanced"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:115
+#, python-format
+msgid ""
+"There is currently no company without chart of account. The wizard will "
+"therefore not be executed."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Set Your Accounting Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Main Title 1 (bold, underlined)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.account,exchange_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:122
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+#: view:account.chart.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,visible:0
+msgid "Can be Visible?"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+msgid "Journal Items to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.period:0
+msgid "The name of the period must be unique per company!"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,currency_id:0
+msgid "Currency as per company's country."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Computation"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,visible:0
+msgid ""
+"Set this to False if you don't want this template to be used actively in the "
+"wizard that generate Chart of Accounts from templates, this is useful when "
+"you want to generate accounts of this template only when loading its child "
+"template."
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account,reconcile:0
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Error!\n"
+"You cannot create an account which has parent account of different company."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:658
+#, python-format
+msgid ""
+"Cannot find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Journals\\Journals."
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3204
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+msgid "Recurring Models"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Children/Sub Taxes"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: view:cash.box.out:0
+msgid "Describe why you take money from the cash register:"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_proforma_invoices:0
+msgid "Allows you to put invoices in pro-forma state."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Unit Of Currency Definition"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column on report if the currency differs from the "
+"company currency."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3394
+#, python-format
+msgid "Purchase Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.actions.act_window,name:account.action_account_subscription_generate
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "My Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement,state:0
+msgid "New"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Sale Tax"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_code_id:0
+#: field:account.tax.template,ref_tax_code_id:0
+msgid "Refund Tax Code"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+msgid ""
+"When journal period is created. The status is 'Draft'. If a report is "
+"printed it comes to 'Printed' status. When all transactions are done, it "
+"comes in 'Done' status."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3205
+#, python-format
+msgid "MISC"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,expects_chart_of_accounts:0
+msgid "Check this box if this company is a legal entity."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.conf_account_type_chk
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.config.settings:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.period.close:0
+#: view:account.state.open:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:cash.box.in:0
+#: view:cash.box.out:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "or"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Posted Journal Entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Supplier Refund, otherwise a "
+"Partner bank account number."
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_collected_id:0
+msgid ""
+"Set the account that will be set by default on invoice tax lines for "
+"invoices. Leave empty to use the expense account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:890
+#, python-format
+msgid "Opening Period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Journal Entries to Review"
+msgstr ""
+
+#. module: account
+#: selection:res.company,tax_calculation_rounding_method:0
+msgid "Round Globally"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:922
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The encoded total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.fiscal.position,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.journal,cash_control:0
+msgid "Cash Control"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date2:0
+#: field:account.analytic.cost.ledger,date2:0
+#: field:account.analytic.cost.ledger.journal.report,date2:0
+#: field:account.analytic.inverted.balance,date2:0
+#: field:account.analytic.journal.report,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:301
+#, python-format
+msgid "There is no %s Account on the journal %s."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_treasury_report_all
+msgid ""
+"From this view, have an analysis of your treasury. It sums the balance of "
+"every accounting entries made on liquidity accounts per period."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_manager
+msgid "Financial Manager"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,details_ids:0
+#: view:account.journal:0
+msgid "CashBox Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_vat_declaration
+msgid "Account Vat Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_accountant:0
+msgid ""
+"If you do not check this box, you will be able to do invoicing & payments, "
+"but not accounting (Journal Items, Chart of  Accounts, ...)"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.treasury.report,date:0
+msgid "Beginning of Period Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move:0
+#: field:account.balance.report,target_move:0
+#: report:account.central.journal:0
+#: field:account.central.journal,target_move:0
+#: field:account.chart,target_move:0
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.tax.chart,target_move:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,target_move:0
+#: field:accounting.report,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1454
+#, python-format
+msgid ""
+"Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: help:account.cashbox.line,number_opening:0
+msgid "Opening Unit Numbers"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sale and purchase rates or choose from list of taxes. This last "
+"choice assumes that the set of tax defined on this template is complete"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: field:account.financial.report,children_ids:0
+#: model:ir.model,name:account.model_account_financial_report
+msgid "Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: view:report.account.sales:0
+#: field:report.account.sales,name:0
+#: view:report.account_type.sales:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,sent:0
+msgid "It indicates that the invoice has been sent."
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1185
+#, python-format
+msgid ""
+"Cannot create an automatic sequence for this piece.\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Pro Forma Invoice "
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
+#: model:ir.ui.menu,name:account.menu_account_report_bs
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:188
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date in Period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_move_line_form
+msgid "Entries"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:508
+#, python-format
+msgid ""
+"Cannot find a chart of accounts for this company, you should create one."
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.config.settings:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+#: field:cash.box.in,amount:0
+#: field:cash.box.out,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_summary:0
+#: help:account.invoice,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: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were fully reconciled last "
+"time. It differs from the date of the last reconciliation 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 ways: either the last debit/credit "
+"entry was reconciled, either the user pressed the button \"Fully "
+"Reconciled\" in the manual reconciliation process"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:44
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Cash and Banks"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Recompute taxes and total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1116
+#, python-format
+msgid "You cannot modify/delete a journal with entries for this period."
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,supplier_invoice_number:0
+msgid "Supplier Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "You can not add/modify entries in a closed period %s of journal %s."
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,date1:0
+#: field:account.analytic.cost.ledger,date1:0
+#: field:account.analytic.cost.ledger.journal.report,date1:0
+#: field:account.analytic.inverted.balance,date1:0
+#: field:account.analytic.journal.report,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset_view1
+msgid "Asset View"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+msgid ""
+"Select here the kind of valuation related to this payment term line. Note "
+"that you should have your last line with the type 'Balance' to ensure that "
+"the whole amount will be treated."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include Initial Balances"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Tax Codes"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Refund "
+msgstr ""
+
+#. module: account
+#: view:cash.box.in:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,value_amount:0
+msgid "Amount To Pay"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+msgid ""
+"This is the remaining partners for who you should check if there is "
+"something to reconcile or not. This figure already count the current partner "
+"as reconciled."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+#: model:ir.actions.act_window,name:account.action_account_change_currency
+#: model:ir.model,name:account.model_account_change_currency
+msgid "Change Currency"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,opening_details_ids:0
+msgid "Opening Cashbox Lines"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer Invoices And Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+#: field:account.entries.report,amount_currency:0
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: selection:res.company,tax_calculation_rounding_method:0
+msgid "Round per Line"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Normal Text"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,power:0
+msgid ""
+"Number of partial amounts that can be combined to find a balance point can "
+"be chosen as the power of the automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#, python-format
+msgid "You must set a period length greater than 0."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Refund"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Automatic formatting"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "You cannot change the tax, you should remove and recreate lines."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Opening Entries"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due Date Computation"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal.report,analytic_account_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journals"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1117
+#, python-format
+msgid "Move name (id): %s (%s)"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:879
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_income
+#: model:account.financial.report,name:account.account_financial_report_income0
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.config.settings:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:390
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:95
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:276
+#, python-format
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Select Company"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_state_open
+#: model:ir.model,name:account.model_account_state_open
+msgid "Account State Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add an account.\n"
+"              </p><p>\n"
+"                An account is part of a ledger allowing your company\n"
+"                to register all kinds of debit and credit transactions.\n"
+"                Companies present their annual accounts in two main parts: "
+"the\n"
+"                balance sheet and the income statement (profit and loss\n"
+"                account). The annual accounts of a company are required by "
+"law\n"
+"                to disclose a certain amount of information.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(update)"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.common.account.report,filter:0
+#: field:account.common.journal.report,filter:0
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.vat.declaration,filter:0
+#: field:accounting.report,filter:0
+#: field:accounting.report,filter_cmp:0
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2334
+#, python-format
+msgid "You have a wrong expression \"%(...)s\" in your model !"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes Included Prices"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Balance as calculated based on Starting Balance and transaction lines"
+msgstr ""
+
+#. module: account
+#: field:account.journal,loss_account_id:0
+msgid "Loss Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_general_journal
+#: model:ir.model,name:account.model_account_general_journal
+msgid "Account General Journal"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entries are usually in the status "
+"'Unposted', but you can set the option to skip that status on the related "
+"journal. In that case, they will behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' status."
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1357
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.account,foreign_balance:0
+msgid "Foreign Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,group_multi_currency:0
+msgid "Allows you multi currency environment"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Running Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_analytic_entries_report
+#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
+msgid "Analytic Entries Analysis"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,journal_id:0
+msgid ""
+"This journal will be created automatically for this bank account when you "
+"save the record"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Models"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1124
+#, python-format
+msgid ""
+"You cannot cancel an invoice which is partially paid. You need to "
+"unreconcile related payment entries first."
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax_rate:0
+msgid "Sales Tax(%)"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a refund you received from a supplier.\n"
+"              </p><p>\n"
+"                Instead of creating the supplier refund manually, you can "
+"generate\n"
+"                refunds and reconcile them directly from the related "
+"supplier invoice.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,complete_tax_set:0
+#: help:wizard.multi.charts.accounts,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sales and purchase rates or use the usual m2o fields. This last "
+"choice assumes that the set of tax defined for the chosen template is "
+"complete"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Open and Paid Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children flat"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Bank & Cash"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: field:account.chart,fiscalyear:0
+#: view:account.fiscalyear:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.automatic.reconcile:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.config.settings:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+#: view:account.invoice.refund:0
+#: view:account.journal.select:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.period.close:0
+#: view:account.state.open:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:cash.box.in:0
+#: view:cash.box.out:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_receivable
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:633
+#, python-format
+msgid "Invoice line account's company and invoice's compnay does not match."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:69
+#, python-format
+msgid "Custom"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: field:account.journal,cashbox_line_ids:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+#: model:account.account.type,name:account.conf_account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: field:account.journal,internal_account_id:0
+msgid "Internal Transfers Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/pos_box.py:32
+#, python-format
+msgid "Please check that the field 'Journal' is set on the Bank Statement"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,tax_calculation_rounding_method:0
+msgid "Round globally"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3465
+#, python-format
+msgid "Cannot generate an unused journal code."
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,difference:0
+msgid "Difference"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"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 ""
+
+#. module: account
+#: code:addons/account/account.py:414
+#, python-format
+msgid ""
+"There is no opening/closing period defined, please create one to set the "
+"initial balance."
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1453
+#: code:addons/account/account.py:1482
+#: code:addons/account/account.py:1489
+#: code:addons/account/account_invoice.py:1015
+#: code:addons/account/account_move_line.py:1005
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Discard"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Journal Items"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_default_company:0
+msgid "Has default company"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid ""
+"This wizard will generate the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year: "
+"it will simply replace the old opening entries with the new ones."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:686
+#, python-format
+msgid ""
+"You cannot change the owner company of an account that already contains "
+"journal items."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1160
+#: selection:report.invoice.created,type:0
+#, python-format
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.financial.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1024
+#, python-format
+msgid ""
+"There is no period defined for this date: %s.\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.invoice.line,uos_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: field:account.installer,has_default_company:0
+msgid "Has Default Company"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2%."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.tax:0
+msgid "Tax Name must be unique per company!"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+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 ""
+
+#. module: account
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: field:account.fiscal.position.template,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:142
+#: code:addons/account/account_move_line.py:955
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,currency_id:0
+msgid "Currency of the related account journal."
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You cannot provide a secondary currency if it is the same than the company "
+"one."
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:190
+#, python-format
+msgid "Balance Sheet (Asset account)"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current period"
+msgstr ""
+
+#. module: account
+#: help:account.journal,update_posted:0
+msgid ""
+"Check this box if you want to allow the cancellation the entries related to "
+"this journal or of the invoice related to this journal"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:189
+#, python-format
+msgid "Profit & Loss (Expense account)"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Total Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:636
+#, python-format
+msgid "You cannot remove an account that contains journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1105
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,style_overwrite:0
+msgid "Financial Report Style"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Preserve balance sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+#: model:ir.ui.menu,name:account.menu_account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "You must set a start date."
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"If you selected to filter by date or period, this field allow you to add a "
+"row to display the amount of debit/credit/balance that precedes the filter "
+"you've set."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Journal Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:147
+#, python-format
+msgid "No period found on the invoice."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
+#: code:addons/account/report/common_report_header.py:67
+#, python-format
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.reconcile:0
+msgid "You can only reconcile journal items with the same partner."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
+#, python-format
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+msgstr ""
+
+#. module: account
+#: help:account.move,to_check:0
+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
+#: field:account.chart.template,complete_tax_set:0
+#: field:wizard.multi.charts.accounts,complete_tax_set:0
+msgid "Complete Set of Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2304
+#, python-format
+msgid ""
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s: To Specify Year \n"
+"%(month)s: To Specify Month \n"
+"%(date)s: Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_voucher:0
+msgid "Manage customer payments"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid ""
+"Error!\n"
+"The start date of a fiscal year must precede its end date."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Sales"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Misc"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1319
+#, python-format
+msgid ""
+"You cannot validate a non-balanced entry.\n"
+"Make sure you have configured payment terms properly.\n"
+"The latest payment term line should be of the \"Balance\" type."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error!\n"
+"You cannot define children to an account with internal type different of "
+"\"View\"."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_accounting_report
+msgid "Accounting Report"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account Currency"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:458
+#, python-format
+msgid ""
+"You can not delete an invoice which is not cancelled. You should refund it "
+"instead."
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
+msgid "Financial Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_opening:0
+msgid "Opening Entries Expense Account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,closing_details_ids:0
+msgid "Closing Cashbox Lines"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Posted entries"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_tax_rate:0
+msgid "Purchase tax (%)"
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_account_charts_modules
+msgid "Chart Templates"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_opening:0
+msgid "Opening Entries Income Account"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,group_proforma_invoices:0
+msgid "Allow pro-forma invoices"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_cash_box_out
+msgid "cash.box.out"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,currency_id:0
+msgid "Main currency of the company."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reports
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/account_move_line.py:780
+#: code:addons/account/static/src/js/account_move_reconciliation.js:90
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_analytic_open
+msgid "Contracts/Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:res.partner.bank,journal_id:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,tax_calculation_rounding_method:0
+msgid "Tax calculation rounding method"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Use this option if you want to cancel an invoice you should not\n"
+"                                    have issued. The credit note will be "
+"created, validated and reconciled\n"
+"                                    with the invoice. You will not be able "
+"to modify the credit note."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"This field shows you the next partner that will be automatically chosen by "
+"the system to go through the reconciliation process, based on the latest day "
+"it have been reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1490
+#, python-format
+msgid ""
+"There is no default credit account defined \n"
+"on journal \"%s\"."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"<p>\n"
+"                Click to add a new analytic account.\n"
+"              </p><p>\n"
+"                The normal chart of accounts has a structure defined by the\n"
+"                legal requirement of the country. The analytic chart of\n"
+"                accounts structure should reflect your own business needs "
+"in\n"
+"                term of costs/revenues reporting.\n"
+"              </p><p>\n"
+"                They are usually structured by contracts, projects, products "
+"or\n"
+"                departements. Most of the OpenERP operations (invoices,\n"
+"                timesheets, expenses, etc) generate analytic entries on the\n"
+"                related account.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_view
+msgid "Root/View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3206
+#, python-format
+msgid "OPEJ"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_email_templates
+#: model:ir.ui.menu,name:account.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_multi_currency
+msgid "Multi-Currencies"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3193
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1185
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
+msgid "Account Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,chart_template_id:0
+msgid ""
+"This optional field allow you to link an account template to a specific "
+"chart template that may differ from the one its root parent belongs to. This "
+"allow you to define chart templates that extend another and complete it with "
+"few new accounts (You don't need to define the whole structure that is "
+"common to both several times)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Unposted Journal Entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for credit note and period will "
+"be chosen accordingly!"
+msgstr ""
+
+#. module: account
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3541
+#, python-format
+msgid ""
+"You have to set a code for the bank account defined on the selected chart of "
+"accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1541
+#, python-format
+msgid "Currency Adjustment"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"This field is used to generate legal reports: profit and loss, balance sheet."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:820
+#, python-format
+msgid "Global taxes defined, but they are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones."
+msgstr ""
+
+#. module: account
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_refund_sequence_prefix:0
+msgid "Credit note sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.config.settings:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:388
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.entries.report,type:0
+#: selection:account.journal,type:0
+#: code:addons/account/account.py:3092
+#, python-format
+msgid "Cash"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.financial.report,sequence:0
+#: field:account.invoice.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.code,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,paypal_account:0
+msgid "Paypal account"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Journal Entry Number"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Parent Report"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid ""
+"Error!\n"
+"You cannot create recursive accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_cash_box_in
+msgid "cash.box.in"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,period:0
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end:0
+msgid "Computed Balance"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_move_reconciliation.js:89
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: field:account.financial.report,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "Profit"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation Transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: field:account.installer,charts:0
+msgid "Accounting Package"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+#: model:ir.ui.menu,name:account.menu_account_partner_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
+#: code:addons/account/account.py:1031
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,message_unread:0
+#: help:account.invoice,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account
+#: field:res.company,tax_calculation_rounding_method:0
+msgid "Tax Calculation Rounding Method"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open for Unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:901
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:382
+#, python-format
+msgid ""
+"The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:420
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this box if this account allows reconciliation of journal items."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: help:account.move.reconcile,opening_reconciliation:0
+msgid ""
+"Is this reconciliation produced by the opening of a new fiscal year ?."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1465
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,residual:0
+#: field:account.invoice.report,user_currency_residual:0
+msgid "Total Residual"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Cash Control"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Invoice's state is Open"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "No Fiscal Year Defined for This Company"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3196
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1333
+#, python-format
+msgid "Please define a sequence on the journal."
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by Invoice Date"
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_followup:0
+msgid ""
+"This allows to automate letters for unpaid invoices, with multi-level "
+"recalls.\n"
+"                This installs the module account_followup."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: field:account.treasury.report,period_id:0
+#: field:validate.account.move,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: help:account.account,adjusted_balance:0
+msgid ""
+"Total amount (in Company currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:158
+#, python-format
+msgid "Select a starting and an ending period."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_sequence_next:0
+msgid "Next invoice number"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,adjusted_balance:0
+msgid "Adjusted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid ""
+"This wizard will remove the end of year journal entries of selected fiscal "
+"year. Note that you can run this wizard many times for the same fiscal year."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: view:account.config.settings:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+#: field:accounting.report,chart_account_id:0
+msgid "Chart of Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation Result"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_end_real:0
+#: field:account.treasury.report,ending_balance:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Use this option if you want to cancel an invoice and create a new\n"
+"                                    one. The credit note will be created, "
+"validated and reconciled\n"
+"                                    with the current invoice. A new, draft, "
+"invoice will be created \n"
+"                                    so that you can edit it."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:381
+#, python-format
+msgid "Unknown Error!"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Apply"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_type_ids:0
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1210
+#, python-format
+msgid ""
+"You cannot use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a journal.\n"
+"              </p><p>\n"
+"                A journal is used to record transactions of all accounting "
+"data\n"
+"                related to the day-to-day business.\n"
+"              </p><p>\n"
+"                A typical company may use one journal per payment method "
+"(cash,\n"
+"                bank accounts, checks), one purchase journal, one sale "
+"journal\n"
+"                and one for miscellaneous information.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid ""
+"In order to close a period, you must first post related journal entries."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3391
+#, python-format
+msgid "Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3194
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in the company currency."
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,debit_credit:0
+msgid ""
+"This option allows you to get more details about the way your balances are "
+"computed. Because it is space consuming, we do not allow to use it while "
+"doing a comparison."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid "This account will be used to value outgoing stock using cost price."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+#: view:account.common.report:0
+#: view:account.invoice:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure?"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,sale_tax_rate:0
+msgid "Sales tax (%)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new recurring entry.\n"
+"              </p><p>\n"
+"                A recurring entry occurs on a recurrent basis from a "
+"specific\n"
+"                date, i.e. corresponding to the signature of a contract or "
+"an\n"
+"                agreement with a customer or a supplier. You can create "
+"such\n"
+"                entries to automate the postings in the system.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:829
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Smallest Text"
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_check_writing:0
+msgid ""
+"This allows you to check writing and printing.\n"
+"                This installs the module account_check_writing."
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_invoice
+msgid "Invoicing & Payments"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_expense
+#: model:account.financial.report,name:account.account_financial_report_expense0
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1006
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+#: field:res.partner.bank,currency_id:0
+#: field:wizard.multi.charts.accounts,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+msgid ""
+"You can select here the journal to use for the credit note that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:2334
+#, python-format
+msgid "Wrong model !"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+#: view:account.tax.template:0
+msgid "Tax Template"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1121
+#, python-format
+msgid ""
+"You cannot do this modification on a reconciled entry. You can just change "
+"some non legal fields or you must unreconcile first.\n"
+"%s."
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,sign:0
+msgid ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,bank_statement_id:0
+#: field:account.entries.report,reconcile_id:0
+#: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+#: code:addons/account/account.py:3198
+#, python-format
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,message_is_follower:0
+#: field:account.invoice,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: field:account.move.line,narration:0
+msgid "Internal Note"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error!\n"
+"You cannot select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,has_fiscal_year:0
+msgid "Company has a fiscal year"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:634
+#, python-format
+msgid "You cannot deactivate an account that contains journal items."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.move.line,amount_residual:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_open_journal_button
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Unit of Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3195
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid ""
+"Once draft invoices are confirmed, you will not be able\n"
+"                        to modify them. The invoices will receive a unique\n"
+"                        number and journal items will be created in your "
+"chart\n"
+"                        of accounts."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_journal_id:0
+msgid "Purchase refund journal"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Configure Accounting Data"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:901
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/pos_box.py:36
+#, python-format
+msgid ""
+"Please check that the field 'Internal Transfers Account' is set on the "
+"payment method '%s'."
+msgstr ""
+
+#. module: account
+#: field:account.vat.declaration,display_detail:0
+msgid "Display Detail"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3203
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:analytic.entries.report:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' status is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma status,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' status is used when user create invoice,a invoice number is "
+"generated.Its in open status till user does not pay invoice.             \n"
+"* The 'Paid' status is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled.             \n"
+"* The 'Cancelled' status is used when user cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,financial_report_ids:0
+#: field:account.account.template,financial_report_ids:0
+#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
+#: model:ir.actions.act_window,name:account.action_account_report
+#: model:ir.ui.menu,name:account.menu_account_reports
+msgid "Financial Reports"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability_view1
+msgid "Liability View"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_from:0
+#: field:accounting.report,period_from:0
+#: field:accounting.report,period_from_cmp:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Ask Refund"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,purchase_refund_sequence_prefix:0
+msgid "Supplier credit note sequence"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_payment:0
+msgid ""
+"This allows you to create and manage your payment orders, with purposes to\n"
+"                    * serve as base for an easy plug-in of various automated "
+"payment mechanisms, and\n"
+"                    * provide a more efficient way to manage invoice "
+"payments.\n"
+"                This installs the module account_payment."
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries."
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: report:account.account.balance:0
+#: selection:account.account.type,close_method:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,balance:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.invoice,residual:0
+#: field:account.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,balance:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
+msgid "Display Account"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_payable
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Filters By"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number_closing:0
+#: field:account.cashbox.line,number_opening:0
+msgid "Number of Units"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:478
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Date / Period"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Error!\n"
+"The period is invalid. Either some periods are overlapping or the period's "
+"dates are not matching the scope of the fiscal year."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "There is nothing due with this customer."
+msgstr ""
+
+#. module: account
+#: help:account.tax,account_paid_id:0
+msgid ""
+"Set the account that will be set by default on invoice tax lines for "
+"refunds. Leave empty to use the expense account."
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Source"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the information related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,sent:0
+msgid "Sent"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,default_sale_tax:0
+#: field:account.config.settings,sale_tax:0
+msgid "Default sale tax"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1587
+#, python-format
+msgid "Cannot create moves for different companies."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment entries"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: report:account.general.journal:0
+#: field:account.general.journal,period_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,period_to:0
+#: field:accounting.report,period_to:0
+#: field:accounting.report,period_to_cmp:0
+msgid "End Period"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense_view1
+msgid "Expense View"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1502
+#, python-format
+msgid " Centralisation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from:0
+#: field:account.balance.report,date_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_from:0
+#: field:account.common.account.report,date_from:0
+#: field:account.common.journal.report,date_from:0
+#: field:account.common.partner.report,date_from:0
+#: field:account.common.report,date_from:0
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_start:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.subscription,date_start:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_from:0
+#: field:accounting.report,date_from:0
+#: field:accounting.report,date_from_cmp:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: view:cash.box.in:0
+#: model:ir.actions.act_window,name:account.action_cash_box_in
+msgid "Put Money In"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:922
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure your Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:68
+#, python-format
+msgid ""
+"Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_items
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_tax_code_items
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: view:accounting.report:0
+msgid "Comparison"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1119
+#, python-format
+msgid ""
+"You cannot do this modification on a confirmed entry. You can just change "
+"some non legal fields or you must unconfirm the journal entry first.\n"
+"%s."
+msgstr ""
+
+#. module: account
+#: help:account.config.settings,module_account_budget:0
+msgid ""
+"This allows accountants to manage analytic and crossovered budgets.\n"
+"                Once the master budgets and the budgets are defined,\n"
+"                the project managers can set the planned amount on each "
+"analytic account.\n"
+"                This installs the module account_budget."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,credit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,credit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Draft Invoice "
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1073
+#, python-format
+msgid "Start period should precede then end period."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+#: field:account.invoice.report,user_currency_price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.central.journal,filter:0
+#: view:account.chart:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: field:account.config.settings,period:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: view:account.print.journal:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter:0
+#: view:accounting.report:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: model:ir.actions.act_window,name:account.action_account_period
+#: model:ir.ui.menu,name:account.menu_action_account_period
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: field:account.account,tax_ids:0
+#: view:account.account.template:0
+#: field:account.account.template,tax_ids:0
+#: view:account.chart.template:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
+msgid "Profit (Loss) to report"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:379
+#, python-format
+msgid "There is no Sale/Purchase Journal(s) defined."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 2 (bold)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+msgid ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.generate,date:0
+msgid "Generate Entries Before"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_to:0
+#: field:account.balance.report,date_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_to:0
+#: field:account.common.account.report,date_to:0
+#: field:account.common.journal.report,date_to:0
+#: field:account.common.partner.report,date_to:0
+#: field:account.common.report,date_to:0
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,date_stop:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_to:0
+#: field:accounting.report,date_to:0
+#: field:accounting.report,date_to_cmp:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
+msgstr ""
+
+#. module: account
+#: field:account.account,unrealized_gain_loss:0
+#: model:ir.actions.act_window,name:account.action_account_gain_loss
+#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
+msgid "Unrealized Gain or Loss"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid "This account will be used to value outgoing stock using sale price."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,check_total:0
+msgid "Verification Total"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: view:account.analytic.line:0
+#: field:account.invoice,amount_total:0
+#: field:report.account.sales,amount_total:0
+#: field:report.account_type.sales,amount_total:0
+#: field:report.invoice.created,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:109
+#, python-format
+msgid "Cannot %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_analytic_paid_id:0
+msgid "Refund Tax Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for Bank Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.balance.report,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,company_id:0
+#: field:account.central.journal,company_id:0
+#: field:account.common.account.report,company_id:0
+#: field:account.common.journal.report,company_id:0
+#: field:account.common.partner.report,company_id:0
+#: field:account.common.report,company_id:0
+#: field:account.config.settings,company_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
+#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.partner.balance,company_id:0
+#: field:account.partner.ledger,company_id:0
+#: field:account.period,company_id:0
+#: field:account.print.journal,company_id:0
+#: field:account.report.general.ledger,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: field:account.treasury.report,company_id:0
+#: field:account.vat.declaration,company_id:0
+#: field:accounting.report,company_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,description:0
+#: field:cash.box.in,name:0
+#: field:cash.box.out,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:56
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+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 ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1056
+#, python-format
+msgid "Unable to change tax!"
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: field:account.chart,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer. The tool search can also be used to personalise your Invoices "
+"reports and so, match this analysis to your needs."
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: field:account.config.settings,module_account_followup:0
+msgid "Manage customer payment follow-ups"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1158
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+#, python-format
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: report:account.account.balance:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,debit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,debit:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 3 (bold, smaller)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:783
+#, python-format
+msgid "Already reconciled."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a purchase journal."
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+msgid ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: help:account.move,balance:0
+msgid ""
+"This is a field only used for internal purpose and shouldn't be displayed"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:99
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid ""
+"Import of the statement in the system from a supplier or customer invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.analytic.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by Type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1546
+#, python-format
+msgid ""
+"The selected unit of measure is not compatible with the unit of measure of "
+"the product."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new tax code.\n"
+"              </p><p>\n"
+"                Depending on the country, a tax code is usually a cell to "
+"fill\n"
+"                in your legal tax statement. OpenERP allows you to define "
+"the\n"
+"                tax structure and each tax computation will be registered "
+"in\n"
+"                one or several tax code.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Select the period and the journal you want to fill.\n"
+"              </p><p>\n"
+"                This view can be used by accountants in order to quickly "
+"record\n"
+"                entries in OpenERP. If you want to record a supplier "
+"invoice,\n"
+"                start by recording the line of the expense account. OpenERP\n"
+"                will propose to you automatically the Tax related to this\n"
+"                account and the counterpart \"Account Payable\".\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: view:account.config.settings:0
+msgid "Install more chart templates"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:1159
+#, python-format
+msgid "Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:641
+#, python-format
+msgid ""
+"You cannot remove/deactivate an account which is set on a customer or "
+"supplier."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and accounts used for the partner."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+msgid "As soon as the reconciliation is done, the invoice can be paid."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:573
+#, python-format
+msgid "The payment term of supplier does not have a payment term line."
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/js/account_move_reconciliation.js:74
+#: code:addons/account/static/src/js/account_move_reconciliation.js:80
+#, python-format
+msgid "Never"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:292
+#, python-format
+msgid "Loss"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: help:account.cashbox.line,number_closing:0
+msgid "Closing Unit Numbers"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_central_journal
+#: model:ir.model,name:account.model_account_central_journal
+msgid "Account Central Journal"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
+#. module: account
+#: help:accounting.report,label_filter:0
+msgid ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
+msgstr ""
+
+#. module: account
+#: selection:account.config.settings,tax_calculation_rounding_method:0
+msgid "Round per line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_residual_currency:0
+msgid ""
+"The residual amount on a receivable or payable of a journal entry expressed "
+"in its currency (maybe different of the company currency)."
+msgstr ""
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 17687d26313..c666e4dcf2e 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-06-05 13:02+0000\n"
+"PO-Revision-Date: 2013-07-02 06:32+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-06-06 05:21+0000\n"
-"X-Generator: Launchpad (build 16667)\n"
+"X-Launchpad-Export-Date: 2013-07-03 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -59,7 +59,7 @@ msgid "Residual"
 msgstr "Остаток"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:369
 #, python-format
 msgid "Journal item \"%s\" is not valid."
 msgstr "Недопустимый элемент журнала \"%s\""
@@ -75,9 +75,9 @@ msgid "Import from invoice or payment"
 msgstr "Импорт из счета или платежного поручения"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/account_move_line.py:1146
-#: code:addons/account/account_move_line.py:1213
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid "Bad Account!"
 msgstr "Плохой счет !"
@@ -133,15 +133,15 @@ msgstr ""
 #: code:addons/account/account.py:641
 #: code:addons/account/account.py:686
 #: code:addons/account/account.py:781
-#: code:addons/account/account.py:1049
-#: code:addons/account/account_invoice.py:788
-#: code:addons/account/account_invoice.py:791
-#: code:addons/account/account_invoice.py:794
-#: code:addons/account/account_invoice.py:1514
+#: code:addons/account/account.py:1058
+#: code:addons/account/account_invoice.py:820
+#: code:addons/account/account_invoice.py:823
+#: code:addons/account/account_invoice.py:826
+#: code:addons/account/account_invoice.py:1545
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:774
-#: code:addons/account/account_move_line.py:827
-#: code:addons/account/account_move_line.py:867
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#: code:addons/account/account_move_line.py:864
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -153,7 +153,7 @@ msgid "Warning!"
 msgstr "Предупреждение!"
 
 #. module: account
-#: code:addons/account/account.py:3159
+#: code:addons/account/account.py:3197
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Смешанный журнал"
@@ -257,7 +257,8 @@ msgid ""
 "entries."
 msgstr ""
 "Тип счета используется в информационных целях, при создании официальных "
-"отчетов для конкретной страны, определении правил"
+"отчетов для конкретной страны, определении правил закрытия финансового года "
+"и проводок открытия."
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
@@ -285,7 +286,7 @@ msgstr "Разрешить списание"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Выберите период для проведения анализа"
+msgstr "Выберите период для анализа"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -355,7 +356,7 @@ msgid "Allow multi currencies"
 msgstr "Разрешить мульти-валютность"
 
 #. module: account
-#: code:addons/account/account_invoice.py:74
+#: code:addons/account/account_invoice.py:77
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
 msgstr "Вы должны определить журнал аналитики типа  '%s'!"
@@ -441,6 +442,13 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Позволяет Вам управлять активами, принадлежавшими компании или человеку.\n"
+"               Отслеживание амортизации активов, создание операций по счету "
+"для позиций амортизации.\n"
+"               Устанавливает модуль account_asset. Если вы не установите "
+"этот флажок, вы сможете выставлять \n"
+"               счета и делать платежи, но не будет бухгалтерского учета "
+"(Журналов, Плана счетов, ...)"
 
 #. module: account
 #: help:account.bank.statement.line,name:0
@@ -676,7 +684,7 @@ msgid "Profit Account"
 msgstr "Счет прибыли"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1159
+#: code:addons/account/account_move_line.py:1156
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Для заданной даты период не найден или найдено более одного периода."
@@ -687,13 +695,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Отчет о продажах по типу счета"
 
 #. module: account
-#: code:addons/account/account.py:3163
+#: code:addons/account/account.py:3201
 #, python-format
 msgid "SAJ"
 msgstr "КнП"
 
 #. module: account
-#: code:addons/account/account.py:1553
+#: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "Нельзя сделать движение по валюте отличной от.."
@@ -750,7 +758,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
 #: code:addons/account/report/account_partner_balance.py:297
+#: code:addons/account/report/account_partner_ledger.py:272
 #, python-format
 msgid "Receivable Accounts"
 msgstr "Счета к получению"
@@ -790,7 +800,7 @@ msgid "Are you sure you want to create entries?"
 msgstr "Вы действительно хотите создать проводки?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
+#: code:addons/account/account_invoice.py:1361
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
 msgstr "Счет частично оплачен: %s%s из %s%s (%s%s остаток)."
@@ -859,7 +869,7 @@ msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:794
+#: code:addons/account/account_invoice.py:826
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -884,7 +894,7 @@ msgid "Supplier Invoices And Refunds"
 msgstr "Счета поставщиков и возмещения"
 
 #. module: account
-#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "Проводка уже сверена."
@@ -961,7 +971,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1639
+#: code:addons/account/account.py:1677
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1045,7 +1055,7 @@ msgid "Liability"
 msgstr "Обязательства"
 
 #. module: account
-#: code:addons/account/account_invoice.py:867
+#: code:addons/account/account_invoice.py:899
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Пожалуйста, определите нумерацию в журнале, связанном с этим счетом."
@@ -1119,10 +1129,10 @@ msgid "Features"
 msgstr "Возможности"
 
 #. module: account
-#: code:addons/account/account.py:2308
-#: code:addons/account/account_bank_statement.py:423
-#: code:addons/account/account_invoice.py:74
-#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_bank_statement.py:424
+#: code:addons/account/account_invoice.py:77
+#: code:addons/account/account_invoice.py:775
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1161,7 +1171,7 @@ msgstr "Название счета."
 #. module: account
 #: field:account.journal,with_last_closing_balance:0
 msgid "Opening With Last Closing Balance"
-msgstr ""
+msgstr "Открыть с предыдущим остатком"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -1169,6 +1179,8 @@ msgid ""
 "Check this box if you don't want any tax related to this tax code to appear "
 "on invoices"
 msgstr ""
+"Отметьте, если Вы не хотите, чтобы налог, связанный с этим кодом налога, "
+"появился в счетах"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1248,7 +1260,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3054
+#: code:addons/account/account.py:3092
 #, python-format
 msgid "Bank"
 msgstr "Банковский"
@@ -1558,15 +1570,17 @@ msgid "%s (copy)"
 msgstr "%s (копия)"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
 msgstr "С балансом не равным 0"
 
 #. module: account
-#: code:addons/account/account.py:1445
+#: code:addons/account/account.py:1483
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1608,6 +1622,8 @@ msgid ""
 "There is nothing to reconcile. All invoices and payments\n"
 "                    have been reconciled, your partner balance is clean."
 msgstr ""
+"Все сверено. Все счета и платежи\n"
+"                    были сверены, баланс партнера чист."
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -1792,8 +1808,10 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.move.line,invoice:0
+#: code:addons/account/account_invoice.py:1157
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
+#, python-format
 msgid "Invoice"
 msgstr "Счет"
 
@@ -1868,7 +1886,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "Некоторые записи уже сверены."
@@ -1889,6 +1907,8 @@ msgid ""
 "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
 msgstr ""
+"Выберите конфигурацию установки для настройки автоматически ваших\n"
+"                        налогов и планов счетов."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1898,7 +1918,7 @@ msgstr "Ожидающие счета"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Cancel Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Отмените записи открытия финансового года"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -1939,7 +1959,7 @@ msgstr "Длительность"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,last_closing_balance:0
 msgid "Last Closing Balance"
-msgstr ""
+msgstr "Последнее конечное сальдо"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -2014,6 +2034,12 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Это меню печати налоговой декларации на основе счетов и платежей. Выберите "
+"один или несколько периодов финансового года. Информация, необходимая для "
+"налоговой декларации генерируется автоматически OpenERP из счета (или "
+"платежей, в некоторых странах). Эти данные обновляются в режиме реального "
+"времени. Это очень полезно, потому что позволяет просматривать в любое время "
+"налоги, которые вы должны в начале и в конце месяца или квартала."
 
 #. module: account
 #: code:addons/account/account.py:409
@@ -2022,36 +2048,36 @@ msgstr ""
 #: code:addons/account/account.py:634
 #: code:addons/account/account.py:636
 #: code:addons/account/account.py:930
-#: code:addons/account/account.py:1062
-#: code:addons/account/account.py:1064
-#: code:addons/account/account.py:1103
-#: code:addons/account/account.py:1283
-#: code:addons/account/account.py:1297
-#: code:addons/account/account.py:1320
-#: code:addons/account/account.py:1327
-#: code:addons/account/account.py:1549
-#: code:addons/account/account.py:1553
-#: code:addons/account/account.py:1639
-#: code:addons/account/account.py:2320
-#: code:addons/account/account.py:2640
-#: code:addons/account/account.py:3427
+#: code:addons/account/account.py:1071
+#: code:addons/account/account.py:1073
+#: code:addons/account/account.py:1116
+#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1356
+#: code:addons/account/account.py:1363
+#: code:addons/account/account.py:1587
+#: code:addons/account/account.py:1591
+#: code:addons/account/account.py:1677
+#: code:addons/account/account.py:2358
+#: code:addons/account/account.py:2678
+#: code:addons/account/account.py:3465
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
-#: code:addons/account/account_bank_statement.py:367
-#: code:addons/account/account_bank_statement.py:380
-#: code:addons/account/account_bank_statement.py:418
+#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:419
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:867
-#: code:addons/account/account_invoice.py:901
-#: code:addons/account/account_invoice.py:1091
-#: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_invoice.py:899
+#: code:addons/account/account_invoice.py:933
+#: code:addons/account/account_invoice.py:1124
+#: code:addons/account/account_move_line.py:579
+#: code:addons/account/account_move_line.py:828
+#: code:addons/account/account_move_line.py:851
 #: code:addons/account/account_move_line.py:854
-#: code:addons/account/account_move_line.py:857
-#: code:addons/account/account_move_line.py:1122
-#: code:addons/account/account_move_line.py:1124
-#: code:addons/account/account_move_line.py:1159
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/account_move_line.py:1121
+#: code:addons/account/account_move_line.py:1156
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2065,8 +2091,8 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:158
 #: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
-#: code:addons/account/wizard/pos_box.py:32
-#: code:addons/account/wizard/pos_box.py:36
+#: code:addons/account/wizard/pos_box.py:31
+#: code:addons/account/wizard/pos_box.py:35
 #, python-format
 msgid "Error!"
 msgstr "Ошибка!"
@@ -2089,7 +2115,7 @@ msgstr ""
 "              </p><p>\n"
 "                Вы можете управлять счетом от поставщика в соответствии с\n"
 "                тем, что вы приобрели. OpenERP также может создавать\n"
-"                черновые счета автоматически из заказов на закупку.\n"
+"                черновые счета автоматически из заказов закупки.\n"
 "              </p>\n"
 "            "
 
@@ -2116,12 +2142,14 @@ msgid "period close"
 msgstr "закрытие периода"
 
 #. module: account
-#: code:addons/account/account.py:1049
+#: code:addons/account/account.py:1058
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
 "modify its company field."
 msgstr ""
+"Этот журнал уже содержит элементы за этот период, по этому вы не можете "
+"изменить поле компании ."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
@@ -2188,7 +2216,7 @@ msgid "Analytic account"
 msgstr "Счет аналитики"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_bank_statement.py:406
 #, python-format
 msgid "Please verify that an account is defined in the journal."
 msgstr "Пожалуйста, проверьте, что счет определен в журнале."
@@ -2213,7 +2241,7 @@ msgstr "Счет - печать журнала"
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Категория ТМЦ"
+msgstr "Категория продукции"
 
 #. module: account
 #: code:addons/account/account.py:656
@@ -2221,7 +2249,7 @@ msgstr "Категория ТМЦ"
 msgid ""
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
-msgstr ""
+msgstr "Нельзя изменить тип счета на '%s', так как он содержит записи!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2290,7 +2318,9 @@ msgstr "Управление активами"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:274
 #, python-format
 msgid "Payable Accounts"
 msgstr "Кредиторская задолженность"
@@ -2336,6 +2366,7 @@ msgid ""
 "If you want the journal should be control at opening/closing, check this "
 "option"
 msgstr ""
+"Если вы хотите контролировать открытие/закрытие журнала, отметьте эту опцию"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2427,7 +2458,7 @@ msgstr "У вас нет прав открыть журнал %s !"
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
 msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Проверить итог по счетам поставщиков"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2501,7 +2532,7 @@ msgstr "Cчёт доходов и расходов"
 #. module: account
 #: help:account.config.settings,default_sale_tax:0
 msgid "This sale tax will be assigned by default on new products."
-msgstr ""
+msgstr "Эта налог с продажи будет по умолчанию присвоен новой продукции."
 
 #. module: account
 #: report:account.general.ledger_landscape:0
@@ -2582,7 +2613,7 @@ msgstr "Учетный год"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Keep empty for all open fiscal year"
+msgstr "Оставьте пустым для всех открытых финансовых лет"
 
 #. module: account
 #: code:addons/account/account.py:653
@@ -2591,6 +2622,8 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
 "contains journal items!"
 msgstr ""
+"Вы не можете изменить тип счета «Закрыто» на любой другой тип, поскольку он "
+"содержит элементы журнала !"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
@@ -2603,7 +2636,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Создать счет на основе этого шаблона"
 
 #. module: account
-#: code:addons/account/account_invoice.py:901
+#: code:addons/account/account_invoice.py:933
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2624,7 +2657,7 @@ msgid "Main Sequence"
 msgstr "Основная Последовательность"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_bank_statement.py:478
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2650,7 +2683,7 @@ msgid "Fiscal Positions"
 msgstr "Системы налогообложения"
 
 #. module: account
-#: code:addons/account/account_move_line.py:578
+#: code:addons/account/account_move_line.py:579
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
 msgstr "Нельзя создать элемент журнала по закрытому счету %s %s."
@@ -2758,7 +2791,7 @@ msgid "Account Model Entries"
 msgstr "Проводки модели счета"
 
 #. module: account
-#: code:addons/account/account.py:3164
+#: code:addons/account/account.py:3202
 #, python-format
 msgid "EXJ"
 msgstr "ЖР"
@@ -2874,21 +2907,20 @@ msgid "Accounts"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/account.py:3503
-#: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:378
-#: code:addons/account/account_invoice.py:484
-#: code:addons/account/account_invoice.py:582
-#: code:addons/account/account_invoice.py:597
-#: code:addons/account/account_invoice.py:605
-#: code:addons/account/account_invoice.py:627
-#: code:addons/account/account_move_line.py:535
+#: code:addons/account/account.py:3541
+#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_invoice.py:507
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:624
+#: code:addons/account/account_invoice.py:632
+#: code:addons/account/account_invoice.py:657
+#: code:addons/account/account_move_line.py:536
 #, python-format
 msgid "Configuration Error!"
 msgstr "Ошибка конфигурации!"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:433
+#: code:addons/account/account_bank_statement.py:434
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
 msgstr "Распоряжение %s подтверждено, элементы журнала созданы."
@@ -2913,7 +2945,7 @@ msgstr "Метка"
 #. module: account
 #: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr "Бухгалтерская информация"
+msgstr "Учетная информация"
 
 #. module: account
 #: view:account.tax:0
@@ -3079,9 +3111,11 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"Выбранные счета нельзя подтвердить, так как состояние не \"Черновик\" и не "
+"\"Проформа\""
 
 #. module: account
-#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1071
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "Вы должны выбрать периоды относящиеся к одной компании."
@@ -3094,7 +3128,7 @@ msgid "Sales by Account"
 msgstr "Продажи по бух. счетам"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "Нельзя удалить проведенную проводку журнала \"%s\"."
@@ -3110,8 +3144,8 @@ msgid "Sale journal"
 msgstr "Журнал продаж"
 
 #. module: account
-#: code:addons/account/account.py:2308
-#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_invoice.py:775
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -3196,12 +3230,12 @@ msgstr ""
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Отменить сверку"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "доступен только один шаблон плана счетов"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3280,7 +3314,7 @@ msgid "Fiscal Position"
 msgstr "Система налогообложения"
 
 #. module: account
-#: code:addons/account/account_invoice.py:791
+#: code:addons/account/account_invoice.py:823
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3313,6 +3347,7 @@ msgstr "Оборотно-сальдовая ведомость"
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
 msgstr ""
+"Не в состоянии адаптироваться начальный баланс (отрицательное значение)."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -3380,7 +3415,7 @@ msgstr ""
 "дату. Входящие сделки всегда используют ставку на сегодняшний день."
 
 #. module: account
-#: code:addons/account/account.py:2640
+#: code:addons/account/account.py:2678
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3443,8 +3478,8 @@ msgid "View"
 msgstr "Вид"
 
 #. module: account
-#: code:addons/account/account.py:3422
-#: code:addons/account/account_bank.py:95
+#: code:addons/account/account.py:3460
+#: code:addons/account/account_bank.py:94
 #, python-format
 msgid "BNK"
 msgstr "BNK"
@@ -3572,7 +3607,7 @@ msgstr ""
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Период счета"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3714,7 +3749,7 @@ msgstr ""
 "иметь названия как и у самого документа"
 
 #. module: account
-#: code:addons/account/account_invoice.py:984
+#: code:addons/account/account_invoice.py:1016
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3729,7 +3764,7 @@ msgid "Starting Balance"
 msgstr "Начальный баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1434
+#: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Партнер не определен!"
@@ -3782,7 +3817,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:535
+#: code:addons/account/account_move_line.py:536
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -3948,12 +3983,14 @@ msgid "Period Length (days)"
 msgstr "Длина периода (в днях)"
 
 #. module: account
-#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1363
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Нельзя изменить проводку по этому журналу.\n"
+"Прежде, нужно разрешить отмену проводок в журнале."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -3978,6 +4015,8 @@ msgid ""
 "There is no fiscal year defined for this date.\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Нет финансового года, для этой даты.\n"
+"Пожалуйста, создайте его в меню настройки учета."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4018,9 +4057,13 @@ msgid "VAT :"
 msgstr "НДС:"
 
 #. module: account
+#: report:account.account.balance:0
 #: report:account.central.journal:0
 #: view:account.config.settings:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -4112,7 +4155,7 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон плана счетов"
 
 #. module: account
-#: code:addons/account/account.py:2320
+#: code:addons/account/account.py:2358
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4123,8 +4166,10 @@ msgstr ""
 "условии оплаты контрагента."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -4178,7 +4223,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Проверка итога по счетам поставщиков"
 
 #. module: account
 #: view:account.tax:0
@@ -4192,6 +4237,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"При создании месячных периодов. Статус - \"Черновик\". В конце месячного "
+"периода статус - \"Сделано\"."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4221,7 +4268,7 @@ msgstr "Счета к оплате"
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "Не найдены периоды для создания записей  открытия."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4259,12 +4306,12 @@ msgstr "Открыть счет"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Коэффициент кода налога"
 
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Полный набор налогов"
 
 #. module: account
 #: field:account.account,name:0
@@ -4279,7 +4326,7 @@ msgid "Name"
 msgstr "Название"
 
 #. module: account
-#: code:addons/account/installer.py:94
+#: code:addons/account/installer.py:115
 #, python-format
 msgid "No unconfigured company !"
 msgstr "Нет ненастроенной компании!"
@@ -4287,7 +4334,7 @@ msgstr "Нет ненастроенной компании!"
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Ожидается план счетов"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4350,10 +4397,12 @@ msgid ""
 "Check this box if you don't want any tax related to this tax Code to appear "
 "on invoices."
 msgstr ""
+"Отметьте, если Вы не хотите, чтобы налог, связанный с этим кодом налога, "
+"появился в счетах"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/account_move_line.py:1146
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr "Вы не можете использовать неактивный счет ."
@@ -4383,7 +4432,7 @@ msgid "Consolidated Children"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:573
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4566,7 +4615,7 @@ msgstr ""
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr "Горячая клвиша"
+msgstr "Закладка"
 
 #. module: account
 #: view:account.account:0
@@ -4595,7 +4644,7 @@ msgid "Cancel the Selected Invoices"
 msgstr "Отменить выбранные счета"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:423
+#: code:addons/account/account_bank_statement.py:424
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
 msgstr "Вы должны назначить журнал аналитики для журнал '%s'!"
@@ -4640,6 +4689,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Ошибка!\n"
+"Не допустимая продолжительность периода."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4656,7 +4707,7 @@ msgstr "Месяц"
 #: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "Нальзя изменить код счета который содержит проводки!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
@@ -4664,8 +4715,8 @@ msgid "Supplier invoice sequence"
 msgstr "Нумерация счетов поставщиков"
 
 #. module: account
-#: code:addons/account/account_invoice.py:583
-#: code:addons/account/account_invoice.py:598
+#: code:addons/account/account_invoice.py:610
+#: code:addons/account/account_invoice.py:625
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4728,7 +4779,7 @@ msgid "Account Base Code"
 msgstr "Основной код счёта"
 
 #. module: account
-#: code:addons/account/account_move_line.py:867
+#: code:addons/account/account_move_line.py:864
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4775,7 +4826,7 @@ msgstr "Отметьте, если хотите выводить счета с 0
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Сверка проводок открытия"
 
 #. module: account
 #. openerp-web
@@ -4795,12 +4846,12 @@ msgid "Statement from invoice or payment"
 msgstr "Документ из счета или платежа"
 
 #. module: account
-#: code:addons/account/installer.py:94
+#: code:addons/account/installer.py:115
 #, python-format
 msgid ""
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
-msgstr ""
+msgstr "Не ни одной компании без плана счетов. Мастер не будет запущен."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -4849,7 +4900,7 @@ msgid "Bank statements are entered in the system."
 msgstr "Банковские выписки введены в систему."
 
 #. module: account
-#: code:addons/account/wizard/account_reconcile.py:121
+#: code:addons/account/wizard/account_reconcile.py:122
 #, python-format
 msgid "Reconcile Writeoff"
 msgstr "Сверить списание"
@@ -4945,7 +4996,7 @@ msgstr ""
 "Нельзя создать счет, который имеет родительский счет другой компании."
 
 #. module: account
-#: code:addons/account/account_invoice.py:627
+#: code:addons/account/account_invoice.py:658
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4960,7 +5011,7 @@ msgid "Based On"
 msgstr "Основан на"
 
 #. module: account
-#: code:addons/account/account.py:3166
+#: code:addons/account/account.py:3204
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4993,7 +5044,7 @@ msgstr "Контроль типа"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr "Выступает в качестве счета по умолчанию для сумм по кредиту"
+msgstr "Используется как кредитовый счет по умолчанию"
 
 #. module: account
 #: view:cash.box.out:0
@@ -5010,7 +5061,7 @@ msgstr "Отменено"
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Позволяет устанавливать статус \"Проформа\" для счетов."
 
 #. module: account
 #: view:account.journal:0
@@ -5024,9 +5075,10 @@ msgid ""
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Добавляет колонку валюты в отчет, если валюта отлична от валюты компании."
 
 #. module: account
-#: code:addons/account/account.py:3356
+#: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Налог на покупку %.2f%%"
@@ -5100,7 +5152,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3167
+#: code:addons/account/account.py:3205
 #, python-format
 msgid "MISC"
 msgstr "РАЗНОЕ"
@@ -5255,7 +5307,7 @@ msgstr "Проводки журнала для проверки"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Глобальное округление"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5269,7 +5321,7 @@ msgid "Tax Application"
 msgstr "Применение налога"
 
 #. module: account
-#: code:addons/account/account_invoice.py:890
+#: code:addons/account/account_invoice.py:922
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5443,7 +5495,7 @@ msgid "Target Moves"
 msgstr "Цель операции"
 
 #. module: account
-#: code:addons/account/account.py:1416
+#: code:addons/account/account.py:1454
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5524,7 +5576,7 @@ msgid "Internal Name"
 msgstr "Внутреннее название"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1188
+#: code:addons/account/account_move_line.py:1185
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5535,7 +5587,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr "Предварительный счет "
+msgstr "Проформа счета "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5571,7 +5623,7 @@ msgstr "Прибыль и убыток (счет доходов)"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Проверка даты в периоде"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5596,7 +5648,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Вычислить код (если тип=код)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:485
+#: code:addons/account/account_invoice.py:508
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5729,7 +5781,7 @@ msgid "Recompute taxes and total"
 msgstr "Перерасчет налогов и итога"
 
 #. module: account
-#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1116
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr "Нельзя изменить/удалить журнал с проводками за этот период."
@@ -5759,7 +5811,7 @@ msgid "Amount Computation"
 msgstr "Расчет суммы"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1108
+#: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr "Нельзя добавлять/изменять записи в закрытый период %s журнала %s."
@@ -5947,7 +5999,7 @@ msgstr "Сумма в валюте"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Округление каждой позиции"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -6037,7 +6089,7 @@ msgstr "Открыть кассу"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Автоматическое форматирование"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6056,7 +6108,7 @@ msgid "Fixed Amount"
 msgstr "Фиксированная величина"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1059
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6107,14 +6159,14 @@ msgid "Child Accounts"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1120
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:882
+#: code:addons/account/account_move_line.py:879
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -6140,7 +6192,7 @@ msgstr "Доход"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:355
+#: code:addons/account/account_invoice.py:390
 #, python-format
 msgid "Supplier"
 msgstr "Поставщик"
@@ -6160,7 +6212,7 @@ msgid "Account n°"
 msgstr "№ счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:92
+#: code:addons/account/account_invoice.py:95
 #, python-format
 msgid "Free Reference"
 msgstr "Свободная Ссылка"
@@ -6170,7 +6222,9 @@ msgstr "Свободная Ссылка"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:276
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Счета дебиторской и кредиторской задолженности"
@@ -6279,7 +6333,7 @@ msgid "Filter by"
 msgstr "Фильтровать по"
 
 #. module: account
-#: code:addons/account/account.py:2296
+#: code:addons/account/account.py:2334
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6297,7 +6351,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Счет убытков"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -6327,7 +6381,7 @@ msgid "Number of Days"
 msgstr "Кол-во дней"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1357
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -6472,10 +6526,10 @@ msgstr "Позиция аналитики"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Модели"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1091
+#: code:addons/account/account_invoice.py:1124
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6647,7 +6701,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:606
+#: code:addons/account/account_invoice.py:633
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6668,7 +6722,7 @@ msgid "The related account currency if not equal to the company one."
 msgstr "Валюта связанного счета, если не одинакова с валютой компании."
 
 #. module: account
-#: code:addons/account/installer.py:48
+#: code:addons/account/installer.py:69
 #, python-format
 msgid "Custom"
 msgstr ""
@@ -6692,10 +6746,10 @@ msgstr "Собственные средства"
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Счет внутренних переводов"
 
 #. module: account
-#: code:addons/account/wizard/pos_box.py:33
+#: code:addons/account/wizard/pos_box.py:32
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
 msgstr ""
@@ -6708,7 +6762,7 @@ msgstr "Процент"
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Глобальное округление"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6721,7 +6775,7 @@ msgid "Power"
 msgstr "Мощность"
 
 #. module: account
-#: code:addons/account/account.py:3427
+#: code:addons/account/account.py:3465
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6795,12 +6849,12 @@ msgstr ""
 "таком случае важна последовательность вычислений."
 
 #. module: account
-#: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1415
-#: code:addons/account/account.py:1444
-#: code:addons/account/account.py:1451
-#: code:addons/account/account_invoice.py:983
-#: code:addons/account/account_move_line.py:1008
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1453
+#: code:addons/account/account.py:1482
+#: code:addons/account/account.py:1489
+#: code:addons/account/account_invoice.py:1015
+#: code:addons/account/account_move_line.py:1005
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6886,7 +6940,9 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1160
 #: selection:report.invoice.created,type:0
+#, python-format
 msgid "Supplier Refund"
 msgstr "Возврат средств от поставщика"
 
@@ -7031,7 +7087,7 @@ msgstr "Статистика аналитических проводок"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:958
+#: code:addons/account/account_move_line.py:955
 #, python-format
 msgid "Entries: "
 msgstr "Проводки: "
@@ -7144,7 +7200,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:1024
-#: code:addons/account/account_move_line.py:1108
+#: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "Error !"
 msgstr "Error !"
@@ -7371,7 +7427,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2266
+#: code:addons/account/account.py:2304
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7450,7 +7506,7 @@ msgid "Done"
 msgstr "Сделано"
 
 #. module: account
-#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7525,7 +7581,7 @@ msgstr "Для процентных налогов, введите % как чи
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Структура финансовых отчетов"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7690,7 +7746,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Разрешить проформы счетов"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7741,7 +7797,7 @@ msgstr "Отчетность"
 
 #. module: account
 #. openerp-web
-#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:780
 #: code:addons/account/static/src/js/account_move_reconciliation.js:90
 #, python-format
 msgid "Warning"
@@ -7761,7 +7817,7 @@ msgstr "Журнал счета"
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Метод округления при расчете налога"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7806,7 +7862,7 @@ msgid "Use model"
 msgstr "Использовать модель"
 
 #. module: account
-#: code:addons/account/account.py:1452
+#: code:addons/account/account.py:1490
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7857,7 +7913,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3168
+#: code:addons/account/account.py:3206
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7884,7 +7940,7 @@ msgstr "Нормальный"
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Шаблоны писем"
 
 #. module: account
 #: view:account.move.line:0
@@ -7926,7 +7982,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3155
+#: code:addons/account/account.py:3193
 #, python-format
 msgid "Sales Journal"
 msgstr "Журнал продаж"
@@ -7937,7 +7993,7 @@ msgid "Invoice Tax"
 msgstr "Налог по счету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1188
+#: code:addons/account/account_move_line.py:1185
 #, python-format
 msgid "No piece number !"
 msgstr "Нет номера части !"
@@ -7946,7 +8002,7 @@ msgstr "Нет номера части !"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Структура отчетов по счетам"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7976,7 +8032,7 @@ msgid "Sales Properties"
 msgstr "Свойства продаж"
 
 #. module: account
-#: code:addons/account/account.py:3503
+#: code:addons/account/account.py:3541
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -8001,7 +8057,7 @@ msgstr "По"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1503
+#: code:addons/account/account.py:1541
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -8022,6 +8078,8 @@ msgstr "Отмена выбранных счетов"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Это поле используется для генерации официальных отчетов: прибыль и убыток, "
+"баланс."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -8033,7 +8091,7 @@ msgid "May"
 msgstr "Май"
 
 #. module: account
-#: code:addons/account/account_invoice.py:788
+#: code:addons/account/account_invoice.py:820
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8074,7 +8132,7 @@ msgstr "Провести записи журнала"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:353
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Customer"
 msgstr "Заказчик"
@@ -8090,7 +8148,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3054
+#: code:addons/account/account.py:3092
 #, python-format
 msgid "Cash"
 msgstr "Наличные"
@@ -8261,6 +8319,7 @@ msgstr "Фиксированный"
 #: code:addons/account/account.py:653
 #: code:addons/account/account.py:656
 #: code:addons/account/account.py:668
+#: code:addons/account/account.py:1031
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -8274,7 +8333,7 @@ msgstr ""
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Метод округления при расчете налога"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
@@ -8328,7 +8387,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Выбрать валюту применяемую в счете"
 
 #. module: account
-#: code:addons/account/account_invoice.py:869
+#: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нет позиций в счете !"
@@ -8352,7 +8411,7 @@ msgid "Tax Use In"
 msgstr "Использовать налог в"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:382
 #, python-format
 msgid ""
 "The statement balance is incorrect !\n"
@@ -8360,7 +8419,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:419
+#: code:addons/account/account_bank_statement.py:420
 #, python-format
 msgid "The account entries lines are not in valid state."
 msgstr "Проводки в ненадлежащем состоянии."
@@ -8404,7 +8463,7 @@ msgid "Associated Partner"
 msgstr "Связанный контрагент"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1434
+#: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Сначала вы должны выбрать партнера !"
@@ -8485,13 +8544,13 @@ msgstr ""
 "расчетом других налогов."
 
 #. module: account
-#: code:addons/account/account.py:3158
+#: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Журнал возврата покупок"
 
 #. module: account
-#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1333
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8736,7 +8795,7 @@ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1213
+#: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8837,7 +8896,7 @@ msgid "The partner account used for this invoice."
 msgstr "Бух. счет партнера будет использоваться для этого счета."
 
 #. module: account
-#: code:addons/account/account.py:3353
+#: code:addons/account/account.py:3391
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8855,7 +8914,7 @@ msgid "Payment Term Line"
 msgstr "Позиция условий оплаты"
 
 #. module: account
-#: code:addons/account/account.py:3156
+#: code:addons/account/account.py:3194
 #, python-format
 msgid "Purchase Journal"
 msgstr "Журнал покупок"
@@ -8969,7 +9028,7 @@ msgstr "Вы уверены?"
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr "Разрешенные счета (остваьте пустым для снятия проверок)"
+msgstr "Разрешенные счета (оставьте пустым для снятия проверок)"
 
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
@@ -9025,7 +9084,7 @@ msgid "Journal Name"
 msgstr "Название журнала"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:829
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Проводка \"%s\" не верна !"
@@ -9074,7 +9133,7 @@ msgstr ""
 "Сумма выражается в дополнительный валюте, если эта проводка мульти-валютная."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1009
+#: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9136,7 +9195,7 @@ msgid "Reconciled entries"
 msgstr "Сверенные проводки"
 
 #. module: account
-#: code:addons/account/account.py:2296
+#: code:addons/account/account.py:2334
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9158,7 +9217,7 @@ msgid "Print Account Partner Balance"
 msgstr "Печать баланс счета партнера"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1121
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9192,7 +9251,7 @@ msgstr "неизвестен"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3160
+#: code:addons/account/account.py:3198
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Журнал проводок открытия"
@@ -9289,7 +9348,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3157
+#: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Журнал возврата продаж"
@@ -9355,18 +9414,20 @@ msgid "Purchase Tax(%)"
 msgstr "Налог на покупку(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:869
+#: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Пожалуйста, создайте позиции счета"
 
 #. module: account
-#: code:addons/account/wizard/pos_box.py:37
+#: code:addons/account/wizard/pos_box.py:36
 #, python-format
 msgid ""
 "Please check that the field 'Internal Transfers Account' is set on the "
 "payment method '%s'."
 msgstr ""
+"Пожалуйста, проверьте , что поле \"Счет внутренних переводов\" установлено "
+"для способа оплаты '%s'."
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
@@ -9374,7 +9435,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3165
+#: code:addons/account/account.py:3203
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -9419,7 +9480,7 @@ msgstr "Конец периода"
 #: model:ir.actions.act_window,name:account.action_account_report
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Финансовые отчеты"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
@@ -9533,8 +9594,8 @@ msgid "Receivable Account"
 msgstr "Счет к получению"
 
 #. module: account
-#: code:addons/account/account_move_line.py:774
-#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9635,7 +9696,7 @@ msgid "Move"
 msgstr "Операция"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_bank_statement.py:478
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9708,6 +9769,7 @@ msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Это поле содержит информацию, связанную с нумерацией проводок этого журнала."
 
 #. module: account
 #: field:account.invoice,sent:0
@@ -9731,7 +9793,7 @@ msgid "Balance :"
 msgstr "Баланс :"
 
 #. module: account
-#: code:addons/account/account.py:1549
+#: code:addons/account/account.py:1587
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
@@ -9739,7 +9801,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
-msgstr ""
+msgstr "Периодическая обработка"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9822,7 +9884,7 @@ msgid "Immediate Payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1464
+#: code:addons/account/account.py:1502
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9911,7 +9973,7 @@ msgid "Unreconciled"
 msgstr "Не сверенные"
 
 #. module: account
-#: code:addons/account/account_invoice.py:890
+#: code:addons/account/account_invoice.py:922
 #, python-format
 msgid "Bad total !"
 msgstr "Плохой итог !"
@@ -9996,7 +10058,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1119
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10017,7 +10079,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
-msgstr ""
+msgstr "Назначение"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10085,7 +10147,7 @@ msgid "Journal Entry Model"
 msgstr "Модель записи журнала"
 
 #. module: account
-#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1073
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10167,7 +10229,7 @@ msgstr "Апрель"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Прибыль (убыток)  в отчет"
 
 #. module: account
 #: code:addons/account/account_invoice.py:379
@@ -10251,7 +10313,7 @@ msgstr "Внутренний тип"
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Генерировать проводки до"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -10372,7 +10434,7 @@ msgstr "Всего"
 #: code:addons/account/wizard/account_invoice_refund.py:109
 #, python-format
 msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Нельзя %s черновик/проформу/закрытый счет."
 
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
@@ -10386,6 +10448,7 @@ msgstr "Открыть для банковской сверки"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10401,7 +10464,9 @@ msgstr "Открыть для банковской сверки"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10410,6 +10475,7 @@ msgstr "Открыть для банковской сверки"
 #: field:account.invoice.tax,company_id:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10505,7 +10571,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1059
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10574,8 +10640,10 @@ msgstr "Счета системы налогообложения"
 #: view:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1158
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 #: selection:report.invoice.created,type:0
+#, python-format
 msgid "Supplier Invoice"
 msgstr "Счет поставщика"
 
@@ -10661,8 +10729,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "С движением"
@@ -10758,7 +10828,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1515
+#: code:addons/account/account_invoice.py:1546
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10839,6 +10909,8 @@ msgstr "Искать счет"
 #: report:account.invoice:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:1159
+#, python-format
 msgid "Refund"
 msgstr "Возвраты"
 
@@ -10909,7 +10981,7 @@ msgid "Manual Invoice Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:573
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
@@ -11063,7 +11135,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr ""
+msgstr "Округление каждой позиции"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 4bab5df9a60..66b82d479b2 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\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:34+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2013-06-29 14:38+0000\n"
+"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
 "Language-Team: Vietnamese <vi@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:19+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-30 05:55+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -60,7 +60,7 @@ msgid "Residual"
 msgstr "Còn lại"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:369
 #, python-format
 msgid "Journal item \"%s\" is not valid."
 msgstr ""
@@ -73,12 +73,12 @@ msgstr "Aged Receivable Till Today"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr "Import from invoice or payment"
+msgstr "Nhập từ hóa đơn hoặc khoản thanh toán"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/account_move_line.py:1146
-#: code:addons/account/account_move_line.py:1213
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid "Bad Account!"
 msgstr ""
@@ -94,7 +94,7 @@ msgstr "Tổng Nợ"
 msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
-msgstr ""
+msgstr "Lỗi!"
 
 #. module: account
 #. openerp-web
@@ -132,15 +132,15 @@ msgstr ""
 #: code:addons/account/account.py:641
 #: code:addons/account/account.py:686
 #: code:addons/account/account.py:781
-#: code:addons/account/account.py:1049
-#: code:addons/account/account_invoice.py:788
-#: code:addons/account/account_invoice.py:791
-#: code:addons/account/account_invoice.py:794
-#: code:addons/account/account_invoice.py:1514
+#: code:addons/account/account.py:1058
+#: code:addons/account/account_invoice.py:820
+#: code:addons/account/account_invoice.py:823
+#: code:addons/account/account_invoice.py:826
+#: code:addons/account/account_invoice.py:1545
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:774
-#: code:addons/account/account_move_line.py:827
-#: code:addons/account/account_move_line.py:867
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#: code:addons/account/account_move_line.py:864
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -152,7 +152,7 @@ msgid "Warning!"
 msgstr "Cảnh báo!"
 
 #. module: account
-#: code:addons/account/account.py:3159
+#: code:addons/account/account.py:3197
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -192,12 +192,12 @@ msgstr "Hoá đơn được tạo trong 15 ngày qua"
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Nhãn cột"
 
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Số chữ số dùng cho mã tài khoản"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -242,7 +242,7 @@ msgstr "Báo cáo của Bỉ"
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
-msgstr ""
+msgstr "Đã xác nhận"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
@@ -318,7 +318,7 @@ msgstr "Tài khoản chưa đối soát"
 #. module: account
 #: field:account.config.settings,module_account_budget:0
 msgid "Budget management"
-msgstr ""
+msgstr "Quản lý quỹ"
 
 #. module: account
 #: view:product.template:0
@@ -336,10 +336,10 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Cho phép đa tiền tệ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:74
+#: code:addons/account/account_invoice.py:77
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
 msgstr ""
@@ -357,7 +357,7 @@ msgstr "Tháng Sáu"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Bạn phải chọn một tài khoản để đối soát"
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
@@ -370,7 +370,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Nhân viên bán hàng"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -660,7 +660,7 @@ msgid "Profit Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1159
+#: code:addons/account/account_move_line.py:1156
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -671,13 +671,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "Báo cáo Bán hàng theo Loại Tài khoản"
 
 #. module: account
-#: code:addons/account/account.py:3163
+#: code:addons/account/account.py:3201
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1553
+#: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr ""
@@ -730,7 +730,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
 #: code:addons/account/report/account_partner_balance.py:297
+#: code:addons/account/report/account_partner_ledger.py:272
 #, python-format
 msgid "Receivable Accounts"
 msgstr "Các tài khoản phải thu"
@@ -738,7 +740,7 @@ msgstr "Các tài khoản phải thu"
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Cấu hình tài khoản ngân hàng của công ty"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -768,7 +770,7 @@ msgid "Are you sure you want to create entries?"
 msgstr "Are you sure you want to create entries?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
+#: code:addons/account/account_invoice.py:1361
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
 msgstr ""
@@ -817,7 +819,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Báo cáo tài chính"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -837,7 +839,7 @@ msgid "Type"
 msgstr "Loại"
 
 #. module: account
-#: code:addons/account/account_invoice.py:794
+#: code:addons/account/account_invoice.py:826
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -860,10 +862,10 @@ msgid "Supplier Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "Bút toán đã đối soát xong."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -880,7 +882,7 @@ msgstr "Account Analytic Journal"
 #. module: account
 #: view:account.invoice:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Gửi qua Email"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -900,7 +902,7 @@ msgstr "J.C./Move name"
 #. module: account
 #: view:account.account:0
 msgid "Account Code and Name"
-msgstr ""
+msgstr "Mã tài khoản và tên"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -931,9 +933,13 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                   Không tìm thấy mục nhật ký.\n"
+"                </p>\n"
+"            "
 
 #. module: account
-#: code:addons/account/account.py:1639
+#: code:addons/account/account.py:1677
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -977,7 +983,7 @@ msgstr "Đến hạn"
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Nhật ký mua hàng"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
@@ -1017,7 +1023,7 @@ msgid "Liability"
 msgstr "Liability"
 
 #. module: account
-#: code:addons/account/account_invoice.py:867
+#: code:addons/account/account_invoice.py:899
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -1088,13 +1094,13 @@ msgstr "Mã"
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Tính năng"
 
 #. module: account
-#: code:addons/account/account.py:2308
-#: code:addons/account/account_bank_statement.py:423
-#: code:addons/account/account_invoice.py:74
-#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_bank_statement.py:424
+#: code:addons/account/account_invoice.py:77
+#: code:addons/account/account_invoice.py:775
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1220,7 +1226,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3054
+#: code:addons/account/account.py:3092
 #, python-format
 msgid "Bank"
 msgstr "Ngân hàng"
@@ -1309,7 +1315,7 @@ msgstr "Outgoing Currencies Rate"
 #: view:account.analytic.account:0
 #: field:account.config.settings,chart_template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Mẫu"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1401,7 +1407,7 @@ msgstr "Mức"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Bạn chỉ có thể thay đổi đồng tiền cho dự thảo hóa đơn"
 
 #. module: account
 #: report:account.invoice:0
@@ -1427,7 +1433,7 @@ msgstr "Chọn một chu kỳ bắt đầu và một chu kỳ kết thúc"
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Lãi và lỗ"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1500,7 +1506,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Tình trạng hóa đơn"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1522,18 +1528,20 @@ msgstr "Khoản phải thu"
 #: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (sao chép)"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
 msgstr "With balance is not equal to 0"
 
 #. module: account
-#: code:addons/account/account.py:1445
+#: code:addons/account/account.py:1483
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1601,7 +1609,7 @@ msgstr ""
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "Hóa đơn điện tử & Thanh toán"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1640,7 +1648,7 @@ msgstr "Case Code"
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
-msgstr ""
+msgstr "Xem trước lề dưới tài khoản ngân hàng"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1681,7 +1689,7 @@ msgstr "Không bị thuế"
 #. module: account
 #: view:account.journal:0
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Thiết lập nâng cao"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1756,8 +1764,10 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.move.line,invoice:0
+#: code:addons/account/account_invoice.py:1157
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
+#, python-format
 msgid "Invoice"
 msgstr "Hóa đơn"
 
@@ -1810,7 +1820,7 @@ msgstr "Doanh số theo loại tài khoản"
 #: 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 ngày"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1832,7 +1842,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr ""
@@ -1880,7 +1890,7 @@ msgstr "nếu thiết lập này bị sai. bạn có thể ẩn nó thay vì xó
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Xếp theo"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1948,12 +1958,12 @@ msgstr "Draft statement"
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Hóa đơn đã xác nhận"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Trả tiền cho NCC bằng séc"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -1984,36 +1994,36 @@ msgstr ""
 #: code:addons/account/account.py:634
 #: code:addons/account/account.py:636
 #: code:addons/account/account.py:930
-#: code:addons/account/account.py:1062
-#: code:addons/account/account.py:1064
-#: code:addons/account/account.py:1103
-#: code:addons/account/account.py:1283
-#: code:addons/account/account.py:1297
-#: code:addons/account/account.py:1320
-#: code:addons/account/account.py:1327
-#: code:addons/account/account.py:1549
-#: code:addons/account/account.py:1553
-#: code:addons/account/account.py:1639
-#: code:addons/account/account.py:2320
-#: code:addons/account/account.py:2640
-#: code:addons/account/account.py:3427
+#: code:addons/account/account.py:1071
+#: code:addons/account/account.py:1073
+#: code:addons/account/account.py:1116
+#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1356
+#: code:addons/account/account.py:1363
+#: code:addons/account/account.py:1587
+#: code:addons/account/account.py:1591
+#: code:addons/account/account.py:1677
+#: code:addons/account/account.py:2358
+#: code:addons/account/account.py:2678
+#: code:addons/account/account.py:3465
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
-#: code:addons/account/account_bank_statement.py:367
-#: code:addons/account/account_bank_statement.py:380
-#: code:addons/account/account_bank_statement.py:418
+#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:419
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:867
-#: code:addons/account/account_invoice.py:901
-#: code:addons/account/account_invoice.py:1091
-#: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_invoice.py:899
+#: code:addons/account/account_invoice.py:933
+#: code:addons/account/account_invoice.py:1124
+#: code:addons/account/account_move_line.py:579
+#: code:addons/account/account_move_line.py:828
+#: code:addons/account/account_move_line.py:851
 #: code:addons/account/account_move_line.py:854
-#: code:addons/account/account_move_line.py:857
-#: code:addons/account/account_move_line.py:1122
-#: code:addons/account/account_move_line.py:1124
-#: code:addons/account/account_move_line.py:1159
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/account_move_line.py:1121
+#: code:addons/account/account_move_line.py:1156
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2027,11 +2037,11 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:158
 #: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
-#: code:addons/account/wizard/pos_box.py:32
-#: code:addons/account/wizard/pos_box.py:36
+#: code:addons/account/wizard/pos_box.py:31
+#: code:addons/account/wizard/pos_box.py:35
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Lỗi!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -2070,7 +2080,7 @@ msgid "period close"
 msgstr "đóng chu kỳ"
 
 #. module: account
-#: code:addons/account/account.py:1049
+#: code:addons/account/account.py:1058
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2085,7 +2095,7 @@ msgstr "Entries By Line"
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Dựa trên"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -2133,7 +2143,7 @@ msgstr "Phân tích ngân quỹ"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Nhật ký Mua/Bán hàng"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2142,7 +2152,7 @@ msgid "Analytic account"
 msgstr "Tài khoản phân tích"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_bank_statement.py:406
 #, python-format
 msgid "Please verify that an account is defined in the journal."
 msgstr "Vui lòng kiểm tra việc gán một tài khoản cho sổ nhật ký này."
@@ -2156,7 +2166,7 @@ msgstr "Hợp lệ"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Người theo dõi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -2185,14 +2195,14 @@ msgstr "Account Aged Trial balance Report"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Đóng năm tài khóa"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Nhật ký:"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2209,12 +2219,12 @@ msgstr "Định nghĩa thuế"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "Cấu hình kế toán"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Tham chiếu đơn vị tính"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2230,12 +2240,12 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Tốt lắm!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Quản  lý tài sản"
 
 #. module: account
 #: view:account.account:0
@@ -2244,7 +2254,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:274
 #, python-format
 msgid "Payable Accounts"
 msgstr "Các tài khoản phải trả"
@@ -2411,7 +2423,7 @@ msgstr "Search Chart of Account Templates"
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Mã khách hàng"
 
 #. module: account
 #: view:account.account.type:0
@@ -2554,7 +2566,7 @@ msgid "Create an Account Based on this Template"
 msgstr "Tạo một Tài khoản dựa trên mẫu này"
 
 #. module: account
-#: code:addons/account/account_invoice.py:901
+#: code:addons/account/account_invoice.py:933
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2575,7 +2587,7 @@ msgid "Main Sequence"
 msgstr "Main Sequence"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_bank_statement.py:478
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2599,7 +2611,7 @@ msgid "Fiscal Positions"
 msgstr "Fiscal Positions"
 
 #. module: account
-#: code:addons/account/account_move_line.py:578
+#: code:addons/account/account_move_line.py:579
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
 msgstr ""
@@ -2707,7 +2719,7 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3164
+#: code:addons/account/account.py:3202
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2823,21 +2835,20 @@ msgid "Accounts"
 msgstr "Các tài khoản"
 
 #. module: account
-#: code:addons/account/account.py:3503
-#: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:378
-#: code:addons/account/account_invoice.py:484
-#: code:addons/account/account_invoice.py:582
-#: code:addons/account/account_invoice.py:597
-#: code:addons/account/account_invoice.py:605
-#: code:addons/account/account_invoice.py:627
-#: code:addons/account/account_move_line.py:535
+#: code:addons/account/account.py:3541
+#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_invoice.py:507
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:624
+#: code:addons/account/account_invoice.py:632
+#: code:addons/account/account_invoice.py:657
+#: code:addons/account/account_move_line.py:536
 #, python-format
 msgid "Configuration Error!"
 msgstr "Lỗi cấu hình!"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:433
+#: code:addons/account/account_bank_statement.py:434
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
 msgstr ""
@@ -3030,7 +3041,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1071
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr ""
@@ -3043,7 +3054,7 @@ msgid "Sales by Account"
 msgstr "Doanh thu theo tài khoản"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr ""
@@ -3059,8 +3070,8 @@ msgid "Sale journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2308
-#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_invoice.py:775
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -3227,7 +3238,7 @@ msgid "Fiscal Position"
 msgstr "Fiscal Position"
 
 #. module: account
-#: code:addons/account/account_invoice.py:791
+#: code:addons/account/account_invoice.py:823
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3325,7 +3336,7 @@ msgstr ""
 "always use the rate at date."
 
 #. module: account
-#: code:addons/account/account.py:2640
+#: code:addons/account/account.py:2678
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr ""
@@ -3388,8 +3399,8 @@ msgid "View"
 msgstr "View"
 
 #. module: account
-#: code:addons/account/account.py:3422
-#: code:addons/account/account_bank.py:95
+#: code:addons/account/account.py:3460
+#: code:addons/account/account_bank.py:94
 #, python-format
 msgid "BNK"
 msgstr "BNK"
@@ -3659,7 +3670,7 @@ msgstr ""
 "have the same references than the statement itself"
 
 #. module: account
-#: code:addons/account/account_invoice.py:984
+#: code:addons/account/account_invoice.py:1016
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3674,7 +3685,7 @@ msgid "Starting Balance"
 msgstr "Số dư ban đầu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1434
+#: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Không có đối tác được định nghĩa"
@@ -3728,7 +3739,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:535
+#: code:addons/account/account_move_line.py:536
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -3878,7 +3889,7 @@ msgid "Period Length (days)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1363
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -3947,9 +3958,13 @@ msgid "VAT :"
 msgstr "Thuế GTGT :"
 
 #. module: account
+#: report:account.account.balance:0
 #: report:account.central.journal:0
 #: view:account.config.settings:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -4041,7 +4056,7 @@ msgid "Chart of Accounts Template"
 msgstr "Hoạch đồ Kế toán Mẫu"
 
 #. module: account
-#: code:addons/account/account.py:2320
+#: code:addons/account/account.py:2358
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4053,8 +4068,10 @@ msgstr ""
 "Hãy xác định đối tác trên nó"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -4213,7 +4230,7 @@ msgid "Name"
 msgstr "Tên"
 
 #. module: account
-#: code:addons/account/installer.py:94
+#: code:addons/account/installer.py:115
 #, python-format
 msgid "No unconfigured company !"
 msgstr ""
@@ -4284,8 +4301,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/account_move_line.py:1146
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4315,7 +4332,7 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:573
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4523,7 +4540,7 @@ msgid "Cancel the Selected Invoices"
 msgstr "Hủy bỏ các hóa đơn được chọn"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:423
+#: code:addons/account/account_bank_statement.py:424
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
 msgstr ""
@@ -4590,8 +4607,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:583
-#: code:addons/account/account_invoice.py:598
+#: code:addons/account/account_invoice.py:610
+#: code:addons/account/account_invoice.py:625
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4654,7 +4671,7 @@ msgid "Account Base Code"
 msgstr "Account Base Code"
 
 #. module: account
-#: code:addons/account/account_move_line.py:867
+#: code:addons/account/account_move_line.py:864
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4720,7 +4737,7 @@ msgid "Statement from invoice or payment"
 msgstr "Statement from invoice or payment"
 
 #. module: account
-#: code:addons/account/installer.py:94
+#: code:addons/account/installer.py:115
 #, python-format
 msgid ""
 "There is currently no company without chart of account. The wizard will "
@@ -4774,7 +4791,7 @@ msgid "Bank statements are entered in the system."
 msgstr "Bank statements are entered in the system."
 
 #. module: account
-#: code:addons/account/wizard/account_reconcile.py:121
+#: code:addons/account/wizard/account_reconcile.py:122
 #, python-format
 msgid "Reconcile Writeoff"
 msgstr "Reconcile Writeoff"
@@ -4864,7 +4881,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:627
+#: code:addons/account/account_invoice.py:658
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4879,7 +4896,7 @@ msgid "Based On"
 msgstr "Dựa trên"
 
 #. module: account
-#: code:addons/account/account.py:3166
+#: code:addons/account/account.py:3204
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4945,7 +4962,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3356
+#: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -5019,7 +5036,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3167
+#: code:addons/account/account.py:3205
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -5188,7 +5205,7 @@ msgid "Tax Application"
 msgstr "Tax Application"
 
 #. module: account
-#: code:addons/account/account_invoice.py:890
+#: code:addons/account/account_invoice.py:922
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5362,7 +5379,7 @@ msgid "Target Moves"
 msgstr "Target Moves"
 
 #. module: account
-#: code:addons/account/account.py:1416
+#: code:addons/account/account.py:1454
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5443,7 +5460,7 @@ msgid "Internal Name"
 msgstr "Tên nội bộ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1188
+#: code:addons/account/account_move_line.py:1185
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5515,7 +5532,7 @@ msgid "Compute Code (if type=code)"
 msgstr "Compute Code (if type=code)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:485
+#: code:addons/account/account_invoice.py:508
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5646,7 +5663,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1116
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5676,7 +5693,7 @@ msgid "Amount Computation"
 msgstr "Tính toán giá trị"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1108
+#: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5976,7 +5993,7 @@ msgid "Fixed Amount"
 msgstr "Giá trị cố định"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1059
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
@@ -6027,14 +6044,14 @@ msgid "Child Accounts"
 msgstr "Tài khoản con"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1120
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:882
+#: code:addons/account/account_move_line.py:879
 #, python-format
 msgid "Write-Off"
 msgstr "Miễn bỏ"
@@ -6060,7 +6077,7 @@ msgstr "Income"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:355
+#: code:addons/account/account_invoice.py:390
 #, python-format
 msgid "Supplier"
 msgstr "Nhà cung cấp"
@@ -6080,7 +6097,7 @@ msgid "Account n°"
 msgstr "Tài khoản số"
 
 #. module: account
-#: code:addons/account/account_invoice.py:92
+#: code:addons/account/account_invoice.py:95
 #, python-format
 msgid "Free Reference"
 msgstr "Tham chiếu tự do"
@@ -6090,7 +6107,9 @@ msgstr "Tham chiếu tự do"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:276
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Các Tài khoản Phải thu và Phải trả"
@@ -6199,7 +6218,7 @@ msgid "Filter by"
 msgstr "Lọc theo"
 
 #. module: account
-#: code:addons/account/account.py:2296
+#: code:addons/account/account.py:2334
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -6247,7 +6266,7 @@ msgid "Number of Days"
 msgstr "Số ngày"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1357
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -6395,7 +6414,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1091
+#: code:addons/account/account_invoice.py:1124
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6567,7 +6586,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:606
+#: code:addons/account/account_invoice.py:633
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6588,7 +6607,7 @@ msgid "The related account currency if not equal to the company one."
 msgstr "The related account currency if not equal to the company one."
 
 #. module: account
-#: code:addons/account/installer.py:48
+#: code:addons/account/installer.py:69
 #, python-format
 msgid "Custom"
 msgstr ""
@@ -6615,7 +6634,7 @@ msgid "Internal Transfers Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/pos_box.py:33
+#: code:addons/account/wizard/pos_box.py:32
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
 msgstr ""
@@ -6641,7 +6660,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3427
+#: code:addons/account/account.py:3465
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6717,12 +6736,12 @@ msgstr ""
 "children. In this case, the evaluation order is important."
 
 #. module: account
-#: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1415
-#: code:addons/account/account.py:1444
-#: code:addons/account/account.py:1451
-#: code:addons/account/account_invoice.py:983
-#: code:addons/account/account_move_line.py:1008
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1453
+#: code:addons/account/account.py:1482
+#: code:addons/account/account.py:1489
+#: code:addons/account/account_invoice.py:1015
+#: code:addons/account/account_move_line.py:1005
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6807,7 +6826,9 @@ msgstr ""
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1160
 #: selection:report.invoice.created,type:0
+#, python-format
 msgid "Supplier Refund"
 msgstr "Hoàn tiền cho Nhà cung cấp"
 
@@ -6952,7 +6973,7 @@ msgstr "Analytic Entries Statistics"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:958
+#: code:addons/account/account_move_line.py:955
 #, python-format
 msgid "Entries: "
 msgstr "Các bút toán: "
@@ -7065,7 +7086,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:1024
-#: code:addons/account/account_move_line.py:1108
+#: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "Error !"
 msgstr "Lỗi !"
@@ -7292,7 +7313,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2266
+#: code:addons/account/account.py:2304
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7371,7 +7392,7 @@ msgid "Done"
 msgstr "Hoàn tất"
 
 #. module: account
-#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7667,7 +7688,7 @@ msgstr "Báo cáo"
 
 #. module: account
 #. openerp-web
-#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:780
 #: code:addons/account/static/src/js/account_move_reconciliation.js:90
 #, python-format
 msgid "Warning"
@@ -7733,7 +7754,7 @@ msgid "Use model"
 msgstr "Sử dụng mô hình"
 
 #. module: account
-#: code:addons/account/account.py:1452
+#: code:addons/account/account.py:1490
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7784,7 +7805,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3168
+#: code:addons/account/account.py:3206
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7853,7 +7874,7 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3155
+#: code:addons/account/account.py:3193
 #, python-format
 msgid "Sales Journal"
 msgstr "Sổ nhật ký Bán hàng"
@@ -7864,7 +7885,7 @@ msgid "Invoice Tax"
 msgstr "Thuế Hóa đơn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1188
+#: code:addons/account/account_move_line.py:1185
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7903,7 +7924,7 @@ msgid "Sales Properties"
 msgstr "Các thuộc tính Bán hàng"
 
 #. module: account
-#: code:addons/account/account.py:3503
+#: code:addons/account/account.py:3541
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7928,7 +7949,7 @@ msgstr "Đến"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1503
+#: code:addons/account/account.py:1541
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7960,7 +7981,7 @@ msgid "May"
 msgstr "Tháng Năm"
 
 #. module: account
-#: code:addons/account/account_invoice.py:788
+#: code:addons/account/account_invoice.py:820
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -8001,7 +8022,7 @@ msgstr "Post Journal Entries"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:353
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Customer"
 msgstr "Khách hàng"
@@ -8017,7 +8038,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3054
+#: code:addons/account/account.py:3092
 #, python-format
 msgid "Cash"
 msgstr "Tiền mặt"
@@ -8187,6 +8208,7 @@ msgstr "Đã sửa"
 #: code:addons/account/account.py:653
 #: code:addons/account/account.py:656
 #: code:addons/account/account.py:668
+#: code:addons/account/account.py:1031
 #, python-format
 msgid "Warning !"
 msgstr "Cảnh báo !"
@@ -8254,7 +8276,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Chọn một loại tiền để áp dụng cho hóa đơn"
 
 #. module: account
-#: code:addons/account/account_invoice.py:869
+#: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -8279,7 +8301,7 @@ msgid "Tax Use In"
 msgstr "Thuế sử dụng trong"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:382
 #, python-format
 msgid ""
 "The statement balance is incorrect !\n"
@@ -8287,7 +8309,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:419
+#: code:addons/account/account_bank_statement.py:420
 #, python-format
 msgid "The account entries lines are not in valid state."
 msgstr "The account entries lines are not in valid state."
@@ -8331,7 +8353,7 @@ msgid "Associated Partner"
 msgstr "Đối tác Liên quan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1434
+#: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -8412,13 +8434,13 @@ msgstr ""
 "tính toán các khoản thuế tiếp theo"
 
 #. module: account
-#: code:addons/account/account.py:3158
+#: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Sổ nhật ký Hoàn tiền Mua hàng"
 
 #. module: account
-#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1333
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8663,7 +8685,7 @@ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1213
+#: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8764,7 +8786,7 @@ msgid "The partner account used for this invoice."
 msgstr "The partner account used for this invoice."
 
 #. module: account
-#: code:addons/account/account.py:3353
+#: code:addons/account/account.py:3391
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8782,7 +8804,7 @@ msgid "Payment Term Line"
 msgstr "Payment Term Line"
 
 #. module: account
-#: code:addons/account/account.py:3156
+#: code:addons/account/account.py:3194
 #, python-format
 msgid "Purchase Journal"
 msgstr "Purchase Journal"
@@ -8953,7 +8975,7 @@ msgid "Journal Name"
 msgstr "Journal Name"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:829
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Bút toán \"%s\" không hợp lệ !"
@@ -9005,7 +9027,7 @@ msgstr ""
 "entry."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1009
+#: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -9067,7 +9089,7 @@ msgid "Reconciled entries"
 msgstr "Reconciled entries"
 
 #. module: account
-#: code:addons/account/account.py:2296
+#: code:addons/account/account.py:2334
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -9089,7 +9111,7 @@ msgid "Print Account Partner Balance"
 msgstr "Print Account Partner Balance"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1121
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9123,7 +9145,7 @@ msgstr "chưa biết"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3160
+#: code:addons/account/account.py:3198
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Opening Entries Journal"
@@ -9220,7 +9242,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3157
+#: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
@@ -9286,13 +9308,13 @@ msgid "Purchase Tax(%)"
 msgstr "Thuế mua hàng(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:869
+#: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
 
 #. module: account
-#: code:addons/account/wizard/pos_box.py:37
+#: code:addons/account/wizard/pos_box.py:36
 #, python-format
 msgid ""
 "Please check that the field 'Internal Transfers Account' is set on the "
@@ -9305,7 +9327,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3165
+#: code:addons/account/account.py:3203
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9467,8 +9489,8 @@ msgid "Receivable Account"
 msgstr "Tài khoản Phải thu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:774
-#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9569,7 +9591,7 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_bank_statement.py:478
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9666,7 +9688,7 @@ msgid "Balance :"
 msgstr "Số dư :"
 
 #. module: account
-#: code:addons/account/account.py:1549
+#: code:addons/account/account.py:1587
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
@@ -9757,7 +9779,7 @@ msgid "Immediate Payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1464
+#: code:addons/account/account.py:1502
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9846,7 +9868,7 @@ msgid "Unreconciled"
 msgstr "Chưa được đối soát"
 
 #. module: account
-#: code:addons/account/account_invoice.py:890
+#: code:addons/account/account_invoice.py:922
 #, python-format
 msgid "Bad total !"
 msgstr "Tổng không hợp lệ !"
@@ -9938,7 +9960,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1119
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -10027,7 +10049,7 @@ msgid "Journal Entry Model"
 msgstr "Journal Entry Model"
 
 #. module: account
-#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1073
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -10329,6 +10351,7 @@ msgstr "Mở việc đối soát với ngân hàng"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10344,7 +10367,9 @@ msgstr "Mở việc đối soát với ngân hàng"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10353,6 +10378,7 @@ msgstr "Mở việc đối soát với ngân hàng"
 #: field:account.invoice.tax,company_id:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10448,7 +10474,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1059
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10517,8 +10543,10 @@ msgstr "Accounts Fiscal Position"
 #: view:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1158
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 #: selection:report.invoice.created,type:0
+#, python-format
 msgid "Supplier Invoice"
 msgstr "Hóa đơn nhà cung cấp"
 
@@ -10604,8 +10632,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "With movements"
@@ -10701,7 +10731,7 @@ msgid "Entries Sorted by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1515
+#: code:addons/account/account_invoice.py:1546
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10782,6 +10812,8 @@ msgstr "Tìm kiếm hóa đơn"
 #: report:account.invoice:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:1159
+#, python-format
 msgid "Refund"
 msgstr "Hoàn tiền"
 
@@ -10852,7 +10884,7 @@ msgid "Manual Invoice Taxes"
 msgstr "Manual Invoice Taxes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:573
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 0e216ddb68f..beaeb00ddea 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-04-25 09:04+0000\n"
-"Last-Translator: Oliver Yuan <Unknown>\n"
+"PO-Revision-Date: 2013-06-07 09:22+0000\n"
+"Last-Translator: 盈通 ccdos <ccdos@163.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-04-26 05:34+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-06-08 05:52+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -57,7 +57,7 @@ msgid "Residual"
 msgstr "余额"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:369
 #, python-format
 msgid "Journal item \"%s\" is not valid."
 msgstr "凭证\"%s\"无效"
@@ -73,9 +73,9 @@ msgid "Import from invoice or payment"
 msgstr "从发票或付款单导入"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/account_move_line.py:1146
-#: code:addons/account/account_move_line.py:1213
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
+#: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid "Bad Account!"
 msgstr "坏账"
@@ -129,15 +129,15 @@ msgstr "如果设置为false，该付款条款将会被隐藏。"
 #: code:addons/account/account.py:641
 #: code:addons/account/account.py:686
 #: code:addons/account/account.py:781
-#: code:addons/account/account.py:1049
-#: code:addons/account/account_invoice.py:788
-#: code:addons/account/account_invoice.py:791
-#: code:addons/account/account_invoice.py:794
-#: code:addons/account/account_invoice.py:1514
+#: code:addons/account/account.py:1058
+#: code:addons/account/account_invoice.py:817
+#: code:addons/account/account_invoice.py:820
+#: code:addons/account/account_invoice.py:823
+#: code:addons/account/account_invoice.py:1542
 #: code:addons/account/account_move_line.py:98
-#: code:addons/account/account_move_line.py:774
-#: code:addons/account/account_move_line.py:827
-#: code:addons/account/account_move_line.py:867
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
+#: code:addons/account/account_move_line.py:864
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -149,7 +149,7 @@ msgid "Warning!"
 msgstr "警告！"
 
 #. module: account
-#: code:addons/account/account.py:3159
+#: code:addons/account/account.py:3197
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "其它凭证簿"
@@ -673,7 +673,7 @@ msgid "Profit Account"
 msgstr "利润科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1159
+#: code:addons/account/account_move_line.py:1156
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "根据输入的凭证日期没有找到期间或找到了多个期间"
@@ -684,13 +684,13 @@ msgid "Report of the Sales by Account Type"
 msgstr "销售报表的科目类型"
 
 #. module: account
-#: code:addons/account/account.py:3163
+#: code:addons/account/account.py:3201
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
 
 #. module: account
-#: code:addons/account/account.py:1553
+#: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
 msgstr "不能不同币种的凭证"
@@ -783,7 +783,7 @@ msgid "Are you sure you want to create entries?"
 msgstr "你确定创建分录?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1330
+#: code:addons/account/account_invoice.py:1358
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
 msgstr "发票已经支付：%s%s ，总额： %s%s (剩余：%s%s )。"
@@ -852,7 +852,7 @@ msgid "Type"
 msgstr "类型"
 
 #. module: account
-#: code:addons/account/account_invoice.py:794
+#: code:addons/account/account_invoice.py:823
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -875,7 +875,7 @@ msgid "Supplier Invoices And Refunds"
 msgstr "供应商发票和退款"
 
 #. module: account
-#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
 msgstr "分录已经核销。"
@@ -951,7 +951,7 @@ msgstr ""
 "            "
 
 #. module: account
-#: code:addons/account/account.py:1639
+#: code:addons/account/account.py:1677
 #, python-format
 msgid ""
 "You cannot unreconcile journal items if they has been generated by the       "
@@ -1035,7 +1035,7 @@ msgid "Liability"
 msgstr "负债"
 
 #. module: account
-#: code:addons/account/account_invoice.py:867
+#: code:addons/account/account_invoice.py:896
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "请为这张发票对应的凭证簿选择编号规则"
@@ -1106,10 +1106,10 @@ msgid "Features"
 msgstr "特性"
 
 #. module: account
-#: code:addons/account/account.py:2308
-#: code:addons/account/account_bank_statement.py:423
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_bank_statement.py:424
 #: code:addons/account/account_invoice.py:74
-#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:772
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
@@ -1139,6 +1139,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击添加一个账户.\n"
+"              </p><p>\n"
+"                "
+"在处理多币种交易时，由于汇率的变化，可能会产生汇兑收益或者损失。这个菜单提供给你一个假定在今天终结交易预测的损益。只有在账户有多币种时需要设置。\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1155,7 +1162,7 @@ msgstr "用上个期末余额作期初"
 msgid ""
 "Check this box if you don't want any tax related to this tax code to appear "
 "on invoices"
-msgstr ""
+msgstr "如果你不想该税款编码相关的税务信息显示在发票中, 请选中此项"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1233,7 +1240,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3054
+#: code:addons/account/account.py:3092
 #, python-format
 msgid "Bank"
 msgstr "银行"
@@ -1548,7 +1555,7 @@ msgid "With balance is not equal to 0"
 msgstr "余额不为0"
 
 #. module: account
-#: code:addons/account/account.py:1445
+#: code:addons/account/account.py:1483
 #, python-format
 msgid ""
 "There is no default debit account defined \n"
@@ -1773,8 +1780,10 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.move.line,invoice:0
+#: code:addons/account/account_invoice.py:1154
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
+#, python-format
 msgid "Invoice"
 msgstr "发票"
 
@@ -1849,7 +1858,7 @@ msgid ""
 msgstr "这个分类账簿的“合并对方科目”必须被选中，“跳过草稿状态”不能选中。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Some entries are already reconciled."
 msgstr "有些分录已经被核销。"
@@ -2004,36 +2013,36 @@ msgstr ""
 #: code:addons/account/account.py:634
 #: code:addons/account/account.py:636
 #: code:addons/account/account.py:930
-#: code:addons/account/account.py:1062
-#: code:addons/account/account.py:1064
-#: code:addons/account/account.py:1103
-#: code:addons/account/account.py:1283
-#: code:addons/account/account.py:1297
-#: code:addons/account/account.py:1320
-#: code:addons/account/account.py:1327
-#: code:addons/account/account.py:1549
-#: code:addons/account/account.py:1553
-#: code:addons/account/account.py:1639
-#: code:addons/account/account.py:2320
-#: code:addons/account/account.py:2640
-#: code:addons/account/account.py:3427
+#: code:addons/account/account.py:1071
+#: code:addons/account/account.py:1073
+#: code:addons/account/account.py:1116
+#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
+#: code:addons/account/account.py:1356
+#: code:addons/account/account.py:1363
+#: code:addons/account/account.py:1587
+#: code:addons/account/account.py:1591
+#: code:addons/account/account.py:1677
+#: code:addons/account/account.py:2358
+#: code:addons/account/account.py:2678
+#: code:addons/account/account.py:3465
 #: code:addons/account/account_analytic_line.py:89
 #: code:addons/account/account_analytic_line.py:98
-#: code:addons/account/account_bank_statement.py:367
-#: code:addons/account/account_bank_statement.py:380
-#: code:addons/account/account_bank_statement.py:418
+#: code:addons/account/account_bank_statement.py:368
+#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:419
 #: code:addons/account/account_cash_statement.py:256
 #: code:addons/account/account_cash_statement.py:300
-#: code:addons/account/account_invoice.py:867
-#: code:addons/account/account_invoice.py:901
-#: code:addons/account/account_invoice.py:1091
-#: code:addons/account/account_move_line.py:578
-#: code:addons/account/account_move_line.py:831
+#: code:addons/account/account_invoice.py:896
+#: code:addons/account/account_invoice.py:930
+#: code:addons/account/account_invoice.py:1121
+#: code:addons/account/account_move_line.py:579
+#: code:addons/account/account_move_line.py:828
+#: code:addons/account/account_move_line.py:851
 #: code:addons/account/account_move_line.py:854
-#: code:addons/account/account_move_line.py:857
-#: code:addons/account/account_move_line.py:1122
-#: code:addons/account/account_move_line.py:1124
-#: code:addons/account/account_move_line.py:1159
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/account_move_line.py:1121
+#: code:addons/account/account_move_line.py:1156
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2047,8 +2056,8 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:158
 #: code:addons/account/wizard/account_report_common.py:164
 #: code:addons/account/wizard/account_use_model.py:44
-#: code:addons/account/wizard/pos_box.py:32
-#: code:addons/account/wizard/pos_box.py:36
+#: code:addons/account/wizard/pos_box.py:31
+#: code:addons/account/wizard/pos_box.py:35
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -2096,7 +2105,7 @@ msgid "period close"
 msgstr "关闭一个会计期间"
 
 #. module: account
-#: code:addons/account/account.py:1049
+#: code:addons/account/account.py:1058
 #, python-format
 msgid ""
 "This journal already contains items for this period, therefore you cannot "
@@ -2168,7 +2177,7 @@ msgid "Analytic account"
 msgstr "辅助核算项"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_bank_statement.py:406
 #, python-format
 msgid "Please verify that an account is defined in the journal."
 msgstr "请检查在账簿中已定义科目。"
@@ -2573,7 +2582,7 @@ msgid "Create an Account Based on this Template"
 msgstr "基于此模板创建科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:901
+#: code:addons/account/account_invoice.py:930
 #, python-format
 msgid ""
 "Cannot create the invoice.\n"
@@ -2594,7 +2603,7 @@ msgid "Main Sequence"
 msgstr "主序列"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_bank_statement.py:478
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2618,7 +2627,7 @@ msgid "Fiscal Positions"
 msgstr "财务结构"
 
 #. module: account
-#: code:addons/account/account_move_line.py:578
+#: code:addons/account/account_move_line.py:579
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
 msgstr "你不能在关闭的科目%s %s 上面创建分类账分录。"
@@ -2726,7 +2735,7 @@ msgid "Account Model Entries"
 msgstr "凭证模板"
 
 #. module: account
-#: code:addons/account/account.py:3164
+#: code:addons/account/account.py:3202
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2840,21 +2849,20 @@ msgid "Accounts"
 msgstr "科目"
 
 #. module: account
-#: code:addons/account/account.py:3503
-#: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:378
-#: code:addons/account/account_invoice.py:484
-#: code:addons/account/account_invoice.py:582
-#: code:addons/account/account_invoice.py:597
-#: code:addons/account/account_invoice.py:605
-#: code:addons/account/account_invoice.py:627
-#: code:addons/account/account_move_line.py:535
+#: code:addons/account/account.py:3541
+#: code:addons/account/account_bank_statement.py:405
+#: code:addons/account/account_invoice.py:504
+#: code:addons/account/account_invoice.py:606
+#: code:addons/account/account_invoice.py:621
+#: code:addons/account/account_invoice.py:629
+#: code:addons/account/account_invoice.py:654
+#: code:addons/account/account_move_line.py:536
 #, python-format
 msgid "Configuration Error!"
 msgstr "设置错误!"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:433
+#: code:addons/account/account_bank_statement.py:434
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
 msgstr "对账单 %s 确认，分类账目 被创建."
@@ -3050,7 +3058,7 @@ msgid ""
 msgstr "选择的发票不能被确认，因为它们不是“草稿”或者“形式发票”状态"
 
 #. module: account
-#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1071
 #, python-format
 msgid "You should choose the periods that belong to the same company."
 msgstr "你要选择属于同一个公司的会计区间"
@@ -3063,7 +3071,7 @@ msgid "Sales by Account"
 msgstr "销售科目"
 
 #. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
 msgstr "你不能删除已经登帐的分类账分录\"%s\"."
@@ -3079,8 +3087,8 @@ msgid "Sale journal"
 msgstr "销售分类帐"
 
 #. module: account
-#: code:addons/account/account.py:2308
-#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account.py:2346
+#: code:addons/account/account_invoice.py:772
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -3239,7 +3247,7 @@ msgid "Fiscal Position"
 msgstr "财务结构"
 
 #. module: account
-#: code:addons/account/account_invoice.py:791
+#: code:addons/account/account_invoice.py:820
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3335,7 +3343,7 @@ msgstr ""
 "将选择要兑换货币的当前汇率。在大多数国家法定为“平均”，但只有少数软件系统能够管理。 所以如果你要导入另一个软件系统，你可能需要使用当日汇率。"
 
 #. module: account
-#: code:addons/account/account.py:2640
+#: code:addons/account/account.py:2678
 #, python-format
 msgid "There is no parent code for the template account."
 msgstr "模版科目没有上级代码"
@@ -3398,7 +3406,7 @@ msgid "View"
 msgstr "视图"
 
 #. module: account
-#: code:addons/account/account.py:3422
+#: code:addons/account/account.py:3460
 #: code:addons/account/account_bank.py:95
 #, python-format
 msgid "BNK"
@@ -3660,7 +3668,7 @@ msgid ""
 msgstr "如果您指定其它名称，它创建的凭证或分录将用报表名相同的名称。这使得报表它自己关联相似的分录。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:984
+#: code:addons/account/account_invoice.py:1013
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralized journal. Uncheck the "
@@ -3675,7 +3683,7 @@ msgid "Starting Balance"
 msgstr "期初余额"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1434
+#: code:addons/account/account_invoice.py:1462
 #, python-format
 msgid "No Partner Defined !"
 msgstr "未定义业务伙伴！"
@@ -3727,7 +3735,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:535
+#: code:addons/account/account_move_line.py:536
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -3875,7 +3883,7 @@ msgid "Period Length (days)"
 msgstr "期间（天数）"
 
 #. module: account
-#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1363
 #, python-format
 msgid ""
 "You cannot modify a posted entry of this journal.\n"
@@ -4035,7 +4043,7 @@ msgid "Chart of Accounts Template"
 msgstr "科目一览表模板"
 
 #. module: account
-#: code:addons/account/account.py:2320
+#: code:addons/account/account.py:2358
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -4200,7 +4208,7 @@ msgid "Name"
 msgstr "名称"
 
 #. module: account
-#: code:addons/account/installer.py:94
+#: code:addons/account/installer.py:115
 #, python-format
 msgid "No unconfigured company !"
 msgstr "还没有配置好公司"
@@ -4271,8 +4279,8 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1061
-#: code:addons/account/account_move_line.py:1146
+#: code:addons/account/account_move_line.py:1058
+#: code:addons/account/account_move_line.py:1143
 #, python-format
 msgid "You cannot use an inactive account."
 msgstr ""
@@ -4302,7 +4310,7 @@ msgid "Consolidated Children"
 msgstr "合并子科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:570
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
@@ -4506,7 +4514,7 @@ msgid "Cancel the Selected Invoices"
 msgstr "取消选定的发票"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:423
+#: code:addons/account/account_bank_statement.py:424
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
 msgstr "必须分配一个辅助核算账簿给\"%s\"账簿"
@@ -4571,8 +4579,8 @@ msgid "Supplier invoice sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:583
-#: code:addons/account/account_invoice.py:598
+#: code:addons/account/account_invoice.py:607
+#: code:addons/account/account_invoice.py:622
 #, python-format
 msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
@@ -4635,7 +4643,7 @@ msgid "Account Base Code"
 msgstr "税基编码"
 
 #. module: account
-#: code:addons/account/account_move_line.py:867
+#: code:addons/account/account_move_line.py:864
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
@@ -4701,7 +4709,7 @@ msgid "Statement from invoice or payment"
 msgstr "发票或付款清单"
 
 #. module: account
-#: code:addons/account/installer.py:94
+#: code:addons/account/installer.py:115
 #, python-format
 msgid ""
 "There is currently no company without chart of account. The wizard will "
@@ -4755,7 +4763,7 @@ msgid "Bank statements are entered in the system."
 msgstr "把银行对账单输入到系统中。"
 
 #. module: account
-#: code:addons/account/wizard/account_reconcile.py:121
+#: code:addons/account/wizard/account_reconcile.py:122
 #, python-format
 msgid "Reconcile Writeoff"
 msgstr "补差额时核销"
@@ -4845,7 +4853,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:627
+#: code:addons/account/account_invoice.py:655
 #, python-format
 msgid ""
 "Cannot find any account journal of %s type for this company.\n"
@@ -4860,7 +4868,7 @@ msgid "Based On"
 msgstr "基于"
 
 #. module: account
-#: code:addons/account/account.py:3166
+#: code:addons/account/account.py:3204
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -4926,7 +4934,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3356
+#: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "采购税 %.2f%%"
@@ -5000,7 +5008,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3167
+#: code:addons/account/account.py:3205
 #, python-format
 msgid "MISC"
 msgstr "杂项"
@@ -5169,7 +5177,7 @@ msgid "Tax Application"
 msgstr "税适用"
 
 #. module: account
-#: code:addons/account/account_invoice.py:890
+#: code:addons/account/account_invoice.py:919
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -5341,7 +5349,7 @@ msgid "Target Moves"
 msgstr "目标"
 
 #. module: account
-#: code:addons/account/account.py:1416
+#: code:addons/account/account.py:1454
 #, python-format
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
@@ -5422,7 +5430,7 @@ msgid "Internal Name"
 msgstr "内部名称"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1188
+#: code:addons/account/account_move_line.py:1185
 #, python-format
 msgid ""
 "Cannot create an automatic sequence for this piece.\n"
@@ -5494,7 +5502,7 @@ msgid "Compute Code (if type=code)"
 msgstr "计算代码(如果类型=代码)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:485
+#: code:addons/account/account_invoice.py:505
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
@@ -5622,7 +5630,7 @@ msgid "Recompute taxes and total"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1116
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
@@ -5650,7 +5658,7 @@ msgid "Amount Computation"
 msgstr "计算金额"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1108
+#: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
@@ -5945,7 +5953,7 @@ msgid "Fixed Amount"
 msgstr "固定金额"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1059
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr "你不能修改税，你需要删去并且重建这一行"
@@ -5996,14 +6004,14 @@ msgid "Child Accounts"
 msgstr "子科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1120
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "会计凭证号 (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:882
+#: code:addons/account/account_move_line.py:879
 #, python-format
 msgid "Write-Off"
 msgstr "补差额"
@@ -6029,7 +6037,7 @@ msgstr "收入"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:355
+#: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "Supplier"
 msgstr "供应商"
@@ -6163,7 +6171,7 @@ msgid "Filter by"
 msgstr "筛选"
 
 #. module: account
-#: code:addons/account/account.py:2296
+#: code:addons/account/account.py:2334
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "模型中存在错误的表达式 \"%(...)s\""
@@ -6211,7 +6219,7 @@ msgid "Number of Days"
 msgstr "天数"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1357
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -6357,7 +6365,7 @@ msgid "Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1091
+#: code:addons/account/account_invoice.py:1121
 #, python-format
 msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
@@ -6529,7 +6537,7 @@ msgid "You cannot create journal items on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:606
+#: code:addons/account/account_invoice.py:630
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
@@ -6550,7 +6558,7 @@ msgid "The related account currency if not equal to the company one."
 msgstr "如果不是同一公司, 相关科目的币别"
 
 #. module: account
-#: code:addons/account/installer.py:48
+#: code:addons/account/installer.py:69
 #, python-format
 msgid "Custom"
 msgstr ""
@@ -6577,7 +6585,7 @@ msgid "Internal Transfers Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/pos_box.py:33
+#: code:addons/account/wizard/pos_box.py:32
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
 msgstr ""
@@ -6603,7 +6611,7 @@ msgid "Power"
 msgstr "强制"
 
 #. module: account
-#: code:addons/account/account.py:3427
+#: code:addons/account/account.py:3465
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "不能生成一个未使用的凭证代码。"
@@ -6674,12 +6682,12 @@ msgid ""
 msgstr "序列字段用于税从低到高排序, 如果税中有子税这排序是重要的"
 
 #. module: account
-#: code:addons/account/account.py:1410
-#: code:addons/account/account.py:1415
-#: code:addons/account/account.py:1444
-#: code:addons/account/account.py:1451
-#: code:addons/account/account_invoice.py:983
-#: code:addons/account/account_move_line.py:1008
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1453
+#: code:addons/account/account.py:1482
+#: code:addons/account/account.py:1489
+#: code:addons/account/account_invoice.py:1012
+#: code:addons/account/account_move_line.py:1005
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #: code:addons/account/wizard/account_fiscalyear_close.py:99
@@ -6757,7 +6765,9 @@ msgstr "你不能修改已经存在凭证的公司帐户。"
 #: report:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1157
 #: selection:report.invoice.created,type:0
+#, python-format
 msgid "Supplier Refund"
 msgstr "供应商红字发票"
 
@@ -6900,7 +6910,7 @@ msgstr "辅助核算统计"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:958
+#: code:addons/account/account_move_line.py:955
 #, python-format
 msgid "Entries: "
 msgstr "凭证： "
@@ -7009,7 +7019,7 @@ msgstr ""
 
 #. module: account
 #: code:addons/account/account.py:1024
-#: code:addons/account/account_move_line.py:1108
+#: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "Error !"
 msgstr "错误！"
@@ -7231,7 +7241,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2266
+#: code:addons/account/account.py:2304
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7309,7 +7319,7 @@ msgid "Done"
 msgstr "完成"
 
 #. module: account
-#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1319
 #, python-format
 msgid ""
 "You cannot validate a non-balanced entry.\n"
@@ -7596,7 +7606,7 @@ msgstr "报表"
 
 #. module: account
 #. openerp-web
-#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:780
 #: code:addons/account/static/src/js/account_move_reconciliation.js:90
 #, python-format
 msgid "Warning"
@@ -7659,7 +7669,7 @@ msgid "Use model"
 msgstr "使用模型"
 
 #. module: account
-#: code:addons/account/account.py:1452
+#: code:addons/account/account.py:1490
 #, python-format
 msgid ""
 "There is no default credit account defined \n"
@@ -7710,7 +7720,7 @@ msgid "Root/View"
 msgstr "根/视图"
 
 #. module: account
-#: code:addons/account/account.py:3168
+#: code:addons/account/account.py:3206
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7777,7 +7787,7 @@ msgid "Maturity Date"
 msgstr "到期日期"
 
 #. module: account
-#: code:addons/account/account.py:3155
+#: code:addons/account/account.py:3193
 #, python-format
 msgid "Sales Journal"
 msgstr "销售账簿"
@@ -7788,7 +7798,7 @@ msgid "Invoice Tax"
 msgstr "发票税"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1188
+#: code:addons/account/account_move_line.py:1185
 #, python-format
 msgid "No piece number !"
 msgstr "没会计期间!"
@@ -7829,7 +7839,7 @@ msgid "Sales Properties"
 msgstr "销售属性"
 
 #. module: account
-#: code:addons/account/account.py:3503
+#: code:addons/account/account.py:3541
 #, python-format
 msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
@@ -7854,7 +7864,7 @@ msgstr "到"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1503
+#: code:addons/account/account.py:1541
 #, python-format
 msgid "Currency Adjustment"
 msgstr "汇兑损益调整"
@@ -7886,7 +7896,7 @@ msgid "May"
 msgstr "5"
 
 #. module: account
-#: code:addons/account/account_invoice.py:788
+#: code:addons/account/account_invoice.py:817
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "定义了全局税，但发票行中没有！"
@@ -7927,7 +7937,7 @@ msgstr "登账"
 #: view:account.config.settings:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:353
+#: code:addons/account/account_invoice.py:385
 #, python-format
 msgid "Customer"
 msgstr "客户"
@@ -7943,7 +7953,7 @@ msgstr "报表名称"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3054
+#: code:addons/account/account.py:3092
 #, python-format
 msgid "Cash"
 msgstr "现金"
@@ -8107,6 +8117,7 @@ msgstr "固定"
 #: code:addons/account/account.py:653
 #: code:addons/account/account.py:656
 #: code:addons/account/account.py:668
+#: code:addons/account/account.py:1031
 #, python-format
 msgid "Warning !"
 msgstr "警告 !"
@@ -8174,7 +8185,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "在发票上选择合适的币别"
 
 #. module: account
-#: code:addons/account/account_invoice.py:869
+#: code:addons/account/account_invoice.py:898
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "没有发票明细"
@@ -8197,7 +8208,7 @@ msgid "Tax Use In"
 msgstr "税用在"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:381
+#: code:addons/account/account_bank_statement.py:382
 #, python-format
 msgid ""
 "The statement balance is incorrect !\n"
@@ -8207,7 +8218,7 @@ msgstr ""
 "预期的余额是(%.2f)，现在算出来的是(%.2f)"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:419
+#: code:addons/account/account_bank_statement.py:420
 #, python-format
 msgid "The account entries lines are not in valid state."
 msgstr "这分录明细不是在有效的状态"
@@ -8251,7 +8262,7 @@ msgid "Associated Partner"
 msgstr "相关业务伙伴"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1434
+#: code:addons/account/account_invoice.py:1462
 #, python-format
 msgid "You must first select a partner !"
 msgstr "你必须首先选择一个业务伙伴!"
@@ -8330,13 +8341,13 @@ msgid ""
 msgstr "如果在计算未来的税前这税额必须包含在税基金额里，请设置"
 
 #. module: account
-#: code:addons/account/account.py:3158
+#: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "采购红字发票账簿"
 
 #. module: account
-#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1333
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr ""
@@ -8579,7 +8590,7 @@ msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1213
+#: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -8682,7 +8693,7 @@ msgid "The partner account used for this invoice."
 msgstr "这发票用这业务伙伴科目"
 
 #. module: account
-#: code:addons/account/account.py:3353
+#: code:addons/account/account.py:3391
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "税 %.2f%%"
@@ -8700,7 +8711,7 @@ msgid "Payment Term Line"
 msgstr "付款条款明细"
 
 #. module: account
-#: code:addons/account/account.py:3156
+#: code:addons/account/account.py:3194
 #, python-format
 msgid "Purchase Journal"
 msgstr "采购账簿"
@@ -8869,7 +8880,7 @@ msgid "Journal Name"
 msgstr "账簿名称"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:829
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "凭证\"%s\"无效！"
@@ -8917,7 +8928,7 @@ msgid ""
 msgstr "如果它是一个多货币凭证,这金额表示一个可选的其它货币金额."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1009
+#: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
 msgstr ""
@@ -8978,7 +8989,7 @@ msgid "Reconciled entries"
 msgstr "核销分录"
 
 #. module: account
-#: code:addons/account/account.py:2296
+#: code:addons/account/account.py:2334
 #, python-format
 msgid "Wrong model !"
 msgstr "模型有误！"
@@ -9000,7 +9011,7 @@ msgid "Print Account Partner Balance"
 msgstr "打印业务伙伴余额"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1121
 #, python-format
 msgid ""
 "You cannot do this modification on a reconciled entry. You can just change "
@@ -9036,7 +9047,7 @@ msgstr "未知的"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3160
+#: code:addons/account/account.py:3198
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "账簿的开账分录"
@@ -9131,7 +9142,7 @@ msgid "Unit of Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3157
+#: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "销售红字发票账簿"
@@ -9197,13 +9208,13 @@ msgid "Purchase Tax(%)"
 msgstr "进项税(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:869
+#: code:addons/account/account_invoice.py:898
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "请创建发票明细。"
 
 #. module: account
-#: code:addons/account/wizard/pos_box.py:37
+#: code:addons/account/wizard/pos_box.py:36
 #, python-format
 msgid ""
 "Please check that the field 'Internal Transfers Account' is set on the "
@@ -9216,7 +9227,7 @@ msgid "Display Detail"
 msgstr "显示明细"
 
 #. module: account
-#: code:addons/account/account.py:3165
+#: code:addons/account/account.py:3203
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9375,8 +9386,8 @@ msgid "Receivable Account"
 msgstr "应收款科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:774
-#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
@@ -9477,7 +9488,7 @@ msgid "Move"
 msgstr "凭证"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_bank_statement.py:478
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
@@ -9571,7 +9582,7 @@ msgid "Balance :"
 msgstr "余额:"
 
 #. module: account
-#: code:addons/account/account.py:1549
+#: code:addons/account/account.py:1587
 #, python-format
 msgid "Cannot create moves for different companies."
 msgstr ""
@@ -9662,7 +9673,7 @@ msgid "Immediate Payment"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1464
+#: code:addons/account/account.py:1502
 #, python-format
 msgid " Centralisation"
 msgstr ""
@@ -9753,7 +9764,7 @@ msgid "Unreconciled"
 msgstr "反核销"
 
 #. module: account
-#: code:addons/account/account_invoice.py:890
+#: code:addons/account/account_invoice.py:919
 #, python-format
 msgid "Bad total !"
 msgstr "坏的合计!"
@@ -9840,7 +9851,7 @@ msgid "Comparison"
 msgstr "比较"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1119
 #, python-format
 msgid ""
 "You cannot do this modification on a confirmed entry. You can just change "
@@ -9927,7 +9938,7 @@ msgid "Journal Entry Model"
 msgstr "账簿分录模型"
 
 #. module: account
-#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1073
 #, python-format
 msgid "Start period should precede then end period."
 msgstr ""
@@ -9936,7 +9947,7 @@ msgstr ""
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr "凭证号"
+msgstr "编号"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -10341,7 +10352,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1059
+#: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "Unable to change tax!"
 msgstr ""
@@ -10410,8 +10421,10 @@ msgstr "财务结构"
 #: view:account.invoice:0
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
+#: code:addons/account/account_invoice.py:1155
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 #: selection:report.invoice.created,type:0
+#, python-format
 msgid "Supplier Invoice"
 msgstr "供应商发票"
 
@@ -10594,7 +10607,7 @@ msgid "Entries Sorted by"
 msgstr "排序依据："
 
 #. module: account
-#: code:addons/account/account_invoice.py:1515
+#: code:addons/account/account_invoice.py:1543
 #, python-format
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
@@ -10675,6 +10688,8 @@ msgstr "搜索发票"
 #: report:account.invoice:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
+#: code:addons/account/account_invoice.py:1156
+#, python-format
 msgid "Refund"
 msgstr "红字发票"
 
@@ -10745,7 +10760,7 @@ msgid "Manual Invoice Taxes"
 msgstr "手动的发票税(非主营业务纳税)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:550
+#: code:addons/account/account_invoice.py:570
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr "供应商付款条件没有包含付款条件行"
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 537371d0f64..961b8f9e763 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -111,7 +111,7 @@ class account_installer(osv.osv_memory):
     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 = {}
diff --git a/addons/account/partner.py b/addons/account/partner.py
index f582da6b765..a7df31b2f32 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -189,44 +189,34 @@ class res_partner(osv.osv):
         'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."),
         'debit_limit': fields.float('Payable Limit'),
         'property_account_payable': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Account Payable",
-            view_load=True,
             domain="[('type', '=', 'payable')]",
             help="This account will be used instead of the default one as the payable account for the current partner",
             required=True),
         'property_account_receivable': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Account Receivable",
-            view_load=True,
             domain="[('type', '=', 'receivable')]",
             help="This account will be used instead of the default one as the receivable account for the current partner",
             required=True),
         'property_account_position': fields.property(
-            'account.fiscal.position',
             type='many2one',
             relation='account.fiscal.position',
             string="Fiscal Position",
-            view_load=True,
             help="The fiscal position will determine taxes and accounts used for the partner.",
         ),
         'property_payment_term': fields.property(
-            'account.payment.term',
             type='many2one',
             relation='account.payment.term',
             string ='Customer Payment Term',
-            view_load=True,
             help="This payment term will be used instead of the default one for sale orders and customer invoices"),
         'property_supplier_payment_term': fields.property(
-            'account.payment.term',
              type='many2one',
              relation='account.payment.term',
              string ='Supplier Payment Term',
-             view_load=True,
              help="This payment term will be used instead of the default one for purchase orders and supplier invoices"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 3dcc68e315e..6a58bc7f77e 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -61,7 +61,7 @@
             <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="priority" eval="20"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action" string="Invoices" 
@@ -96,7 +96,7 @@
             <field name="priority">2</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <page string="History" position="before" version="7.0">
+                <page name="sales_purchases" position="after" version="7.0">
                 <page string="Accounting" col="4" name="accounting" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
                     <group>
                         <group>
diff --git a/addons/account/product.py b/addons/account/product.py
index 3df3ad9bd17..b7bffee43a9 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -25,18 +25,14 @@ class product_category(osv.osv):
     _inherit = "product.category"
     _columns = {
         'property_account_income_categ': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Income Account",
-            view_load=True,
             help="This account will be used for invoices to value sales."),
         'property_account_expense_categ': fields.property(
-            'account.account',  
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            view_load=True,
             help="This account will be used for invoices to value expenses."),
     }
 
@@ -54,18 +50,14 @@ class product_template(osv.osv):
             'product_supplier_taxes_rel', 'prod_id', 'tax_id',
             'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])]),
         'property_account_income': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Income Account",
-            view_load=True,
             help="This account will be used for invoices instead of the default one to value sales for the current product."),
         'property_account_expense': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            view_load=True,
             help="This account will be used for invoices instead of the default one to value expenses for the current product."),
     }
 
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 6ce97b5c868..21ea2a85f7f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -363,7 +363,7 @@
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="arch" type="xml">
                 <field name="type" position="after">
-                    <field name="analytic_journal_id"/>
+                    <field name="analytic_journal_id" groups="analytic.group_analytic_accounting"/>
                 </field>
             </field>
         </record>
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 897b8366b7a..3b000e40592 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -366,12 +366,13 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
         return period or 0.0
 
     def _get_partners(self,data):
+        # TODO: deprecated, to remove in trunk
         if data['form']['result_selection'] == 'customer':
-            return 'Receivable Accounts'
+            return self._translate('Receivable Accounts')
         elif data['form']['result_selection'] == 'supplier':
-            return 'Payable Accounts'
+            return self._translate('Payable Accounts')
         elif data['form']['result_selection'] == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return self._translate('Receivable and Payable Accounts')
         return ''
 
 report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',
diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index fb79ab0d199..5b5404e9c86 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -147,7 +147,9 @@
           <para style="terp_default_Centre_8">[[ data['form']['period_length'] ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
+          <para style="terp_default_Centre_8">Receivable Accounts[[ data['form']['result_selection'] == 'customer' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Payable Accounts[[ data['form']['result_selection'] == 'supplier' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form']['result_selection'] == 'customer_supplier' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
@@ -166,7 +168,8 @@
           <para style="terp_tblheader_Details">Partners</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
+          <para style="terp_tblheader_Details_Right">Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_Details_Right">Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 88980a9cd97..6ddfc238bff 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -211,8 +211,10 @@
     </para>
     <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
       <tr>
-        <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
-        <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para>
+        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -233,7 +235,11 @@
         <td>
           <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
-          <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+          <td>
+          <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
+          </td>
         <td>  <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
           <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index 4ad086d6bd4..dce30e59918 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -220,8 +220,8 @@
     </blockTable>
       <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+      	<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]</para>
+      	<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
     	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and  get_filter(data) ]]</para></td>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 7ae5db98f20..c5d24343148 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -360,9 +360,8 @@
     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para>
-        </td>
+          <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -395,7 +394,9 @@
           <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
+          <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 769a8335f55..97e19be4b0c 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -189,11 +189,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         return data['form']['amount_currency']
 
     def _get_sortby(self, data):
+        # TODO: deprecated, to remove in trunk
         if self.sort_selection == 'date':
-            return 'Date'
+            return self._translate('Date')
         elif self.sort_selection == 'ref':
-            return 'Reference Number'
-        return 'Date'
+            return self._translate('Reference Number')
+        return self._translate('Date')
 
 report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
 report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index fb203d4e664..6d606ed1937 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -186,8 +186,8 @@
     </para>
     <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
       <tr>
-          <td><para style="terp_tblheader_General_Centre">  [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
-              <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+          <td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para>
+              <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
           <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
           <td><para style="terp_tblheader_General_Centre">Journal</para></td>
           <td><para style="terp_tblheader_General_Centre">Period</para></td>
@@ -199,8 +199,10 @@
           <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
           <td><para style="terp_default_Centre_8">[[ o.journal_id.name  ]]</para></td>
           <td><para style="terp_default_Centre_8">[[ o.period_id.name ]] </para></td>
-          <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-          <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
+          <td>
+             <para style="terp_default_Centre_8">Date[[ data['form'].get('sort_selection', 'date') == 'date' and ' ' or removeParentNode('para') ]]</para>
+             <para style="terp_default_Centre_8">Reference Number[[ data['form'].get('sort_selection', 'date') == 'ref' and ' ' or removeParentNode('para') ]]</para>
+          </td>
       </tr>
     </blockTable>
     <para style="P9">
diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml
index 236879669f9..3ee0b484c9a 100644
--- a/addons/account/report/account_journal_sale_purchase.rml
+++ b/addons/account/report/account_journal_sale_purchase.rml
@@ -239,7 +239,7 @@
             <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
             <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,15) ]]</para></td>
             <td><para style="terp_default_8">[[ strip_name(line.name,25) ]]</para></td>
-            <td><para style="P8">[[ line.tax_code_id and (line.tax_code_id.code + ':') ]]</para></td>
+            <td><para style="P8">[[ line.tax_code_id and line.tax_code_id.code and (line.tax_code_id.code + ':') ]]</para></td>
             <td><para style="terp_default_8">[[ line.tax_amount and formatLang(line.tax_amount, currency_obj=company.currency_id) ]]</para></td>
             <td><para style="P8">[[ formatLang(line.debit, currency_obj=company.currency_id) ]]</para></td>
             <td><para style="P8">[[ formatLang(line.credit, currency_obj=company.currency_id) ]]</para></td>
@@ -292,7 +292,7 @@
            <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
            <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,12) ]]</para></td>
            <td><para style="terp_default_8">[[ strip_name(line.name,16) ]]</para></td>
-           <td><para style="terp_default_8">[[ line.tax_code_id and (line.tax_code_id.code + ':') ]]</para></td>
+           <td><para style="terp_default_8">[[ line.tax_code_id and line.tax_code_id.code and (line.tax_code_id.code + ':') ]]</para></td>
            <td><para style="P8">[[ line.tax_amount and formatLang(line.tax_amount, currency_obj=company.currency_id) ]]</para></td>
            <td><para style="P8">[[ formatLang(line.debit, currency_obj=company.currency_id) ]]</para></td>
            <td><para style="P8">[[ formatLang(line.credit, currency_obj=company.currency_id) ]]</para></td>
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 21c1ee3d846..d21323e02fc 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -267,12 +267,13 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
         return result_tmp  + result_init
 
     def _get_partners(self):
+        # TODO: deprecated, to remove in trunk
         if self.result_selection == 'customer':
-            return 'Receivable Accounts'
+            return _('Receivable Accounts')
         elif self.result_selection == 'supplier':
-            return 'Payable Accounts'
+            return _('Payable Accounts')
         elif self.result_selection == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return _('Receivable and Payable Accounts')
         return ''
 
     def _sum_currency_amount_account(self, account, form):
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 0d7122369c6..48ed6d4afe3 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -423,7 +423,9 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
+          <para style="terp_default_Centre_8">Receivable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'supplier' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer_supplier' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 89d238b16e9..8ab93c2fcbb 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -25,7 +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 import DEFAULT_SERVER_DATE_FORMAT as DF
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 from openerp import tools
diff --git a/addons/account/html/account_illu_01.png b/addons/account/static/description/account_illu_01.png
similarity index 100%
rename from addons/account/html/account_illu_01.png
rename to addons/account/static/description/account_illu_01.png
diff --git a/addons/account/html/account_illu_02.png b/addons/account/static/description/account_illu_02.png
similarity index 100%
rename from addons/account/html/account_illu_02.png
rename to addons/account/static/description/account_illu_02.png
diff --git a/addons/account/html/account_illu_03.png b/addons/account/static/description/account_illu_03.png
similarity index 100%
rename from addons/account/html/account_illu_03.png
rename to addons/account/static/description/account_illu_03.png
diff --git a/addons/account/html/account_sc_00.png b/addons/account/static/description/account_sc_00.png
similarity index 100%
rename from addons/account/html/account_sc_00.png
rename to addons/account/static/description/account_sc_00.png
diff --git a/addons/account/html/account_sc_01.png b/addons/account/static/description/account_sc_01.png
similarity index 100%
rename from addons/account/html/account_sc_01.png
rename to addons/account/static/description/account_sc_01.png
diff --git a/addons/account/html/account_sc_02.png b/addons/account/static/description/account_sc_02.png
similarity index 100%
rename from addons/account/html/account_sc_02.png
rename to addons/account/static/description/account_sc_02.png
diff --git a/addons/account/html/account_sc_03.png b/addons/account/static/description/account_sc_03.png
similarity index 100%
rename from addons/account/html/account_sc_03.png
rename to addons/account/static/description/account_sc_03.png
diff --git a/addons/account/html/account_sc_04.png b/addons/account/static/description/account_sc_04.png
similarity index 100%
rename from addons/account/html/account_sc_04.png
rename to addons/account/static/description/account_sc_04.png
diff --git a/addons/account/html/account_sc_05.png b/addons/account/static/description/account_sc_05.png
similarity index 100%
rename from addons/account/html/account_sc_05.png
rename to addons/account/static/description/account_sc_05.png
diff --git a/addons/account/html/account_sc_06.png b/addons/account/static/description/account_sc_06.png
similarity index 100%
rename from addons/account/html/account_sc_06.png
rename to addons/account/static/description/account_sc_06.png
diff --git a/addons/account/html/index.html b/addons/account/static/description/index.html
similarity index 98%
rename from addons/account/html/index.html
rename to addons/account/static/description/index.html
index 09a58fb3246..d9b26f11d16 100644
--- a/addons/account/html/index.html
+++ b/addons/account/static/description/index.html
@@ -17,7 +17,7 @@ By far the most beautiful and full featured accounting software. OpenERP Account
 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>
+                <a href="http://www.openerp.com/start?app=account" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/account/html/sc00.png b/addons/account/static/description/sc00.png
similarity index 100%
rename from addons/account/html/sc00.png
rename to addons/account/static/description/sc00.png
diff --git a/addons/account/html/testimonial_sunil.jpg b/addons/account/static/description/testimonial_sunil.jpg
similarity index 100%
rename from addons/account/html/testimonial_sunil.jpg
rename to addons/account/static/description/testimonial_sunil.jpg
diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
index 997b2b03bb6..0b904e19da6 100644
--- a/addons/account/static/src/js/account_move_line_quickadd.js
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -84,7 +84,7 @@ openerp.account.quickadd = function (instance) {
         },
         search_by_journal_period: function() {
             var self = this;
-            var domain = [];
+            var domain = ['|',['debit', '!=', 0], ['credit', '!=', 0]];
             if (self.current_journal !== null) domain.push(["journal_id", "=", self.current_journal]);
             if (self.current_period !== null) domain.push(["period_id", "=", self.current_period]);
             self.last_context["journal_id"] = self.current_journal === null ? false : self.current_journal;
diff --git a/addons/account/test/account_bank_statement.yml b/addons/account/test/account_bank_statement.yml
index 3711cff4d56..28828e0e3ea 100644
--- a/addons/account/test/account_bank_statement.yml
+++ b/addons/account/test/account_bank_statement.yml
@@ -67,9 +67,10 @@
   Then I cancel Bank Statements and verifies that it raises a warning
 -
   !python {model: account.bank.statement}: |
+    from openerp.osv import osv
     try:
       self.button_cancel(cr, uid, [ref("account_bank_statement_0")])
       assert False, "An exception should have been raised, the journal should not let us cancel moves!" 
-    except Exception:
+    except osv.except_osv:
       # exception was raised as expected, as the journal does not allow cancelling moves
       pass
diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index 02c3d367050..2232b8dc00e 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -73,14 +73,16 @@
   I cancel the account move which is in posted state and verifies that it gives warning message
 -
   !python {model: account.move}: |
+    from openerp.osv import osv
     inv_obj = self.pool.get('account.invoice')
     inv = inv_obj.browse(cr, uid, ref('account_invoice_supplier0'))
     try:
       mov_cancel = self.button_cancel(cr, uid, [inv.move_id.id], {'lang': u'en_US', 'tz': False,
         'active_model': 'ir.ui.menu', 'journal_type': 'purchase', 'active_ids': [ref('menu_action_invoice_tree2')],
         'type': 'in_invoice', 'active_id': ref('menu_action_invoice_tree2')})
-    except Exception, e:
-      assert e, 'Warning message has not been raised'
+      assert False, "This should never happen!"
+    except osv.except_osv:
+      pass
 -
   I verify that 'Period Sum' and 'Year sum' of the tax code are the expected values 
 -
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 6ceb833816b..928f0647084 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -38,7 +38,7 @@ class account_fiscalyear_close(osv.osv_memory):
        'report_name': fields.char('Name of new entries',size=64, required=True, help="Give name of the new entries"),
     }
     _defaults = {
-        'report_name': _('End of Fiscal Year Entry'),
+        'report_name': lambda self, cr, uid, context: _('End of Fiscal Year Entry'),
     }
 
     def data_save(self, cr, uid, ids, context=None):
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index 77ebf02570f..be1d710c09d 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -11,7 +11,8 @@
                     <separator string="Aged Partner Balance"/>
                     <label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
                     <group col="4">
-                        <field name="chart_account_id" widget='selection'/>
+                        <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
+                        <field name="fiscalyear_id" invisible="1"/>
                         <newline/>
                         <field name="date_from"/>
                         <field name="period_length"/>
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index c457140684a..b8dc562f3a0 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -34,7 +34,10 @@ class account_common_report(osv.osv_memory):
         res = {}
         if chart_account_id:
             company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
-            res['value'] = {'company_id': company_id}
+            now = time.strftime('%Y-%m-%d')
+            domain = [('company_id', '=', company_id), ('date_start', '<', now), ('date_stop', '>', now)]
+            fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, domain, limit=1)
+            res['value'] = {'company_id': company_id, 'fiscalyear_id': fiscalyears and fiscalyears[0] or False}
         return res
 
     _columns = {
@@ -124,10 +127,11 @@ class account_common_report(osv.osv_memory):
         now = time.strftime('%Y-%m-%d')
         company_id = False
         ids = context.get('active_ids', [])
-        domain = [('date_start', '<', now), ('date_stop', '>', now)]
         if ids and context.get('active_model') == 'account.account':
             company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id
-            domain += [('company_id', '=', company_id)]
+        else:  # use current company id
+            company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        domain = [('company_id', '=', company_id), ('date_start', '<', now), ('date_stop', '>', now)]
         fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, domain, limit=1)
         return fiscalyears and fiscalyears[0] or False
 
@@ -175,7 +179,7 @@ class account_common_report(osv.osv_memory):
                 data['form'][field] = data['form'][field][0]
         used_context = self._build_contexts(cr, uid, ids, data, context=context)
         data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
-        data['form']['used_context'] = used_context
+        data['form']['used_context'] = dict(used_context, lang=context.get('lang', 'en_US'))
         return self._print_report(cr, uid, ids, data, context=context)
 
 
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index 324248284f1..050191db187 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -57,7 +57,7 @@ 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'}
 
diff --git a/addons/account_accountant/i18n/ja.po b/addons/account_accountant/i18n/ja.po
index 9e2208e06cd..1da9c374c7f 100644
--- a/addons/account_accountant/i18n/ja.po
+++ b/addons/account_accountant/i18n/ja.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-21 17:04+0000\n"
-"PO-Revision-Date: 2012-04-13 22:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-07-30 22:25+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@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-07-31 05:16+0000\n"
+"X-Generator: Launchpad (build 16718)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "会計メニューを開く"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/static/src/img/icon.png b/addons/account_accountant/static/description/icon.png
similarity index 100%
rename from addons/account_accountant/static/src/img/icon.png
rename to addons/account_accountant/static/description/icon.png
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index e493f364a0e..7b21a4f1855 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -530,7 +530,7 @@ class account_analytic_account(osv.osv):
             context = {}
         sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','in',context.get('search_default_partner_id',False))])
         names = [record.name for record in self.browse(cr, uid, ids, context=context)]
-        name = _('Sales Order Lines of %s') % ','.join(names)
+        name = _('Sales Order Lines to Invoice of %s') % ','.join(names)
         return {
             'type': 'ir.actions.act_window',
             'name': name,
@@ -653,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/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 339d425c717..30313796af9 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -7,19 +7,19 @@ 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: 2013-05-31 07:35+0000\n"
+"PO-Revision-Date: 2013-06-19 13:43+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-06-01 05:16+0000\n"
-"X-Generator: Launchpad (build 16660)\n"
+"X-Launchpad-Export-Date: 2013-06-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16673)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "No order to invoice, create"
-msgstr ""
+msgstr "Нет заказа для счета, создать"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -39,7 +39,7 @@ msgstr "Остаётся"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "Незавершенные контракты"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -88,7 +88,7 @@ msgstr "Дата последнего счета расходов"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "Сумма предложений по этому контракту."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -98,18 +98,18 @@ msgstr "Итого сумма к оплате заказчику для этог
 #. module: account_analytic_analysis
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "Сумма позиций табеля выставленная в счет за этот контракт ."
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:466
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:464
 #, python-format
 msgid "Sales Order Lines of %s"
-msgstr ""
+msgstr "Позиции заказа продаж %s"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "Рассчитанный по формуле: Сумма по счетам / Итоговое время"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
@@ -126,7 +126,7 @@ msgstr "Партнёр"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr ""
+msgstr "Контракты, которые не назначены бухгалтеру."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -161,6 +161,7 @@ msgstr "Управляющий счётом"
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
 msgstr ""
+"Рассчитанный по формуле: Максимальное время - Всё время выставленное в счетах"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -170,12 +171,12 @@ msgstr "Ожидается"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Контракты не назначены"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Рассчитанный по формуле: теоретическая выручка - общие издержки"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -219,17 +220,17 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Нечего выставить в счете, создать"
 
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Обязательное использование шаблонов в контрактах"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Всё отработанное время"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -249,12 +250,12 @@ msgstr "Вычисляется по формуле: (Реальная маржа
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "или вид"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Customer Contracts"
-msgstr ""
+msgstr "Контакты заказчика"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -271,7 +272,7 @@ msgstr "Месяц"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Время и материалы в счет"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -343,9 +344,10 @@ msgstr "К продлению"
 #: view:account.analytic.account:0
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
-msgstr ""
+msgstr "Контракт в OpenERP это аналитический счет с установленным партнером."
 
 #. module: account_analytic_analysis
+#: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
 msgstr "Заказы продаж"
@@ -412,7 +414,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "Выручка за время (реальная)"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
@@ -578,7 +580,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr ""
+msgstr "Общая оценка"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.css b/addons/account_analytic_analysis/static/src/css/analytic.css
index f3e4785de9f..ccf14aa202c 100644
--- a/addons/account_analytic_analysis/static/src/css/analytic.css
+++ b/addons/account_analytic_analysis/static/src/css/analytic.css
@@ -13,6 +13,9 @@
   width: 250px;
   padding-left: 7px;
 }
+.openerp .oe_form table.oe_form_analytic_account th {
+  text-align: right; 
+}
 .openerp .oe_form table.oe_form_analytic_account .oe_timesheet_grey {
   background-color: #eeeeee;
   color: #404040;
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.sass b/addons/account_analytic_analysis/static/src/css/analytic.sass
index a7065e00f18..061d56d8324 100644
--- a/addons/account_analytic_analysis/static/src/css/analytic.sass
+++ b/addons/account_analytic_analysis/static/src/css/analytic.sass
@@ -12,6 +12,8 @@
             td.oe_timesheet_action
                 width: 250px
                 padding-left: 7px
+        th
+            text-align: right
         .oe_timesheet_grey
             background-color: #eeeeee
             color: #404040
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 1696874f0f5..563a6a3eb9a 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -72,8 +72,8 @@ class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
     _description = "Invoice Line"
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
-        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id=currency_id, context=context, company_id=company_id)
+    def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom_id, qty, name, type, partner_id, fposition_id, price_unit, currency_id=currency_id, context=context, company_id=company_id)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec:
             res_prod['value'].update({'account_analytic_id': rec.analytic_id.id})
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 54b15ad565b..4cf12098fff 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -332,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:
@@ -471,7 +471,7 @@ 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
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index be46b9a6923..42b17ae06c3 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -10,7 +10,7 @@
         <field name="inherit_id" ref="account.view_account_journal_form"/>
         <field name="arch" type="xml">
             <field name="centralisation" position="before">
-                <field name="plan_id" />
+                <field name="plan_id" groups="analytic.group_analytic_accounting"/>
             </field>
         </field>
     </record>
@@ -248,9 +248,12 @@
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
             <field name="arch" type="xml">
-                <field name="analytic_id" required="1" position="replace">
+                <xpath  expr="//field[@name='analytic_id']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath  expr="//field[@name='analytic_id']" position="after">
                     <field name="analytics_id" required="1"/>
-                </field>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 6482a110f1d..4fc15bba4f5 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -43,7 +43,8 @@ account.""",
     'depends': ['product', 'purchase'],
     'category': 'Accounting & Finance',
     'demo': [],
-    'data': ['product_view.xml',],
+    'data': ['product_view.xml'],
+    'test': ['test/anglo_saxon.yml', 'test/anglo_saxon_avg_fifo.yml'],
     'auto_install': False,
     'installable': True,
 }
diff --git a/addons/account_anglo_saxon/docs/account_anglo_saxon.ods b/addons/account_anglo_saxon/docs/account_anglo_saxon.ods
new file mode 100644
index 00000000000..91b1d84786d
Binary files /dev/null and b/addons/account_anglo_saxon/docs/account_anglo_saxon.ods differ
diff --git a/addons/account_anglo_saxon/docs/account_anglo_saxon.pdf b/addons/account_anglo_saxon/docs/account_anglo_saxon.pdf
new file mode 100644
index 00000000000..f5250a0c11c
Binary files /dev/null and b/addons/account_anglo_saxon/docs/account_anglo_saxon.pdf differ
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index 2b82257e1f0..8b31a48b92b 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -117,28 +117,34 @@ class account_invoice_line(osv.osv):
                         for line in res:
                             if a == line['account_id'] and i_line.product_id.id == line['product_id']:
                                 uom = i_line.product_id.uos_id or i_line.product_id.uom_id
-                                standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)
-                                if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
-                                    price_diff = i_line.price_unit - standard_price
-                                    line.update({'price':standard_price * line['quantity']})
+                                valuation_price_unit = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)
+                                if i_line.product_id.cost_method != 'standard' and i_line.purchase_line_id:
+                                    #for average/fifo/lifo costing method, fetch real cost price from incomming moves
+                                    stock_move_obj = self.pool.get('stock.move')
+                                    valuation_stock_move = stock_move_obj.search(cr, uid, [('purchase_line_id', '=', i_line.purchase_line_id.id)], limit=1, context=context)
+                                    if valuation_stock_move:
+                                        valuation_price_unit = stock_move_obj.browse(cr, uid, valuation_stock_move[0], context=context).price_unit
+                                if valuation_price_unit != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
+                                    price_diff = i_line.price_unit - valuation_price_unit
+                                    line.update({'price': valuation_price_unit * line['quantity']})
                                     diff_res.append({
-                                        'type':'src',
+                                        'type': 'src',
                                         'name': i_line.name[:64],
-                                        'price_unit':price_diff,
-                                        'quantity':line['quantity'],
+                                        'price_unit': price_diff,
+                                        'quantity': line['quantity'],
                                         'price': price_diff * line['quantity'],
-                                        'account_id':acc,
-                                        'product_id':line['product_id'],
-                                        'uos_id':line['uos_id'],
-                                        'account_analytic_id':line['account_analytic_id'],
-                                        'taxes':line.get('taxes',[]),
+                                        'account_id': acc,
+                                        'product_id': line['product_id'],
+                                        'uos_id': line['uos_id'],
+                                        'account_analytic_id': line['account_analytic_id'],
+                                        'taxes': line.get('taxes', []),
                                         })
                         res += diff_res
         return res
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+    def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
         fiscal_pool = self.pool.get('account.fiscal.position')
-        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context, company_id)
+        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom_id, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context, company_id)
         if not product:
             return res
         if type in ('in_invoice','in_refund'):
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
index b52d9ed3bbd..1c9e8ee3673 100644
--- a/addons/account_anglo_saxon/product.py
+++ b/addons/account_anglo_saxon/product.py
@@ -24,27 +24,21 @@ class product_category(osv.osv):
     _inherit = "product.category"
     _columns = {
         'property_account_creditor_price_difference_categ': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Price Difference Account",
-            view_load=True,
             help="This account will be used to value price difference between purchase price and cost price."),
 
         #Redefine fields to change help text for anglo saxon methodology.            
         'property_account_income_categ': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Income Account",
-            view_load=True,
             help="This account will be used to value outgoing stock using sale price."),
         'property_account_expense_categ': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            view_load=True,
             help="This account will be used to value outgoing stock using cost price."),
 
     }
@@ -53,27 +47,21 @@ class product_template(osv.osv):
     _inherit = "product.template"
     _columns = {
         'property_account_creditor_price_difference': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Price Difference Account",
-            view_load=True,
             help="This account will be used to value price difference between purchase price and cost price."),
             
         #Redefine fields to change help text for anglo saxon methodology.
         'property_account_income': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Income Account",
-            view_load=True,
             help="This account will be used to value outgoing stock using sale price."),
         'property_account_expense': fields.property(
-            'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            view_load=True,
             help="This account will be used to value outgoing stock using cost price."),
 
     }
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
index c10a2a97d80..fc36dab41c2 100644
--- a/addons/account_anglo_saxon/purchase.py
+++ b/addons/account_anglo_saxon/purchase.py
@@ -26,16 +26,15 @@ class purchase_order(osv.osv):
     _inherit = "purchase.order"
     _description = "Purchase Order"
 
-    def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
-        line = super(purchase_order, self)._prepare_inv_line(cr, uid, account_id, order_line, context=context)
+    def _choose_account_from_po_line(self, cr, uid, order_line, context=None):
+        account_id = super(purchase_order, self)._choose_account_from_po_line(cr, uid, order_line, context=context)
         if order_line.product_id and not order_line.product_id.type == 'service':
             acc_id = order_line.product_id.property_stock_account_input and order_line.product_id.property_stock_account_input.id
             if not acc_id:
                 acc_id = order_line.product_id.categ_id.property_stock_account_input_categ and order_line.product_id.categ_id.property_stock_account_input_categ.id
             if acc_id:
                 fpos = order_line.order_id.fiscal_position or False
-                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
+                account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
+        return account_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/test/anglo_saxon.yml b/addons/account_anglo_saxon/test/anglo_saxon.yml
new file mode 100644
index 00000000000..6e9ebc0068e
--- /dev/null
+++ b/addons/account_anglo_saxon/test/anglo_saxon.yml
@@ -0,0 +1,299 @@
+-
+  In order to test anglo_saxon Configure Different Accounts.
+-
+  !record {model: account.account, id: account_anglo_stock_valuation}:
+    code: X3000
+    name: Stock Valuation Account- (test)
+    parent_id: account.cas
+    type: other
+    user_type: account.data_account_type_asset
+-
+  Configure Stock Interim account (Received).
+-
+  !record {model: account.account, id: account_anglo_stock_input}:
+    code: X2800
+    name: Stock Interim account (Received)
+    parent_id: account.cos
+    type: other
+    user_type: account.data_account_type_expense
+-
+  Configure Stock Interim account (Delivered).
+-
+  !record {model: account.account, id: account_anglo_stock_output}:
+    code: X2801
+    name: Stock Interim account (Delivered)
+    parent_id: account.rev
+    type: other
+    user_type: account.data_account_type_income
+-
+  Configure Price difference creditor Account.
+-
+  !record {model: account.account, id: account_anglo_price_difference}:
+    code: X7095
+    name: Price difference creditor Account
+    parent_id: account.cos
+    type: other
+    user_type: account.data_account_type_expense
+-
+  Configure Cash Bank Account.
+-
+  !record {model: account.account, id: account_anglo_cash}:
+    code: X5000
+    name: Cash/Bank Account 
+    parent_id: account.cash  
+    type: other
+    user_type: account.data_account_type_asset
+-
+  Configure Creditor Account Payable. 
+-
+  !record {model: account.account, id: account_anglo_payable}:
+    code: X440001
+    name: Creditor Account Payable 
+    parent_id: account.a_pay  
+    type: other
+    user_type: account.data_account_type_payable
+-
+  Configure Debtor Account Receivable. 
+-
+  !record {model: account.account, id: account_anglo_receivable}:
+    code: X400001
+    name: Debtor Account Receivable 
+    parent_id: account.a_recv  
+    type: other
+    user_type: account.data_account_type_receivable
+-
+  Configure Cost of Good sale Account.
+-
+  !record {model: account.account, id: account_anglo_cogs}:
+    code: X7000
+    name: Cost of goods sale account
+    parent_id: account.o_expense
+    type: other
+    user_type: account.data_account_type_expense
+-
+  Configure Income Account.
+-
+  !record {model: account.account, id: account_anglo_income}:
+    code: X8000
+    name: Income Account
+    parent_id: account.o_income
+    type: other
+    user_type: account.data_account_type_income
+-
+  I configure the account receivable of supplier
+-
+  !record {model: res.partner, id: base.res_partner_3}:
+    property_account_payable: account_anglo_payable
+    property_account_receivable: account_anglo_receivable
+-
+  I configure the account receivable of Customer.
+-
+  !record {model: res.partner, id: base.res_partner_13}:
+    property_account_payable: account_anglo_payable
+    property_account_receivable: account_anglo_receivable
+-
+  I configure the product category with stock valuation account.
+-
+  !record {model: product.category, id: product.product_category_4}:
+    property_stock_valuation_account_id: account_anglo_stock_valuation
+-
+  I configure the product with required accounts, and cost method = standard
+-
+  !python {model: product.product}: |
+     self.write(cr, uid, [ref('product.product_product_3')], {'list_price': 20.00,'standard_price': 9,'categ_id': ref('product.product_category_4'),'valuation': 'real_time',
+      'property_account_income': ref('account_anglo_income'),'property_account_expense': ref('account_anglo_cogs'),
+      'property_account_creditor_price_difference': ref('account_anglo_price_difference'),'property_stock_account_input': ref('account_anglo_stock_input'),
+      'property_stock_account_output': ref('account_anglo_stock_output'), 'cost_method': 'standard'})
+-
+  I create a draft Purchase Order.
+-
+  !record {model: purchase.order, id: purchase_order_001}:
+    partner_id: base.res_partner_3
+    location_id: stock.stock_location_stock
+    pricelist_id: 1
+    order_line:
+      - product_id: product.product_product_3
+        product_qty: 1
+        price_unit: 10
+        date_planned: '2013-08-31'
+-
+  I confirm the purchase order.
+-
+  !workflow {model: purchase.order, ref: purchase_order_001, action: purchase_confirm}
+-
+  Reception is ready for process so now done the reception.
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_001")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+-
+  I check the Stock Interim account (Received) is credited successfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_input, string : Stock Interim account (Received) is not credited successfully.}:
+    - credit == 9
+-
+  I check the Stock valuation account is debited sucessfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_valuation, string : Stock valuation account is not debited successfully.}:
+    - debit == 9
+-
+  I Validate Invoice of Purchase Order.
+-
+  !python {model: purchase.order}: |
+    invoice_ids = [x.id for x in self.browse(cr, uid, ref("purchase_order_001")).invoice_ids]
+    self.pool.get('account.invoice').signal_invoice_open(cr, uid, invoice_ids)
+-
+  I check the Stock Interim account (Received) is debited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_stock_input, string : Stock Interim account (Received) is not debited successfully.}:
+    - debit == 9
+-
+  I check the Price difference creditor Account is debited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_price_difference, string : Price difference creditor Account is not debited successfully.}:
+    - debit == 1
+-
+  I check Payable(creditor) Account is Credited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_payable, string : Payable(creditor) Account is not Credited successfully.}:
+    - credit == 10
+-
+  I open the Invoice.
+-
+  !python {model: purchase.order}: |
+    po = self.browse(cr, uid, ref("purchase_order_001"))
+    for invoice in po.invoice_ids:
+      self.pool.get('account.invoice').signal_invoice_open(cr, uid, [invoice.id])
+-
+  I pay the invoice.
+-
+  !python {model: purchase.order}: |
+    invoice_ids = self.browse(cr, uid, ref("purchase_order_001")).invoice_ids
+    order = self.browse(cr, uid, ref("purchase_order_001"))
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
+    for invoice in invoice_ids:
+        invoice.pay_and_reconcile(invoice.amount_total, ref('account_anglo_cash'), ref('account.period_8'), journal_ids[0], ref('account_anglo_cash'), ref('account.period_8'), journal_ids[0], name='test')
+-
+  I check Payable(Creditors) Account is Debited sucessfully after invoice paid.
+-
+  !assert {model: account.account, id : account_anglo_payable, string : Payable(Creditors) Account is not Debited successfully.}:
+    - debit == 10
+-
+  I check Bank/Cash account is credited sucessfully after invoice paid.
+-
+  !assert {model: account.account, id : account_anglo_cash, string: Bank/Cash account is not credited successfully.}:
+    - credit == 10
+-
+  I create an Outgoing Picking order
+-
+  !record {model: stock.picking, id: stock_picking_out001}:
+    partner_id: base.res_partner_13
+    invoice_state: 2binvoiced
+    move_lines:
+      - company_id: base.main_company
+        location_id: stock.stock_location_stock
+        product_id: product.product_product_3
+        product_qty: 1.0
+        product_uom: product.product_uom_unit
+        location_dest_id: stock.stock_location_customers
+    move_type: direct
+    type: out
+-
+  I need to check the availability of the product, So I make my picking order for processing later.
+-
+  !python {model: stock.picking}: |
+    self.draft_force_assign(cr, uid, [ref("stock_picking_out001")], {"lang": "en_US", "search_default_available":
+      1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
+      "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
+      })
+-
+  I check the product availability, Product is available in the stock and ready to be sent.
+-
+  !python {model: stock.picking}: |
+    self.action_assign(cr, uid, [ref("stock_picking_out001")], {"lang": "en_US", "search_default_available":
+      1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
+      "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
+      })
+-
+  I process the delivery.
+-
+  !python {model: stock.partial.picking}: |
+    partial_id = self.create(cr, uid, {}, context={'active_model':'stock.picking','active_ids':[ref('stock_picking_out001')]})
+    self.do_partial(cr, uid, [partial_id])
+- 
+  I check Stock Interim account (Delivery) is debited successfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_output, string : Stock Interim account (Delivery) is not debited successfully.}:
+    - debit == 9
+-
+  I check the Stock valuation account is credited sucessfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_valuation, string : Stock valuation account is not credited successfully.}: 
+    - credit == 9
+-
+  As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order.
+-
+  !python {model: stock.invoice.onshipping}: |
+    wiz_id = self.create(cr, uid, {'invoice_date': '2013-03-04', 'journal_id': ref('account.sales_journal')},
+      {'active_ids': [ref("stock_picking_out001")], "active_model": "stock.picking"})
+    self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US",
+      "search_default_available": 1, "tz": False, "active_model": "stock.picking",
+      "contact_display": "partner", "active_ids": [ref("stock_picking_out001")], "active_id": ref("stock_picking_out001")})
+-
+  I check that the customer invoice is created successfully.
+-
+  !python {model: account.invoice}: |
+    partner_id = self.pool.get('stock.picking').browse(cr, uid, ref('stock_picking_out001')).partner_id.id
+    inv_ids = self.search(cr, uid, [('type','=','out_invoice'),('partner_id','=',partner_id)])
+    assert inv_ids, 'No Invoice is generated!'
+-
+  I open the Invoice.
+-
+  !python {model: stock.picking}: |
+    move_name = self.pool.get('stock.picking').browse(cr, uid, ref('stock_picking_out001')).name
+    account_invoice = self.pool.get('account.invoice').search(cr, uid, [('origin', '=', move_name)])
+    self.pool.get('account.invoice').signal_invoice_open(cr, uid, account_invoice)
+-
+  I check Income Account is Credited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_income, string : Income Account is not Credited successfully.}:
+    - credit == 20
+-
+  I check Cost of goods sold account for debit.
+-
+  !assert {model: account.account, id : account_anglo_cogs, string : Cost of goods sale is not Debited successfully.}:
+    - debit == 9
+-
+  I check Stock Interim account (Delivery)
+-
+  !assert {model: account.account, id : account_anglo_stock_output, string : Stock Interim account (Delivery) is not credited successfully.}:
+    - credit == 9
+-
+  I check Receivable(Debtor) Account for debit.
+-
+  !assert {model: account.account, id : account_anglo_receivable, string : Receivable(Debtors) Account is not Debited successfully.}: 
+    - debit == 20
+-
+  I pay the invoice.
+-
+  !python {model: account.invoice}: |
+    move_name = self.pool.get('stock.picking').browse(cr, uid, ref('stock_picking_out001')).name
+    account_invoice= self.pool.get('account.invoice').search(cr, uid, [('origin', '=', move_name)])
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')], limit=1)
+    pay = self.pay_and_reconcile(cr, uid, account_invoice,
+                        20.0, ref('account_anglo_cash'), ref('account.period_8'),
+                        journal_ids[0], ref('account_anglo_cash'),
+                        ref('account.period_8'), journal_ids[0],
+                        name='Payment for test customer invoice')
+    assert (pay == True), "Incorrect Payment."
+-
+  I check Receivable(Debtor) Account for credit.
+-
+  !assert {model: account.account, id : account_anglo_receivable, string : Receivable(Debtors) Account is not Credited successfully.}: 
+    - credit == 20
+-
+  I check Bank/Cash account is debited sucessfully after invoice paid.
+-
+  !assert {model: account.account, id : account_anglo_cash, string: Bank/Cash account is not successfully credited.}:
+    - debit == 20
diff --git a/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml b/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
new file mode 100644
index 00000000000..f7d52f4f5a8
--- /dev/null
+++ b/addons/account_anglo_saxon/test/anglo_saxon_avg_fifo.yml
@@ -0,0 +1,304 @@
+-
+  In order to test anglo_saxon Configure Different Accounts.
+-
+  !record {model: account.account, id: account_anglo_stock_valuation_fifo}:
+    code: X3000f
+    name: Stock Valuation Account- (test)
+    parent_id: account.cas
+    type: other
+    user_type: account.data_account_type_asset
+-
+  Configure Stock Interim account (Received).
+-
+  !record {model: account.account, id: account_anglo_stock_input_fifo}:
+    code: X2800f
+    name: Stock Interim account (Received)
+    parent_id: account.cos
+    type: other
+    user_type: account.data_account_type_expense
+-
+  Configure Stock Interim account (Delivered).
+-
+  !record {model: account.account, id: account_anglo_stock_output_fifo}:
+    code: X2801f
+    name: Stock Interim account (Delivered)
+    parent_id: account.rev
+    type: other
+    user_type: account.data_account_type_income
+-
+  Configure Price difference creditor Account.
+-
+  !record {model: account.account, id: account_anglo_price_difference_fifo}:
+    code: X7095f
+    name: Price difference creditor Account
+    parent_id: account.cos
+    type: other
+    user_type: account.data_account_type_expense
+-
+  Configure Cash Bank Account.
+-
+  !record {model: account.account, id: account_anglo_cash_fifo}:
+    code: X5000f
+    name: Cash/Bank Account 
+    parent_id: account.cash  
+    type: other
+    user_type: account.data_account_type_asset
+-
+  Configure Creditor Account Payable. 
+-
+  !record {model: account.account, id: account_anglo_payable_fifo}:
+    code: X440001f
+    name: Creditor Account Payable 
+    parent_id: account.a_pay  
+    type: other
+    user_type: account.data_account_type_payable
+-
+  Configure Debtor Account Receivable. 
+-
+  !record {model: account.account, id: account_anglo_receivable_fifo}:
+    code: X400001f
+    name: Debtor Account Receivable 
+    parent_id: account.a_recv  
+    type: other
+    user_type: account.data_account_type_receivable
+-
+  Configure Cost of Good sale Account.
+-
+  !record {model: account.account, id: account_anglo_cogs_fifo}:
+    code: X7000f
+    name: Cost of goods sale account
+    parent_id: account.o_expense
+    type: other
+    user_type: account.data_account_type_expense
+-
+  Configure Income Account.
+-
+  !record {model: account.account, id: account_anglo_income_fifo}:
+    code: X8000f
+    name: Income Account
+    parent_id: account.o_income
+    type: other
+    user_type: account.data_account_type_income
+-
+  I configure the account receivable of supplier
+-
+  !record {model: res.partner, id: base.res_partner_3}:
+    property_account_payable: account_anglo_payable_fifo
+    property_account_receivable: account_anglo_receivable_fifo
+-
+  I configure the account receivable of Customer.
+-
+  !record {model: res.partner, id: base.res_partner_13}:
+    property_account_payable: account_anglo_payable_fifo
+    property_account_receivable: account_anglo_receivable_fifo
+-
+  I configure the product category with stock valuation account.
+-
+  !record {model: product.category, id: product.product_category_4}:
+    property_stock_valuation_account_id: account_anglo_stock_valuation_fifo
+-
+  I create a product with required accounts, and cost method average (but same applies for fifo)
+-
+  !record {model: product.product, id: product_fifo_anglo_saxon}: 
+    name: 'FIFO product for anglo saxon tests'
+    list_price: 20.00
+    standard_price: 0
+    categ_id: product.product_category_4
+    valuation: 'real_time'
+    property_account_income: account_anglo_income_fifo
+    property_account_expense: account_anglo_cogs_fifo
+    property_account_creditor_price_difference: account_anglo_price_difference_fifo
+    property_stock_account_input: account_anglo_stock_input_fifo
+    property_stock_account_output: account_anglo_stock_output_fifo
+    cost_method: 'average'
+-
+  I create a draft Purchase Order.
+-
+  !record {model: purchase.order, id: purchase_order_001_fifo}:
+    partner_id: base.res_partner_3
+    location_id: stock.stock_location_stock
+    pricelist_id: 1
+    order_line:
+      - product_id: product_fifo_anglo_saxon
+        product_qty: 1
+        price_unit: 9
+        date_planned: '2013-08-31'
+        taxes_id: []
+-
+  I confirm the purchase order.
+-
+  !workflow {model: purchase.order, ref: purchase_order_001_fifo, action: purchase_confirm}
+-
+  Reception is ready for process so now done the reception.
+-
+  !python {model: stock.partial.picking}: |
+    pick_ids = self.pool.get('purchase.order').browse(cr, uid, ref("purchase_order_001_fifo")).picking_ids
+    partial_id = self.create(cr, uid, {},context={'active_model': 'stock.picking','active_ids': [pick_ids[0].id]})
+    self.do_partial(cr, uid, [partial_id])
+-
+  I check the Stock Interim account (Received) is credit successfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_input_fifo, string : Stock Interim account (Received) is not credited successfully.}:
+    - credit == 9
+-
+  I check the Stock valuation account is debit sucessfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_valuation_fifo, string : Stock valuation account is not debited successfully.}:
+    - debit == 9
+-
+  I Validate Invoice of Purchase Order after having changed the price to 10.
+-
+  !python {model: purchase.order}: |
+    invoice_ids = [x.id for x in self.browse(cr, uid, ref("purchase_order_001_fifo")).invoice_ids]
+    line_ids = self.pool.get('account.invoice.line').search(cr, uid, [('invoice_id', 'in', invoice_ids)])
+    self.pool.get('account.invoice.line').write(cr, uid, line_ids, {'price_unit': 10})
+    self.pool.get('account.invoice').signal_invoice_open(cr, uid, invoice_ids)
+-
+  I check the Stock Interim account (Received) is debited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_stock_input_fifo, string : Stock Interim account (Received) is not debited successfully.}:
+    - debit == 9
+-
+  I check the Price difference creditor Account is debited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_price_difference_fifo, string : Price difference creditor Account is not debited successfully.}:
+    - debit == 1
+-
+  I check Payable(creditor) Account is Credited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_payable_fifo, string : Payable(creditor) Account is not Credited successfully.}:
+    - credit == 10
+-
+  I pay the invoice.
+-
+  !python {model: purchase.order}: |
+    invoice_ids = self.browse(cr, uid, ref("purchase_order_001_fifo")).invoice_ids
+    order = self.browse(cr, uid, ref("purchase_order_001_fifo"))
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
+    for invoice in invoice_ids:
+        invoice.pay_and_reconcile(invoice.amount_total, ref('account_anglo_cash_fifo'), ref('account.period_8'), journal_ids[0], ref('account_anglo_cash_fifo'), ref('account.period_8'), journal_ids[0], name='test')
+-
+  I check Payable(Creditors) Account is Debited sucessfully after invoice paid.
+-
+  !assert {model: account.account, id : account_anglo_payable_fifo, string : Payable(Creditors) Account is not Debited successfully.}:
+    - debit == 10
+-
+  I check Bank/Cash account is credited sucessfully after invoice paid.
+-
+  !assert {model: account.account, id : account_anglo_cash_fifo, string: Bank/Cash account is not credited successfully.}:
+    - credit == 10
+-
+  I create an Outgoing Picking order
+-
+  !record {model: stock.picking, id: stock_picking_out001_fifo}:
+    partner_id: base.res_partner_13
+    invoice_state: 2binvoiced
+    move_lines:
+      - company_id: base.main_company
+        location_id: stock.stock_location_stock
+        product_id: product_fifo_anglo_saxon
+        product_qty: 1.0
+        location_dest_id: stock.stock_location_customers
+    move_type: direct
+    type: out
+-
+  I need to check the availability of the product, So I make my picking order for processing later.
+-
+  !python {model: stock.picking}: |
+    self.draft_force_assign(cr, uid, [ref("stock_picking_out001_fifo")], {"lang": "en_US", "search_default_available":
+      1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
+      "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
+      })
+-
+  I check the product availability, Product is available in the stock and ready to be sent.
+-
+  !python {model: stock.picking}: |
+    self.action_assign(cr, uid, [ref("stock_picking_out001_fifo")], {"lang": "en_US", "search_default_available":
+      1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
+      "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
+      })
+-
+  I process the delivery.
+-
+  !python {model: stock.partial.picking}: |
+    partial_id = self.create(cr, uid, {}, context={'active_model':'stock.picking','active_ids':[ref('stock_picking_out001_fifo')]})
+    self.do_partial(cr, uid, [partial_id])
+- 
+  I check Stock Interim account (Delivery) is debited successfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_output_fifo, string : Stock Interim account (Delivery) is not debited successfully.}:
+    - debit == 9
+-
+  I check the Stock valuation account is credited sucessfully.
+-
+  !assert {model: account.account, id : account_anglo_stock_valuation_fifo, string : Stock valuation account is not credited successfully.}: 
+    - credit == 9
+-
+  As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order.
+-
+  !python {model: stock.invoice.onshipping}: |
+    wiz_id = self.create(cr, uid, {'invoice_date': '2013-03-04', 'journal_id': ref('account.sales_journal')},
+      {'active_ids': [ref("stock_picking_out001_fifo")], "active_model": "stock.picking"})
+    self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US",
+      "search_default_available": 1, "tz": False, "active_model": "stock.picking",
+      "contact_display": "partner", "active_ids": [ref("stock_picking_out001_fifo")], "active_id": ref("stock_picking_out001_fifo")})
+-
+  I check that the customer invoice is created successfully.
+-
+  !python {model: account.invoice}: |
+    partner_id = self.pool.get('stock.picking').browse(cr, uid, ref('stock_picking_out001_fifo')).partner_id.id
+    inv_ids = self.search(cr, uid, [('type','=','out_invoice'),('partner_id','=',partner_id)])
+    assert inv_ids, 'No Invoice is generated!'
+-
+  I open the Invoice.
+-
+  !python {model: stock.picking}: |
+    move_name = self.pool.get('stock.picking').browse(cr, uid, ref('stock_picking_out001_fifo')).name
+    account_invoice = self.pool.get('account.invoice').search(cr, uid, [('origin', '=', move_name)])
+    account_invoice_line = self.pool.get('account.invoice.line').search(cr, uid, [('invoice_id', 'in', account_invoice)])
+    self.pool.get('account.invoice.line').write(cr, uid, account_invoice_line, {'invoice_line_tax_id': [(6, 0, [])]})
+    self.pool.get('account.invoice').button_reset_taxes(cr, uid, account_invoice)
+    self.pool.get('account.invoice').signal_invoice_open(cr, uid, account_invoice)
+-
+  I check Income Account is Credited sucessfully when Invoice validated.
+-
+  !assert {model: account.account, id : account_anglo_income_fifo, string : Income Account is not Credited successfully.}:
+    - credit == 20
+-
+  I check Cost of goods sold account for debit.
+-
+  !assert {model: account.account, id : account_anglo_cogs_fifo, string : Cost of goods sale is not Debited successfully.}:
+    - debit == 9
+-
+  I check Stock Interim account (Delivery)
+-
+  !assert {model: account.account, id : account_anglo_stock_output_fifo, string : Stock Interim account (Delivery) is not credited successfully.}:
+    - credit == 9
+-
+  I check Receivable(Debtor) Account for debit.
+-
+  !assert {model: account.account, id : account_anglo_receivable_fifo, string : Receivable(Debtors) Account is not Debited successfully.}: 
+    - debit == 20
+-
+  I pay the invoice.
+-
+  !python {model: account.invoice}: |
+    move_name = self.pool.get('stock.picking').browse(cr, uid, ref('stock_picking_out001_fifo')).name
+    account_invoice= self.pool.get('account.invoice').search(cr, uid, [('origin', '=', move_name)])
+    journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')], limit=1)
+    pay = self.pay_and_reconcile(cr, uid, account_invoice,
+                        20.0, ref('account_anglo_cash_fifo'), ref('account.period_8'),
+                        journal_ids[0], ref('account_anglo_cash_fifo'),
+                        ref('account.period_8'), journal_ids[0],
+                        name='Payment for test customer invoice')
+    assert (pay == True), "Incorrect Payment."
+-
+  I check Receivable(Debtor) Account for credit.
+-
+  !assert {model: account.account, id : account_anglo_receivable_fifo, string : Receivable(Debtors) Account is not Credited successfully.}: 
+    - credit == 20
+-
+  I check Bank/Cash account is debited sucessfully after invoice paid.
+-
+  !assert {model: account.account, id : account_anglo_cash_fifo, string: Bank/Cash account is not successfully credited.}:
+    - debit == 20
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index eb6403b6f48..9a154d8ec70 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -13,6 +13,17 @@
                 </field>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_invoice_asset_category">
+            <field name="name">account.invoice.supplier.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='invoice_line']/tree/field[@name='quantity']" position="before">
+                    <field name="asset_category_id"/>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/account_asset/i18n/hu.po b/addons/account_asset/i18n/hu.po
new file mode 100644
index 00000000000..19f50232515
--- /dev/null
+++ b/addons/account_asset/i18n/hu.po
@@ -0,0 +1,741 @@
+# 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:04+0000\n"
+"PO-Revision-Date: 2013-08-22 11:04+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-08-23 05:01+0000\n"
+"X-Generator: Launchpad (build 16737)\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 "Csoportosítás"
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Bruttó összeg"
+
+#. 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 "Eszköz"
+
+#. 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 "Lineáris"
+
+#. 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 "Vállalat"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Módosítás"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Folyamatban lévő"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Beállítás tervezetnek"
+
+#. 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 "Eszközök elemzése"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Indoklás"
+
+#. 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 "Eszköz kategóriák"
+
+#. 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 "Tételek"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Értékcsökkénés sorai"
+
+#. 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 "Értékcsökkenés dátuma"
+
+#. 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 "Eszközök"
+
+#. 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 "Megjegyzések"
+
+#. 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 "# értékcsökkenési sorok száma"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr "Hónapok száma az időszakban"
+
+#. 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 "Hivatkozás"
+
+#. 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 "Időszak hossza"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Tervezet"
+
+#. 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 "Gyűjtőkód"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Számítási módszer"
+
+#. 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 "Eszköz kategória"
+
+#. 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 "hónapok"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Számlasor"
+
+#. 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 "vagy"
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Jegyzet"
+
+#. 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 "Lezárt"
+
+#. 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 "Státusz"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. 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 "Felhasználó"
+
+#. 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 "Kiterjesztett szűrők…"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Kiszámítás"
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr "Eszköz történet"
+
+#. 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 "Aktív"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "Eszköz státusza"
+
+#. 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 "Előzmény"
+
+#. 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 "Időszak"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Általános"
+
+#. 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 "Számla"
+
+#. 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 "Mégsem"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Lezár"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Könyvelési tételsorok"
+
+#. 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 "Vásárlás dátuma"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "Degresszív"
+
+#. 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 "Jelenlegi"
+
+#. 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 "Pénznem"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Napló"
+
+#. 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 "Könyvelt"
+
+#. 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 "Bruttó érték"
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Név"
+
+#. 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 "Év"
+
+#. 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 "Eszköz kategória"
+
+#. 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:50
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
+
+#. 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 "Dátum"
+
+#. 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/i18n/th.po b/addons/account_asset/i18n/th.po
index fdc6c7b4754..cd7967a5eb2 100644
--- a/addons/account_asset/i18n/th.po
+++ b/addons/account_asset/i18n/th.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: 2013-05-15 10:09+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-07-24 08:53+0000\n"
+"Last-Translator: Sumonchai ( เหลา ) <sumonchai@gmail.com>\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"
+"X-Launchpad-Export-Date: 2013-07-25 05:13+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -42,7 +42,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "จัดกลุ่มตาม..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
@@ -58,7 +58,7 @@ msgstr ""
 #: field:asset.asset.report,asset_id:0
 #: model:ir.model,name:account_asset.model_account_asset_asset
 msgid "Asset"
-msgstr ""
+msgstr "สินทรัพย์"
 
 #. module: account_asset
 #: help:account.asset.asset,prorata:0
@@ -72,7 +72,7 @@ msgstr ""
 #: selection:account.asset.asset,method:0
 #: selection:account.asset.category,method:0
 msgid "Linear"
-msgstr ""
+msgstr "เชิงเส้น"
 
 #. module: account_asset
 #: field:account.asset.asset,company_id:0
@@ -80,24 +80,24 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "บริษัท"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Modify"
-msgstr ""
+msgstr "ปรับเปลี่ยน"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Running"
-msgstr ""
+msgstr "กำลังทำงานอยู่"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "กำหนดให้เป็นแบบร่าง"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -110,7 +110,7 @@ msgstr ""
 #. module: account_asset
 #: field:asset.modify,name:0
 msgid "Reason"
-msgstr ""
+msgstr "เหตุผล"
 
 #. module: account_asset
 #: field:account.asset.asset,method_progress_factor:0
@@ -122,7 +122,7 @@ msgstr ""
 #: 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 ""
+msgstr "หมวดหมู่สินทรัพย์"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -173,7 +173,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr ""
+msgstr "สินทรัพย์"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
@@ -187,7 +187,7 @@ msgstr ""
 #: view:asset.modify:0
 #: field:asset.modify,note:0
 msgid "Notes"
-msgstr ""
+msgstr "บันทึกย่อ"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_id:0
@@ -221,7 +221,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,code:0
 msgid "Reference"
-msgstr ""
+msgstr "อ้างถึง"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -246,7 +246,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ฉบับร่าง"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -273,13 +273,13 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "วิเคราะห์บัญชี"
 
 #. module: account_asset
 #: field:account.asset.asset,method:0
 #: field:account.asset.category,method:0
 msgid "Computation Method"
-msgstr ""
+msgstr "วิธีการคำนวณ"
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
@@ -308,7 +308,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
 msgid "Salvage Value"
-msgstr ""
+msgstr "มูลค่าซาก"
 
 #. module: account_asset
 #: field:account.asset.asset,category_id:0
@@ -364,20 +364,20 @@ msgstr ""
 #: field:account.asset.category,method_time:0
 #: field:account.asset.history,method_time:0
 msgid "Time Method"
-msgstr ""
+msgstr "วิธีการจัดการเวลา"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+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 ""
+msgstr "บันทึกย่อ"
 
 #. module: account_asset
 #: help:account.asset.history,method_time:0
@@ -409,7 +409,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Closed"
-msgstr ""
+msgstr "ปิด"
 
 #. module: account_asset
 #: help:account.asset.asset,state:0
@@ -425,13 +425,13 @@ 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
 #: field:asset.asset.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "พาร์ทเนอร์"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.history,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ผู้ใช้"
 
 #. module: account_asset
 #: field:account.asset.category,account_asset_id:0
@@ -482,12 +482,12 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,active:0
 msgid "Active"
-msgstr ""
+msgstr "เปิดใช้งาน"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr ""
+msgstr "สถานะของสินทรัพย์"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
@@ -498,12 +498,12 @@ msgstr ""
 #: view:account.asset.asset:0
 #: field:account.asset.asset,history_ids:0
 msgid "History"
-msgstr ""
+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
@@ -513,7 +513,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "General"
-msgstr ""
+msgstr "ทั่วไป"
 
 #. module: account_asset
 #: field:account.asset.asset,prorata:0
@@ -524,7 +524,7 @@ msgstr ""
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "ใบแจ้งหนี้"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -535,13 +535,13 @@ msgstr ""
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "Cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
 #: selection:asset.asset.report,state:0
 msgid "Close"
-msgstr ""
+msgstr "ปิด"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
@@ -558,7 +558,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,purchase_date:0
 msgid "Purchase Date"
-msgstr ""
+msgstr "วันที่ซื้อ"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -606,7 +606,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "สกุลเงิน"
 
 #. module: account_asset
 #: field:account.asset.category,journal_id:0
@@ -637,7 +637,7 @@ msgstr ""
 #: view:asset.asset.report:0
 #: field:asset.asset.report,move_check:0
 msgid "Posted"
-msgstr ""
+msgstr "ลงบัญชีแล้ว"
 
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
@@ -660,7 +660,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "ชื่อ"
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -672,7 +672,7 @@ msgstr ""
 #. module: account_asset
 #: field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "ปี"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -693,7 +693,7 @@ msgid "Amount of Depreciation Lines"
 msgstr ""
 
 #. module: account_asset
-#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:50
 #, python-format
 msgid "Created Asset Moves"
 msgstr ""
@@ -701,7 +701,7 @@ 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
@@ -711,7 +711,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.history,date:0
 msgid "Date"
-msgstr ""
+msgstr "วันที่"
 
 #. module: account_asset
 #: field:account.asset.asset,method_number:0
diff --git a/addons/account_asset/static/src/img/icon.png b/addons/account_asset/static/description/icon.png
similarity index 100%
rename from addons/account_asset/static/src/img/icon.png
rename to addons/account_asset/static/description/icon.png
diff --git a/addons/account_bank_statement_extensions/i18n/ru.po b/addons/account_bank_statement_extensions/i18n/ru.po
new file mode 100644
index 00000000000..61b054e7563
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/ru.po
@@ -0,0 +1,361 @@
+# 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-08-05 10:40+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-08-06 04:47+0000\n"
+"X-Generator: Launchpad (build 16718)\n"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Информация от плательщика получателю"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Подтверждено"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Основной код"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Дебет"
+
+#. 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 "Отмена выбранных позиций выписки"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Value Date"
+msgstr "Дата зачисления"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Группировать по ..."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Черновик"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Выписка"
+
+#. 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 "Подтверждение выбранных позиций выписки"
+
+#. 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 "Отчет об остатках банковской выписки"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Отменить позиции"
+
+#. 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 ""
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "Status"
+msgstr "Статус"
+
+#. 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 ""
+"Операция удаления запрещена. Пожалуйста, обратитесь к соответствующей "
+"банковской выписке для удаления/изменения позиции."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "or"
+msgstr "или"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Подтвердить позиции"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Операции"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Тип"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Журнал"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Подтвержденные позиции выписки."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Операции по кредиту"
+
+#. 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 "отменить выбранные позиции выписки"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Число контрагентов"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Итоговый баланс"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Операции по дебету"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Расширенные фильтры..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Нельзя изменить подтвержденные позиции."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Вы уверены, что хотите отменить выбранные позиции банковской выписки ?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Название"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr "Назначение"
+
+#. 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 "Примечания"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Ручной"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Bank Transaction"
+msgstr "Банковские операции"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Кредит"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Сумма"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Фин. Счет"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Валюта контрагента"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "БИК контрагента"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Субкоды"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Поиск банковских операций"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Вы уверены, что хотите,  подтвердить выбранные позиции банковской выписки ?"
+
+#. 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 ""
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Черновики позиций выписки."
+
+#. 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 "Позиция банковской выписки"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Код"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Название контрагента"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Банковские счета"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Банковская выписка"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Позиция выписки"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Код должен быть уникальным !"
+
+#. 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 "Позиции банковской выписки"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid "Warning!"
+msgstr "Внимание!"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Отмена"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Позиции выписки"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Итоговая сумма"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 9ad61d7c286..237406ff657 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -203,7 +203,9 @@
             <field name="view_id" ref="crossovered_budget_view_tree"/>
             <field name="search_view_id" ref="view_crossovered_budget_search"/>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
+                Click to create a new budget.
+              </p><p>
                 A budget is a forecast of your company's income and/or expenses
                 expected for a period in the future. A budget is defined on some
                 financial accounts and/or analytic accounts (that may represent
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index f69a34b9a82..4dd1ba0298f 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.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-06-13 17:16+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
+"PO-Revision-Date: 2013-07-30 22:29+0000\n"
+"Last-Translator: Masaki Yamaya <Unknown>\n"
 "Language-Team: Japanese <ja@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:34+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-31 05:16+0000\n"
+"X-Generator: Launchpad (build 16718)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -418,7 +418,7 @@ msgstr "からの分析"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr "ドラフト予算"
+msgstr "予算案"
 
 #, python-format
 #~ msgid "The General Budget '%s' has no Accounts!"
diff --git a/addons/account_cancel/i18n/uk.po b/addons/account_cancel/i18n/uk.po
new file mode 100644
index 00000000000..5fbae627883
--- /dev/null
+++ b/addons/account_cancel/i18n/uk.po
@@ -0,0 +1,23 @@
+# Ukrainian 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-08-01 11:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Ukrainian <uk@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-08-02 05:38+0000\n"
+"X-Generator: Launchpad (build 16718)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr ""
diff --git a/addons/account_cancel/i18n/vi.po b/addons/account_cancel/i18n/vi.po
index 8198e802022..89a7feb7942 100644
--- a/addons/account_cancel/i18n/vi.po
+++ b/addons/account_cancel/i18n/vi.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-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-21 14:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2013-06-30 16:08+0000\n"
+"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
 "Language-Team: Vietnamese <vi@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-07-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #~ msgid "Account Cancel"
 #~ msgstr "Hủy bỏ Tài khoản"
diff --git a/addons/account_check_writing/i18n/bs.po b/addons/account_check_writing/i18n/bs.po
new file mode 100644
index 00000000000..252798b016f
--- /dev/null
+++ b/addons/account_check_writing/i18n/bs.po
@@ -0,0 +1,246 @@
+# Bosnian 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-08-08 22:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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-08-09 05:06+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Ček na vrhu"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Otvoreno saldo"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+#: view:account.voucher:0
+msgid "Print Check"
+msgstr "Štampaj ček"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Ćek u sredini"
+
+#. 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 ""
+"Ček na vrhu je kompatibilan sa Quicken, QuickBooks i Microsoft Money. Ček u "
+"sredini je kompatibilan sa Peachtree, ACCPAC i DacEasy. Ček na dnu je "
+"kompatibilan sa Peachtree, ACCPAC i DacEasy samo"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Ćek na dnu"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr "Štampaj čekove grupno"
+
+#. 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 "Jedan od odštampanih čekova je već dobio broj."
+
+#. 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 ""
+"Označite ovo ako će se za pisanje čekova koristiti dnevnik knjiženja."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Dozvoli pisanje čekova"
+
+#. 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 "Opis"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Dnevnik knjiženja"
+
+#. 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 "Piši čekove"
+
+#. 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 "Popust"
+
+#. 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 "Originalni iznos"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Check Layout"
+msgstr "Raspored čeka"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Dozvoli pisanje čeka"
+
+#. 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 "Plaćanje"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Koristi pred-odštampane čekove"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Štampaj ček (donji)"
+
+#. 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"
+"                Kliknite da kreirate nove čekove. \n"
+"              </p><p>\n"
+"                Forma plaćanje čekom omogućava vam da pratite plaćanja koja "
+"izvršavate\n"
+"                vašim dobavljačima koristeći čekove. Kada odaberete "
+"dobavljača,\n"
+"                metodu plaćanja i iznos za plaćanje, OpenERP će predložiti "
+"da izravna\n"
+"                vašu uplatu sa otvorenom fakturom ili računom dobavljača.\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 "Datum dospijeća"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+msgid "Print Check (Middle)"
+msgstr "Štampaj ček (srednji)"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Kompanije"
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr "Broj sljedećeg čeka za štampanje."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo valute"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check (Top)"
+msgstr "Štampaj ček (na vrhu)"
+
+#. 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 "Iznos čeka"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Računovodstveni vaučer"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr "ili"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Pisani iznos"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
+msgstr "Štampaj čekove grupno"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr "Sljedeći broj čeka"
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
+msgstr "Ček"
diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv
index 8774015efc6..591cc347563 100644
--- a/addons/account_followup/security/ir.model.access.csv
+++ b/addons/account_followup/security/ir.model.access.csv
@@ -3,5 +3,5 @@ access_account_followup_followup_line,account_followup.followup.line,model_accou
 access_account_followup_followup_line_manager,account_followup.followup.line.manager,model_account_followup_followup_line,account.group_account_manager,1,1,1,1
 access_account_followup_followup_accountant,account_followup.followup user,model_account_followup_followup,account.group_account_invoice,1,0,0,0
 access_account_followup_followup_manager,account_followup.followup.manager,model_account_followup_followup,account.group_account_manager,1,1,1,1
-access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,1,1
-access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_user,1,1,1,1
+access_account_followup_stat_invoice,account_followup.stat.invoice,model_account_followup_stat,account.group_account_invoice,1,1,0,0
+access_account_followup_stat_by_partner_manager,account_followup.stat.by.partner,model_account_followup_stat_by_partner,account.group_account_user,1,1,0,0
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 03e25dfbc45..de9c47ec005 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -88,6 +88,7 @@ class payment_order_create(osv.osv_memory):
                     'order_id': payment.id,
                     'partner_id': line.partner_id and line.partner_id.id or False,
                     'communication': line.ref or '/',
+                    'state': line.invoice and line.invoice.reference_type != 'none' and 'structured' or 'normal',
                     'date': date_to_pay,
                     'currency': (line.invoice and line.invoice.currency_id.id) or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,
                 }, context=context)
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 850162ccf84..597ed01aa1b 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -31,10 +31,10 @@ 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):
+    def _get_current_rate(self, cr, uid, ids, raise_on_no_rate=True, context=None):
         if context is None:
             context = {}
-        res = super(res_currency, self)._get_current_rate(cr, uid, ids, name, arg, context=context)
+        res = super(res_currency, self)._get_current_rate(cr, uid, ids, raise_on_no_rate, 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
@@ -932,6 +932,8 @@ class account_voucher(osv.osv):
         move_pool = self.pool.get('account.move')
 
         for voucher in self.browse(cr, uid, ids, context=context):
+            # refresh to make sure you don't unlink an already removed move
+            voucher.refresh()
             recs = []
             for line in voucher.move_ids:
                 if line.reconcile_id:
@@ -1182,7 +1184,7 @@ class account_voucher(osv.osv):
         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)):
+            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_digits=prec) and not float_compare(line.move_line_id.debit, 0.0, precision_digits=prec)):
                 continue
             # convert the amount set on the voucher line into the currency of the voucher's company
             # 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
@@ -1282,10 +1284,8 @@ class account_voucher(osv.osv):
                 }
                 new_id = move_line_obj.create(cr, uid, move_line_foreign_currency, context=context)
                 rec_ids.append(new_id)
-
             if line.move_line_id.id:
                 rec_lst_ids.append(rec_ids)
-
         return (tot_line, rec_lst_ids)
 
     def writeoff_move_line_get(self, cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=None):
@@ -1622,7 +1622,7 @@ 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)
 
 
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index a58e655aec6..04366df488e 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: 2013-04-26 16:01+0000\n"
+"PO-Revision-Date: 2013-07-10 09:54+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-04-27 05:44+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 "Language: nl\n"
 
 #. module: account_voucher
@@ -28,7 +28,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:369
+#: code:addons/account_voucher/account_voucher.py:417
 #, python-format
 msgid "Write-Off"
 msgstr "Afschrijving"
@@ -132,7 +132,7 @@ msgid "Voucher Statistics"
 msgstr "Boekingsstatistieken"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -233,8 +233,8 @@ msgid "Journal Item"
 msgstr "Boekingslijn"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
-#: code:addons/account_voucher/account_voucher.py:981
+#: code:addons/account_voucher/account_voucher.py:558
+#: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
 msgstr "Fout"
@@ -261,7 +261,7 @@ msgid "Cancelled"
 msgstr "Geannuleerd"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -313,7 +313,7 @@ msgid "Tax"
 msgstr "Btw"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
 msgstr "Ongeldige actie"
@@ -366,10 +366,10 @@ msgid "Import Invoices"
 msgstr "Facturen importeren"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "Wrong voucher line"
-msgstr ""
+msgstr "Verkeerde betalingsregel"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -385,7 +385,7 @@ msgid "Receipt"
 msgstr "Reçu"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -409,7 +409,7 @@ msgstr "Periode"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: code:addons/account_voucher/account_voucher.py:211
+#: code:addons/account_voucher/account_voucher.py:231
 #, python-format
 msgid "Supplier"
 msgstr "Leverancier"
@@ -430,7 +430,7 @@ msgid "Debit"
 msgstr "Debet"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Het dagboek kan niet worden gewijzigd"
@@ -469,6 +469,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik hier als u een nieuwe leveranciersbetaling wilt maken.\n"
+"              </p><p>\n"
+"                Met OpenERP kunt u betalingen aan leveranciers opvolgen.\n"
+"              </p>\n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -536,7 +542,7 @@ msgid "Pay Invoice"
 msgstr "Factuur betalen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr "Geen rekening voor basisvak en btw-vak"
@@ -590,15 +596,15 @@ msgid "To Review"
 msgstr "Te controleren"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1025
-#: code:addons/account_voucher/account_voucher.py:1039
-#: code:addons/account_voucher/account_voucher.py:1194
+#: code:addons/account_voucher/account_voucher.py:1120
+#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1286
 #, python-format
 msgid "change"
 msgstr "wijzigen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
+#: code:addons/account_voucher/account_voucher.py:1106
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -656,6 +662,7 @@ msgstr "Maand"
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 #: field:account.voucher.line,currency_id:0
+#: model:ir.model,name:account_voucher.model_res_currency
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
 msgstr "Munt"
@@ -699,7 +706,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Betalingssaldo afpunten"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:975
+#: code:addons/account_voucher/account_voucher.py:1067
 #, python-format
 msgid "Configuration Error !"
 msgstr "Configuratiefout"
@@ -764,7 +771,7 @@ msgid "October"
 msgstr "Oktober"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:976
+#: code:addons/account_voucher/account_voucher.py:1068
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Gelieve de nummering van het gekozen journaal te activeren."
@@ -844,7 +851,7 @@ msgid "Previous Payments ?"
 msgstr "Vorige betalingen?"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
 msgstr "De factuur die u wilt betalen, is niet meer geldig."
@@ -876,7 +883,7 @@ msgid "Active"
 msgstr "Actief"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:982
+#: code:addons/account_voucher/account_voucher.py:1074
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Gelieve een reeks in te stellen voor het journaal."
@@ -1004,7 +1011,7 @@ msgid "Journal Items"
 msgstr "Boekingslijnen"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
+#: code:addons/account_voucher/account_voucher.py:558
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr "Stel een standaard debet-/creditrekening in voor journaal \"%s\"."
@@ -1221,7 +1228,7 @@ msgstr ""
 "Het bedrag van het reçu moet gelijk zijn aan het bedrag op de uittreksellijn."
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr "Een openstaand of betaald reçu kan niet meer worden verwijderd."
@@ -1284,8 +1291,8 @@ msgid "Status <b>changed</b>"
 msgstr "Status <b>vgewijzigd</b>"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1106
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr "Niet volledig geconfigureerd"
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index ef38a07e478..16e03d424ef 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/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-05-29 13:17+0000\n"
+"PO-Revision-Date: 2013-06-13 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-05-30 05:45+0000\n"
-"X-Generator: Launchpad (build 16652)\n"
+"X-Launchpad-Export-Date: 2013-06-14 05:38+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -27,7 +27,7 @@ msgid "account.config.settings"
 msgstr "account.config.settings"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:369
+#: code:addons/account_voucher/account_voucher.py:417
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -129,7 +129,7 @@ msgid "Voucher Statistics"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid ""
 "You can not change the journal as you already reconciled some statement "
@@ -223,8 +223,8 @@ msgid "Journal Item"
 msgstr "Элемент журнала"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
-#: code:addons/account_voucher/account_voucher.py:981
+#: code:addons/account_voucher/account_voucher.py:558
+#: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
 msgstr "Ошибка!"
@@ -251,7 +251,7 @@ msgid "Cancelled"
 msgstr "Отменено"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
@@ -295,7 +295,7 @@ msgid "Tax"
 msgstr "Налог"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
 msgstr "Неверное действие!"
@@ -348,7 +348,7 @@ msgid "Import Invoices"
 msgstr "Импорт счетов"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "Wrong voucher line"
 msgstr ""
@@ -367,7 +367,7 @@ msgid "Receipt"
 msgstr "Приход"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid ""
 "You should configure the 'Gain Exchange Rate Account' in the accounting "
@@ -388,7 +388,7 @@ msgstr "Период"
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: code:addons/account_voucher/account_voucher.py:211
+#: code:addons/account_voucher/account_voucher.py:231
 #, python-format
 msgid "Supplier"
 msgstr "Поставщик"
@@ -409,7 +409,7 @@ msgid "Debit"
 msgstr "Дебет"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1547
+#: code:addons/account_voucher/account_voucher.py:1641
 #, python-format
 msgid "Unable to change journal !"
 msgstr "Невозможно изменить журнал!"
@@ -515,7 +515,7 @@ msgid "Pay Invoice"
 msgstr "Оплата счета"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1153
+#: code:addons/account_voucher/account_voucher.py:1249
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -569,15 +569,15 @@ msgid "To Review"
 msgstr "Для проверки"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1025
-#: code:addons/account_voucher/account_voucher.py:1039
-#: code:addons/account_voucher/account_voucher.py:1194
+#: code:addons/account_voucher/account_voucher.py:1120
+#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1286
 #, python-format
 msgid "change"
 msgstr "изменить"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
+#: code:addons/account_voucher/account_voucher.py:1106
 #, python-format
 msgid ""
 "You should configure the 'Loss Exchange Rate Account' in the accounting "
@@ -631,6 +631,7 @@ msgstr "&#1052;&#1077;&#1089;&#1103;&#1094;"
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 #: field:account.voucher.line,currency_id:0
+#: model:ir.model,name:account_voucher.model_res_currency
 #: field:sale.receipt.report,currency_id:0
 msgid "Currency"
 msgstr "Валюта"
@@ -674,7 +675,7 @@ msgid "Reconcile Payment Balance"
 msgstr "Сверка платежного баланса"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:975
+#: code:addons/account_voucher/account_voucher.py:1067
 #, python-format
 msgid "Configuration Error !"
 msgstr "Ошибка конфигурации !"
@@ -739,7 +740,7 @@ msgid "October"
 msgstr "Октябрь"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:976
+#: code:addons/account_voucher/account_voucher.py:1068
 #, python-format
 msgid "Please activate the sequence of selected journal !"
 msgstr "Пожалуйста, включите нумерацию выбранного журнала!"
@@ -819,7 +820,7 @@ msgid "Previous Payments ?"
 msgstr "Предыдущие платежи ?"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1112
+#: code:addons/account_voucher/account_voucher.py:1208
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
 msgstr "Счет, который вы готовы платить, уже не актуален ."
@@ -851,7 +852,7 @@ msgid "Active"
 msgstr "Активно"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:982
+#: code:addons/account_voucher/account_voucher.py:1074
 #, python-format
 msgid "Please define a sequence on the journal."
 msgstr "Пожалуйста, определите нумерацию журнала."
@@ -861,7 +862,7 @@ msgstr "Пожалуйста, определите нумерацию журна
 #: 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
@@ -979,7 +980,7 @@ msgid "Journal Items"
 msgstr "Элементы журнала"
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:508
+#: code:addons/account_voucher/account_voucher.py:558
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
 msgstr ""
@@ -1188,7 +1189,7 @@ msgid ""
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:879
+#: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
 msgstr ""
@@ -1251,8 +1252,8 @@ msgid "Status <b>changed</b>"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1014
-#: code:addons/account_voucher/account_voucher.py:1018
+#: code:addons/account_voucher/account_voucher.py:1106
+#: code:addons/account_voucher/account_voucher.py:1110
 #, python-format
 msgid "Insufficient Configuration!"
 msgstr ""
diff --git a/addons/account_voucher/html/account_illu_01.png b/addons/account_voucher/static/description/account_illu_01.png
similarity index 100%
rename from addons/account_voucher/html/account_illu_01.png
rename to addons/account_voucher/static/description/account_illu_01.png
diff --git a/addons/account_voucher/html/account_sc_00.png b/addons/account_voucher/static/description/account_sc_00.png
similarity index 100%
rename from addons/account_voucher/html/account_sc_00.png
rename to addons/account_voucher/static/description/account_sc_00.png
diff --git a/addons/account_voucher/html/account_sc_02.png b/addons/account_voucher/static/description/account_sc_02.png
similarity index 100%
rename from addons/account_voucher/html/account_sc_02.png
rename to addons/account_voucher/static/description/account_sc_02.png
diff --git a/addons/account_voucher/html/account_sc_03.png b/addons/account_voucher/static/description/account_sc_03.png
similarity index 100%
rename from addons/account_voucher/html/account_sc_03.png
rename to addons/account_voucher/static/description/account_sc_03.png
diff --git a/addons/account_voucher/html/account_sc_04.png b/addons/account_voucher/static/description/account_sc_04.png
similarity index 100%
rename from addons/account_voucher/html/account_sc_04.png
rename to addons/account_voucher/static/description/account_sc_04.png
diff --git a/addons/account_voucher/html/account_sc_06.png b/addons/account_voucher/static/description/account_sc_06.png
similarity index 100%
rename from addons/account_voucher/html/account_sc_06.png
rename to addons/account_voucher/static/description/account_sc_06.png
diff --git a/addons/account_voucher/html/bazile.png b/addons/account_voucher/static/description/bazile.png
similarity index 100%
rename from addons/account_voucher/html/bazile.png
rename to addons/account_voucher/static/description/bazile.png
diff --git a/addons/account_voucher/static/src/img/icon.png b/addons/account_voucher/static/description/icon.png
similarity index 100%
rename from addons/account_voucher/static/src/img/icon.png
rename to addons/account_voucher/static/description/icon.png
diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/static/description/index.html
similarity index 96%
rename from addons/account_voucher/html/index.html
rename to addons/account_voucher/static/description/index.html
index d59c110dde5..a363291f12e 100644
--- a/addons/account_voucher/html/index.html
+++ b/addons/account_voucher/static/description/index.html
@@ -17,7 +17,7 @@
                 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>
+                <a href="http://www.openerp.com/start?app=account_voucher" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/account_voucher/html/testimonial_sunil.jpg b/addons/account_voucher/static/description/testimonial_sunil.jpg
similarity index 100%
rename from addons/account_voucher/html/testimonial_sunil.jpg
rename to addons/account_voucher/static/description/testimonial_sunil.jpg
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index dea94d59f4e..5d259772363 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -332,14 +332,15 @@
                     <group>
                         <group>
                                 <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                <field name="payment_option" required="1"/>
+                                <field name="payment_option" required="1" attrs="{'invisible':[('writeoff_amount','=',0)]}"/>
                                 <field name="writeoff_acc_id"
-                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                        attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)], 'required':[('payment_option','=','with_writeoff')]}"
                                         domain="[('type','=','other')]"/>
                                 <field name="comment"
-                                        attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                        attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
                                 <field name="analytic_id"
-                                        groups="analytic.group_analytic_accounting"/>
+                                        groups="analytic.group_analytic_accounting"
+                                        attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
                             </group>
                             <group>
                         </group>
@@ -494,14 +495,15 @@
                                 </group>
                                 <group>
                                     <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <field name="payment_option" required="1"/>
+                                    <field name="payment_option" required="1" attrs="{'invisible':[('writeoff_amount','=',0)]}"/>
                                     <field name="writeoff_acc_id"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                           attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)], 'required':[('payment_option','=','with_writeoff')]}"
                                            domain="[('type','=','other')]"/>
                                     <field name="comment"
-                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                           attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
                                     <field name="analytic_id"
-                                           groups="analytic.group_analytic_accounting"/>
+                                           groups="analytic.group_analytic_accounting"
+                                           attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index ac298713b04..df852181709 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -33,9 +33,9 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
     _track = {
         'state': {
-            'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None:  obj['state'] == 'pending',
-            'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'close',
-            'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
+            'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj.state == 'pending',
+            'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj.state == 'close',
+            'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open',
         },
     }
 
@@ -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, ))
 
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index db269ef37c7..a5bd40e9471 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -36,7 +36,7 @@
                             <button
                                 name="open_hr_expense"
                                 class="oe_link"
-                                string="expenses" type="object"/>
+                                string="Expenses" type="object"/>
                         </td>
                     </tr>
                 </xpath>
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 0477efa5b1f..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)
 
@@ -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:
diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index d0a4fda9632..4651d27fe7d 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -120,7 +120,7 @@ class res_users(osv.osv):
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
             encrypted = md5crypt(value, gen_salt())
-            cr.execute('update res_users set password_crypt=%s where id=%s', (encrypted, int(id)))
+            cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
         del value
 
     def get_pw( self, cr, uid, ids, name, args, context ):
@@ -143,7 +143,7 @@ class res_users(osv.osv):
         cr.execute('SELECT password, password_crypt FROM res_users WHERE id=%s AND active', (uid,))
         if cr.rowcount:
             stored_password, stored_password_crypt = cr.fetchone()
-            if password and not stored_password_crypt:
+            if stored_password and not stored_password_crypt:
                 salt = gen_salt()
                 stored_password_crypt = md5crypt(stored_password, salt)
                 cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
@@ -151,14 +151,15 @@ class res_users(osv.osv):
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
             # check md5crypt
-            if stored_password_crypt[:len(magic_md5)] == magic_md5:
-                salt = stored_password_crypt[len(magic_md5):11]
-                if stored_password_crypt == md5crypt(password, salt):
-                    return
-            elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
-                salt = stored_password_crypt[len(magic_md5):11]
-                if stored_password_crypt == md5crypt(password, salt):
-                    return
+            if stored_password_crypt:
+                if stored_password_crypt[:len(magic_md5)] == magic_md5:
+                    salt = stored_password_crypt[len(magic_md5):11]
+                    if stored_password_crypt == md5crypt(password, salt):
+                        return
+                elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
+                    salt = stored_password_crypt[len(magic_md5):11]
+                    if stored_password_crypt == md5crypt(password, salt):
+                        return
             # Reraise password incorrect
             raise
 
diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py
index 844f6d9fa84..945dad5e3d2 100644
--- a/addons/auth_ldap/__openerp__.py
+++ b/addons/auth_ldap/__openerp__.py
@@ -92,11 +92,6 @@ allows pre-setting the default groups and menus of the first-time users.
          user with the same login (and a blank password), then rename this new
          user to a username that does not exist in LDAP, and setup its groups
          the way you want.
-
-Interaction with base_crypt:
-----------------------------
-The base_crypt module is not compatible with this module, and will disable LDAP
-authentication if installed at the same time.
     """,
     'website' : 'http://www.openerp.com',
     'category' : 'Authentication',
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index 8e7128ca91e..1e957a184c3 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -26,6 +26,7 @@ import openerp.exceptions
 from openerp import tools
 from openerp.osv import fields, osv
 from openerp import SUPERUSER_ID
+from openerp.modules.registry import RegistryManager
 _logger = logging.getLogger(__name__)
 
 class CompanyLDAP(osv.osv):
@@ -190,9 +191,9 @@ class CompanyLDAP(osv.osv):
             user_obj = self.pool['res.users']
             values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
             if conf['user']:
+                values['active'] = True
                 user_id = user_obj.copy(cr, SUPERUSER_ID, conf['user'],
-                                        default={'active': True})
-                user_obj.write(cr, SUPERUSER_ID, user_id, values)
+                                        default=values)
             else:
                 user_id = user_obj.create(cr, SUPERUSER_ID, values)
         return user_id
@@ -243,41 +244,31 @@ class users(osv.osv):
         user_id = super(users, self).login(db, login, password)
         if user_id:
             return user_id
-        cr = self.pool.db.cursor()
-        ldap_obj = self.pool['res.company.ldap']
-        for conf in ldap_obj.get_ldap_dicts(cr):
-            entry = ldap_obj.authenticate(conf, login, password)
-            if entry:
-                user_id = ldap_obj.get_or_create_user(
-                    cr, SUPERUSER_ID, conf, login, entry)
-                if user_id:
-                    cr.execute("""UPDATE res_users
-                                    SET login_date=now() AT TIME ZONE 'UTC'
-                                    WHERE login=%s""",
-                               (tools.ustr(login),))
-                    cr.commit()
-                    break
-        cr.close()
-        return user_id
-
-    def check(self, db, uid, passwd):
-        try:
-            return super(users,self).check(db, uid, passwd)
-        except openerp.exceptions.AccessDenied:
-            pass
-
-        cr = self.pool.db.cursor()
-        cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE',
-                   (int(uid),))
-        res = cr.fetchone()
-        if res:
-            ldap_obj = self.pool['res.company.ldap']
+        registry = RegistryManager.get(db)
+        with registry.cursor() as cr:
+            ldap_obj = registry.get('res.company.ldap')
             for conf in ldap_obj.get_ldap_dicts(cr):
-                if ldap_obj.authenticate(conf, res[0], passwd):
-                    self._uid_cache.setdefault(db, {})[uid] = passwd
-                    cr.close()
-                    return True
-        cr.close()
-        raise openerp.exceptions.AccessDenied()
+                entry = ldap_obj.authenticate(conf, login, password)
+                if entry:
+                    user_id = ldap_obj.get_or_create_user(
+                        cr, SUPERUSER_ID, conf, login, entry)
+                    if user_id:
+                        break
+            return user_id
+
+    def check_credentials(self, cr, uid, password):
+        try:
+            super(users, self).check_credentials(cr, uid, password)
+        except openerp.exceptions.AccessDenied:
+
+            cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE',
+                       (int(uid),))
+            res = cr.fetchone()
+            if res:
+                ldap_obj = self.pool['res.company.ldap']
+                for conf in ldap_obj.get_ldap_dicts(cr):
+                    if ldap_obj.authenticate(conf, res[0], password):
+                        return
+            raise
         
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 3f7ef2f3f0c..35a06871696 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -7,7 +7,8 @@ from werkzeug.exceptions import BadRequest
 
 import openerp
 from openerp import SUPERUSER_ID
-import openerp.addons.web.http as oeweb
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect
 from openerp.modules.registry import RegistryManager
 
@@ -18,7 +19,7 @@ _logger = logging.getLogger(__name__)
 #----------------------------------------------------------
 def fragment_to_query_string(func):
     @functools.wraps(func)
-    def wrapper(self, req, **kw):
+    def wrapper(self, **kw):
         if not kw:
             return """<html><head><script>
                 var l = window.location;
@@ -30,18 +31,17 @@ def fragment_to_query_string(func):
                 }
                 window.location = r;
             </script></head><body></body></html>"""
-        return func(self, req, **kw)
+        return func(self, **kw)
     return wrapper
 
 
 #----------------------------------------------------------
 # Controller
 #----------------------------------------------------------
-class OAuthController(oeweb.Controller):
-    _cp_path = '/auth_oauth'
+class OAuthController(http.Controller):
 
-    @oeweb.jsonrequest
-    def list_providers(self, req, dbname):
+    @http.route('/auth_oauth/list_providers', type='json', auth='none')
+    def list_providers(self, dbname):
         try:
             registry = RegistryManager.get(dbname)
             with registry.cursor() as cr:
@@ -51,9 +51,9 @@ class OAuthController(oeweb.Controller):
             l = []
         return l
 
-    @oeweb.httprequest
+    @http.route('/auth_oauth/signin', type='http', auth='none')
     @fragment_to_query_string
-    def signin(self, req, **kw):
+    def signin(self, **kw):
         state = simplejson.loads(kw['state'])
         dbname = state['d']
         provider = state['p']
@@ -71,7 +71,7 @@ class OAuthController(oeweb.Controller):
                     url = '/#action=%s' % action
                 elif menu:
                     url = '/#menu_id=%s' % menu
-                return login_and_redirect(req, *credentials, redirect_url=url)
+                return login_and_redirect(*credentials, redirect_url=url)
             except AttributeError:
                 # auth_signup is not installed
                 _logger.error("auth_signup not installed on database %s: oauth sign up cancelled." % (dbname,))
@@ -88,21 +88,24 @@ class OAuthController(oeweb.Controller):
                 _logger.exception("OAuth2: %s" % str(e))
                 url = "/#action=login&oauth_error=2"
 
-        return set_cookie_and_redirect(req, url)
+        return set_cookie_and_redirect(url)
 
-    @oeweb.httprequest
-    def oea(self, req, **kw):
+    @http.route('/auth_oauth/oea', type='http', auth='none')
+    def oea(self, **kw):
         """login user via OpenERP Account provider"""
         dbname = kw.pop('db', None)
         if not dbname:
-            dbname = db_monodb(req)
+            dbname = db_monodb()
         if not dbname:
             return BadRequest()
 
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
             IMD = registry['ir.model.data']
-            model, provider_id = IMD.get_object_reference(cr, SUPERUSER_ID, 'auth_oauth', 'provider_openerp')
+            try:
+                model, provider_id = IMD.get_object_reference(cr, SUPERUSER_ID, 'auth_oauth', 'provider_openerp')
+            except ValueError:
+                return set_cookie_and_redirect('/?db=%s' % dbname)
             assert model == 'auth.oauth.provider'
 
         state = {
@@ -112,6 +115,6 @@ class OAuthController(oeweb.Controller):
         }
 
         kw['state'] = simplejson.dumps(state)
-        return self.signin(req, **kw)
+        return self.signin(**kw)
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index 131ae5c1c42..5046469a5dc 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -1,4 +1,6 @@
 openerp.auth_oauth = function(instance) {
+    var _t = instance.web._t,
+        _lt = instance.web._lt;
     var QWeb = instance.web.qweb;
 
     instance.web.Login.include({
@@ -9,9 +11,11 @@ openerp.auth_oauth = function(instance) {
             this.$el.on('click', 'a.zocial', this.on_oauth_sign_in);
             this.oauth_providers = [];
             if(this.params.oauth_error === 1) {
-                this.do_warn("Sign up error.","Sign up is not allowed on this database.");
+                this.do_warn(_t("Sign up error"),_t("Sign up is not allowed on this database."), true);
             } else if(this.params.oauth_error === 2) {
-                this.do_warn("Authentication error","");
+                this.do_warn(_t("Authentication error"),_t("Access Denied"), true);
+            } else if(this.params.oauth_error === 3) {
+                this.do_warn(_t("Authentication error"),_t("You do not have access to this database or your invitation has expired. Please ask for an invitation and be sure to follow the link in your invitation email."), true);
             }
             return d.done(this.do_oauth_load).fail(function() {
                 self.do_oauth_load([]);
diff --git a/addons/auth_oauth_signup/i18n/vi.po b/addons/auth_oauth_signup/i18n/vi.po
new file mode 100644
index 00000000000..bdc3eff5b8d
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/vi.po
@@ -0,0 +1,23 @@
+# Vietnamese 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-27 06:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Người dùng"
diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py
index 5eebc02fe04..a06968fa46f 100644
--- a/addons/auth_oauth_signup/res_users.py
+++ b/addons/auth_oauth_signup/res_users.py
@@ -23,6 +23,7 @@ import logging
 import simplejson
 
 import openerp
+from openerp.addons.auth_signup.res_users import SignupError
 from openerp.osv import osv, fields
 
 _logger = logging.getLogger(__name__)
@@ -35,7 +36,7 @@ class res_users(osv.Model):
         try:
             login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
 
-        except openerp.exceptions.AccessDenied:
+        except openerp.exceptions.AccessDenied, access_denied_exception:
             if context and context.get('no_user_creation'):
                 return None
             state = simplejson.loads(params['state'])
@@ -52,6 +53,8 @@ class res_users(osv.Model):
                 'oauth_access_token': params['access_token'],
                 'active': True,
             }
-            _, login, _ = self.signup(cr, uid, values, token, context=context)
-
+            try:
+                _, login, _ = self.signup(cr, uid, values, token, context=context)       
+            except SignupError:
+                raise access_denied_exception
         return login
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index 1fcc34c82a0..a4ef1bfa07b 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -38,6 +38,8 @@ import openerp
 from openerp import SUPERUSER_ID
 from openerp.modules.registry import RegistryManager
 from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 
 from .. import utils
 
@@ -88,20 +90,19 @@ class GoogleAppsAwareConsumer(consumer.GenericConsumer):
         return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to)
 
 
-class OpenIDController(openerp.addons.web.http.Controller):
-    _cp_path = '/auth_openid/login'
+class OpenIDController(http.Controller):
 
     _store = filestore.FileOpenIDStore(_storedir)
 
     _REQUIRED_ATTRIBUTES = ['email']
     _OPTIONAL_ATTRIBUTES = 'nickname fullname postcode country language timezone'.split()
 
-    def _add_extensions(self, request):
-        """Add extensions to the request"""
+    def _add_extensions(self, oidrequest):
+        """Add extensions to the oidrequest"""
 
         sreg_request = sreg.SRegRequest(required=self._REQUIRED_ATTRIBUTES,
                                         optional=self._OPTIONAL_ATTRIBUTES)
-        request.addExtension(sreg_request)
+        oidrequest.addExtension(sreg_request)
 
         ax_request = ax.FetchRequest()
         for alias in self._REQUIRED_ATTRIBUTES:
@@ -111,7 +112,7 @@ class OpenIDController(openerp.addons.web.http.Controller):
             uri = utils.SREG2AX[alias]
             ax_request.add(ax.AttrInfo(uri, required=False, alias=alias))
 
-        request.addExtension(ax_request)
+        oidrequest.addExtension(ax_request)
 
     def _get_attributes_from_success_response(self, success_response):
         attrs = {}
@@ -133,58 +134,58 @@ class OpenIDController(openerp.addons.web.http.Controller):
                     attrs[attr] = value
         return attrs
 
-    def _get_realm(self, req):
-        return req.httprequest.host_url
+    def _get_realm(self):
+        return request.httprequest.host_url
 
-    @openerp.addons.web.http.httprequest
-    def verify_direct(self, req, db, url):
-        result = self._verify(req, db, url)
+    @http.route('/auth_openid/login/verify_direct', type='http', auth='none')
+    def verify_direct(self, db, url):
+        result = self._verify(db, url)
         if 'error' in result:
             return werkzeug.exceptions.BadRequest(result['error'])
         if result['action'] == 'redirect':
             return werkzeug.utils.redirect(result['value'])
         return result['value']
 
-    @openerp.addons.web.http.jsonrequest
-    def verify(self, req, db, url):
-        return self._verify(req, db, url)
+    @http.route('/auth_openid/login/verify', type='json', auth='none')
+    def verify(self, db, url):
+        return self._verify(db, url)
 
-    def _verify(self, req, db, url):
-        redirect_to = werkzeug.urls.Href(req.httprequest.host_url + 'auth_openid/login/process')(session_id=req.session_id)
-        realm = self._get_realm(req)
+    def _verify(self, db, url):
+        redirect_to = werkzeug.urls.Href(request.httprequest.host_url + 'auth_openid/login/process')(session_id=request.session_id)
+        realm = self._get_realm()
 
         session = dict(dbname=db, openid_url=url)       # TODO add origin page ?
         oidconsumer = consumer.Consumer(session, self._store)
 
         try:
-            request = oidconsumer.begin(url)
+            oidrequest = oidconsumer.begin(url)
         except consumer.DiscoveryFailure, exc:
             fetch_error_string = 'Error in discovery: %s' % (str(exc[0]),)
             return {'error': fetch_error_string, 'title': 'OpenID Error'}
 
-        if request is None:
+        if oidrequest is None:
             return {'error': 'No OpenID services found', 'title': 'OpenID Error'}
 
-        req.session.openid_session = session
-        self._add_extensions(request)
+        request.session.openid_session = session
+        self._add_extensions(oidrequest)
 
-        if request.shouldSendRedirect():
-            redirect_url = request.redirectURL(realm, redirect_to)
-            return {'action': 'redirect', 'value': redirect_url, 'session_id': req.session_id}
+        if oidrequest.shouldSendRedirect():
+            redirect_url = oidrequest.redirectURL(realm, redirect_to)
+            return {'action': 'redirect', 'value': redirect_url, 'session_id': request.session_id}
         else:
-            form_html = request.htmlMarkup(realm, redirect_to)
-            return {'action': 'post', 'value': form_html, 'session_id': req.session_id}
+            form_html = oidrequest.htmlMarkup(realm, redirect_to)
+            return {'action': 'post', 'value': form_html, 'session_id': request.session_id}
 
-    @openerp.addons.web.http.httprequest
-    def process(self, req, **kw):
-        session = getattr(req.session, 'openid_session', None)
+    @http.route('/auth_openid/login/process', type='http', auth='none')
+    def process(self, **kw):
+        session = getattr(request.session, 'openid_session', None)
         if not session:
-            return set_cookie_and_redirect(req, '/')
+            return set_cookie_and_redirect('/')
 
         oidconsumer = consumer.Consumer(session, self._store, consumer_class=GoogleAppsAwareConsumer)
 
-        query = req.httprequest.args
-        info = oidconsumer.complete(query, req.httprequest.base_url)
+        query = request.httprequest.args
+        info = oidconsumer.complete(query, request.httprequest.base_url)
         display_identifier = info.getDisplayIdentifier()
 
         session['status'] = info.status
@@ -225,7 +226,7 @@ class OpenIDController(openerp.addons.web.http.Controller):
                         # TODO fill empty fields with the ones from sreg/ax
                         cr.commit()
 
-                        return login_and_redirect(req, dbname, login, key)
+                        return login_and_redirect(dbname, login, key)
 
             session['message'] = 'This OpenID identifier is not associated to any active users'
 
@@ -241,11 +242,11 @@ class OpenIDController(openerp.addons.web.http.Controller):
             # information in a log.
             session['message'] = 'Verification failed.'
 
-        return set_cookie_and_redirect(req, '/#action=login&loginerror=1')
+        return set_cookie_and_redirect('/#action=login&loginerror=1')
 
-    @openerp.addons.web.http.jsonrequest
-    def status(self, req):
-        session = getattr(req.session, 'openid_session', {})
+    @http.route('/auth_openid/login/status', type='json', auth='none')
+    def status(self):
+        session = getattr(request.session, 'openid_session', {})
         return {'status': session.get('status'), 'message': session.get('message')}
 
 
diff --git a/addons/auth_openid/i18n/vi.po b/addons/auth_openid/i18n/vi.po
new file mode 100644
index 00000000000..d1040420132
--- /dev/null
+++ b/addons/auth_openid/i18n/vi.po
@@ -0,0 +1,97 @@
+# Vietnamese 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-27 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:24
+#, python-format
+msgid "Username"
+msgstr "Tên đăng nhập"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:12
+#: view:res.users:0
+#, python-format
+msgid "OpenID"
+msgstr "OpenID"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:30
+#: field:res.users,openid_url:0
+#, python-format
+msgid "OpenID URL"
+msgstr "Đường dẫn OpenID"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:9
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
+#, python-format
+msgid "Google"
+msgstr "Google"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:11
+#, python-format
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr ""
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:18
+#, python-format
+msgid "Google Apps Domain"
+msgstr ""
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID Email"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr ""
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:8
+#, python-format
+msgid "Password"
+msgstr "Mật khẩu"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
+#, python-format
+msgid "Google Apps"
+msgstr ""
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "Users"
+msgstr "Người dùng"
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 924e1546862..e42dc64151f 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -23,14 +23,15 @@ import logging
 import openerp
 from openerp.modules.registry import RegistryManager
 from ..res_users import SignupError
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 
 _logger = logging.getLogger(__name__)
 
-class Controller(openerp.addons.web.http.Controller):
-    _cp_path = '/auth_signup'
+class Controller(http.Controller):
 
-    @openerp.addons.web.http.jsonrequest
-    def get_config(self, req, dbname):
+    @http.route('/auth_signup/get_config', type='json', auth="none")
+    def get_config(self, dbname):
         """ retrieve the module config (which features are enabled) for the login page """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
@@ -41,8 +42,8 @@ class Controller(openerp.addons.web.http.Controller):
             }
         return config
 
-    @openerp.addons.web.http.jsonrequest
-    def retrieve(self, req, dbname, token):
+    @http.route('/auth_signup/retrieve', type='json', auth="none")
+    def retrieve(self, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
@@ -50,23 +51,23 @@ class Controller(openerp.addons.web.http.Controller):
             user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
         return user_info
 
-    @openerp.addons.web.http.jsonrequest
-    def signup(self, req, dbname, token, **values):
+    @http.route('/auth_signup/signup', type='json', auth="none")
+    def signup(self, dbname, token, **values):
         """ sign up a user (new or existing)"""
         try:
-            self._signup_with_values(req, dbname, token, values)
+            self._signup_with_values(dbname, token, values)
         except SignupError, e:
             return {'error': openerp.tools.exception_to_unicode(e)}
         return {}
 
-    def _signup_with_values(self, req, dbname, token, values):
+    def _signup_with_values(self, dbname, token, values):
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
             res_users = registry.get('res.users')
             res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
-    @openerp.addons.web.http.jsonrequest
-    def reset_password(self, req, dbname, login):
+    @http.route('/auth_signup/reset_password', type='json', auth="none")
+    def reset_password(self, dbname, login):
         """ retrieve user, and perform reset password """
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
diff --git a/addons/auth_signup/i18n/vi.po b/addons/auth_signup/i18n/vi.po
new file mode 100644
index 00000000000..a79bbcb7bb4
--- /dev/null
+++ b/addons/auth_signup/i18n/vi.po
@@ -0,0 +1,288 @@
+# Vietnamese 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-27 06:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr "Loại mã đăng ký"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr "Cho phép người dùng bên ngoài đăng ký."
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Confirm Password"
+msgstr "Xác nhận mật khẩu"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr "Nếu không chọn, chỉ những người được mời mới được đăng ký."
+
+#. 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:266
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr "Không thể gửi email: người dùng không có địa chỉ email"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
+#, python-format
+msgid "Reset password"
+msgstr "Đặt lại mật khẩu"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr "Mẫu người dùng sử dụng khi đăng ký"
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "Quên mật khẩu"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr "Vui lòng nhập mật khẩu và xác nhận nó"
+
+#. 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:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
+#, 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 "Trạng thái"
+
+#. 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 ""
+"\n"
+"\\n\n"
+"<p>Bạn có một yêu cầu reset mật khẩu từ tài khoản OpenERPA gắn với email "
+"này.</p>\\n\n"
+"\\n\n"
+"<p>Bạn có thể thay đổi mật khẩu thông qua <a href=\\\"${object.signup_url}\\"
+"\">đường dẫn này</a>.</p>\\n\n"
+"\\n\n"
+"<p>Lưu ý: Nếu đây không phải chủ ý của bạn. Bạn có thể bỏ qua email này.</p>"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr "Xin nhập tên."
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Người dùng"
+
+#. 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:117
+#, 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:270
+#, 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:173
+#, 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:25
+#, 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: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:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, 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:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, 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:30
+#, 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/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index aa8d9f952c1..497b872997f 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: 2013-04-16 04:33+0000\n"
-"Last-Translator: Key <key.diagram@gmail.com>\n"
+"PO-Revision-Date: 2013-07-02 08:11+0000\n"
+"Last-Translator: DWXXX <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-07-03 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -29,7 +29,7 @@ msgstr "允许外部用户登录"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
 #, python-format
 msgid "Confirm Password"
 msgstr "确认密码"
@@ -37,7 +37,7 @@ msgstr "确认密码"
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
 msgid "If unchecked, only invited users may sign up."
-msgstr ""
+msgstr "如果不勾选，只有被邀请用户才能注册。"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
@@ -45,15 +45,15 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:265
+#: code:addons/auth_signup/res_users.py:266
 #, python-format
 msgid "Cannot send email: user has no email address."
-msgstr ""
+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
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
 #, python-format
 msgid "Reset password"
 msgstr "重设密码"
@@ -70,7 +70,7 @@ msgstr "重置密码"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "请输入密码并确认。"
@@ -78,12 +78,12 @@ msgstr "请输入密码并确认。"
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send an email to the user to (re)set their password."
-msgstr ""
+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
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
 #, python-format
 msgid "Sign Up"
 msgstr "注册"
@@ -119,10 +119,10 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "请输入名字"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
@@ -136,10 +136,10 @@ msgstr "注册 URL"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
 #, python-format
 msgid "Please enter a username."
-msgstr ""
+msgstr "请输入您的用户名"
 
 #. module: auth_signup
 #: selection:res.users,state:0
@@ -147,7 +147,7 @@ msgid "Active"
 msgstr "启用"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:269
+#: code:addons/auth_signup/res_users.py:270
 #, python-format
 msgid ""
 "Cannot send email: no outgoing email server configured.\n"
@@ -170,10 +170,10 @@ msgstr "姓名"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "请输入用户名和邮件地址"
 
 #. module: auth_signup
 #: selection:res.users,state:0
@@ -199,7 +199,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
 #, python-format
 msgid "Log in"
 msgstr "登录"
@@ -211,35 +211,35 @@ msgstr "注册令牌（ Token  ）是有效的"
 
 #. 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:123
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
 #, 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
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "No database selected !"
 msgstr ""
@@ -256,7 +256,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
 #, python-format
 msgid "Back to Login"
 msgstr "返回登录页面"
@@ -266,12 +266,12 @@ msgstr "返回登录页面"
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Sign up"
-msgstr ""
+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/res_users.py b/addons/auth_signup/res_users.py
index 891837f8813..38beb087c7a 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -26,7 +26,7 @@ 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
+from ast import literal_eval
 from openerp.tools.translate import _
 
 class SignupError(Exception):
@@ -221,12 +221,12 @@ class res_users(osv.Model):
     def _signup_create_user(self, cr, uid, values, context=None):
         """ create a new user from the template user """
         ir_config_parameter = self.pool.get('ir.config_parameter')
-        template_user_id = safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.template_user_id', 'False'))
+        template_user_id = literal_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.template_user_id', 'False'))
         assert template_user_id and self.exists(cr, uid, template_user_id, context=context), 'Signup: invalid template user'
 
         # check that uninvited users may sign up
         if 'partner_id' not in values:
-            if not safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')):
+            if not literal_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')):
                 raise SignupError('Signup is not allowed for uninvited users')
 
         assert values.get('login'), "Signup: no login given for new user"
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 313ddb8453a..ff122ab926f 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Calendar',
     'version': '1.0',
-    'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
+    'depends': ['base', 'mail', 'base_action_rule'],
     'summary': 'Personal & Shared Calendar',
     'description': """
 This is a full-featured calendar system.
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 896349ec5e6..64b6f01d05c 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1187,8 +1187,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             context = {}
 
         result = []
-        for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'exdate', 'exrule', 'date'], context=context):
-            if not data['rrule']:
+        for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'recurrency', 'exdate', 'exrule', 'date'], context=context):
+            if not data['recurrency'] or not data['rrule']:
                 result.append(data['id'])
                 continue
             event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
@@ -1510,7 +1510,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                     continue
             if r['class']=='private':
                 for f in r.keys():
-                    if f not in ('id','date','date_deadline','duration','user_id','state'):
+                    if f not in ('id','date','date_deadline','duration','user_id','state','interval','count'):
                         if isinstance(r[f], list):
                             r[f] = []
                         else:
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index aa476002abc..66823e0b8f4 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -25,7 +25,6 @@ from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
 from openerp.tools.translate import _
 from base_calendar import get_real_ids, base_calendar_id2real_id
-from openerp.addons.base_status.base_state import base_state
 #
 # crm.meeting is defined here so that it may be used by modules other than crm,
 # without forcing the installation of crm.
@@ -38,14 +37,13 @@ class crm_meeting_type(osv.Model):
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
 
-class crm_meeting(base_state, osv.Model):
+class crm_meeting(osv.Model):
     """ Model for CRM meetings """
     _name = 'crm.meeting'
     _description = "Meeting"
     _order = "id desc"
     _inherit = ["calendar.event", "mail.thread", "ir.needaction_mixin"]
     _columns = {
-        # base_state required fields
         'create_date': fields.datetime('Creation Date', readonly=True),
         'write_date': fields.datetime('Write Date', readonly=True),
         'date_open': fields.datetime('Confirmed', readonly=True),
@@ -60,7 +58,7 @@ class crm_meeting(base_state, osv.Model):
         'categ_ids': fields.many2many('crm.meeting.type', 'meeting_category_rel',
             'event_id', 'type_id', 'Tags'),
         'attendee_ids': fields.many2many('calendar.attendee', 'meeting_attendee_rel',\
-                            'event_id', 'attendee_id', 'Attendees', states={'done': [('readonly', True)]}),
+                            'event_id', 'attendee_id', 'Invited People', states={'done': [('readonly', True)]}),
     }
     _defaults = {
         'state': 'open',
@@ -79,6 +77,12 @@ class crm_meeting(base_state, osv.Model):
         default['attendee_ids'] = False
         return super(crm_meeting, self).copy(cr, uid, id, default, context)
 
+    def write(self, cr, uid, ids, values, context=None):
+        """ Override to add case management: open/close dates """
+        if values.get('state')and values.get('state') == 'open':
+            values['date_open'] = fields.datetime.now()
+        return super(crm_meeting, self).write(cr, uid, ids, values, context=context)
+
     def onchange_partner_ids(self, cr, uid, ids, value, context=None):
         """ The basic purpose of this method is to check that destination partners
             effectively have email addresses. Otherwise a warning is thrown.
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index ed1cddd716b..a5ede7a80c9 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/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-11-28 16:50+0000\n"
-"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
+"PO-Revision-Date: 2013-06-29 05:34+0000\n"
+"Last-Translator: David.Xu <xzxyxu@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:45+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -42,7 +42,7 @@ msgstr "这属性定义循环日程的日期/时间异常列表。"
 #: selection:calendar.todo,rrule_type:0
 #: selection:crm.meeting,rrule_type:0
 msgid "Week(s)"
-msgstr ""
+msgstr "周"
 
 #. module: base_calendar
 #: field:calendar.event,we:0
@@ -248,7 +248,7 @@ msgid "To"
 msgstr "到"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1260
+#: code:addons/base_calendar/base_calendar.py:1262
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -300,7 +300,7 @@ msgstr "与会者的参与状况"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "收信人"
 
 #. module: base_calendar
 #: field:crm.meeting,name:0
@@ -361,9 +361,9 @@ msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视
 #. module: base_calendar
 #: 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
+#: code:addons/base_calendar/base_calendar.py:1017
+#: code:addons/base_calendar/base_calendar.py:1462
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -478,7 +478,7 @@ msgstr "日期"
 #. module: base_calendar
 #: field:crm.meeting,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: base_calendar
 #: field:calendar.event,location:0
@@ -522,7 +522,7 @@ msgid "Event alarm information"
 msgstr "事件提醒信息"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1015
+#: code:addons/base_calendar/base_calendar.py:1017
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -530,21 +530,21 @@ msgstr ""
 #. module: base_calendar
 #: field:crm.meeting,create_date:0
 msgid "Creation Date"
-msgstr ""
+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 ""
+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 ""
+msgstr "月"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -566,7 +566,7 @@ msgstr "Caldav 服务的URL"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "邀请向导"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -590,7 +590,7 @@ msgstr "周四"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Meeting Details"
-msgstr ""
+msgstr "会议详情"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
@@ -601,21 +601,21 @@ msgstr "代表人"
 #: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
-msgstr ""
+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 ""
+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 ""
+msgstr "会议类型"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
@@ -633,7 +633,7 @@ msgstr "全员可见"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "hours"
-msgstr ""
+msgstr "小时"
 
 #. module: base_calendar
 #: field:calendar.attendee,partner_id:0
@@ -655,7 +655,7 @@ msgstr "重复直到"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -694,7 +694,7 @@ msgstr "周二"
 #. module: base_calendar
 #: field:crm.meeting,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "标签"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -741,7 +741,7 @@ msgid "Declined"
 msgstr "已拒绝"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1460
+#: code:addons/base_calendar/base_calendar.py:1462
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -1200,7 +1200,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1519
+#: code:addons/base_calendar/base_calendar.py:1521
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1453,7 +1453,7 @@ msgid "Weekday"
 msgstr "工作日"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1013
+#: code:addons/base_calendar/base_calendar.py:1015
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""
diff --git a/addons/base_calendar/static/src/img/icon.png b/addons/base_calendar/static/description/icon.png
similarity index 100%
rename from addons/base_calendar/static/src/img/icon.png
rename to addons/base_calendar/static/description/icon.png
diff --git a/addons/base_crypt/i18n/vi.po b/addons/base_crypt/i18n/vi.po
index 7ab8f31bc3c..2265e70eb2e 100644
--- a/addons/base_crypt/i18n/vi.po
+++ b/addons/base_crypt/i18n/vi.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: 2011-07-20 09:55+0000\n"
-"Last-Translator: OpenBMS JSC <Unknown>\n"
+"PO-Revision-Date: 2013-06-30 16:09+0000\n"
+"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
 "Language-Team: Vietnamese <vi@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-07-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Người dùng"
 
 #, python-format
 #~ msgid "Error"
diff --git a/addons/base_gengo/i18n/th.po b/addons/base_gengo/i18n/th.po
new file mode 100644
index 00000000000..e0b5ba3e2fc
--- /dev/null
+++ b/addons/base_gengo/i18n/th.po
@@ -0,0 +1,249 @@
+# 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-06-20 13:54+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-06-21 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "ความคิดเห็น"
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr "base.gengo.translations"
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr "ภาษา"
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr ""
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr ""
diff --git a/addons/base_import/static/csv/o2m_customers_contacts.csv b/addons/base_import/static/csv/o2m_customers_contacts.csv
new file mode 100644
index 00000000000..9a2411b2bee
--- /dev/null
+++ b/addons/base_import/static/csv/o2m_customers_contacts.csv
@@ -0,0 +1,9 @@
+Name,Is a company,Related company,Address type,Customer,Supplier,Street,ZIP,City,State,Country
+Aurora Shelves,1,,,1,0,25 Pacific Road,95101,San José,CA,United States
+Roger Martins,0,Aurora Shelves,Invoice,1,0,27 Pacific Road,95102,San José,CA,United States
+House Sales Direct,1,,,1,0,104 Saint Mary Avenue,94059,Redwood,CA,United States
+Yvan Holiday,0,House Sales Direct,Default,1,0,104 Saint Mary Avenue,94060,Redwood,CA,United States
+Jack Unsworth,0,House Sales Direct,Invoice,1,0,227 Jackson Road,94061,Redwood,CA,United States
+Michael Mason,0,,,1,0,16 5th Avenue,94104,San Francisco,CA,United States
+International Wood,1,,,1,0,748 White House Boulevard,20004,Washington,DC,United States
+Sharon Pecker,0,International Wood,Invoice,1,0,755 White House Boulevard,20005,Washington,DC,United States
diff --git a/addons/base_import/static/csv/o2m_suppliers_contacts.csv b/addons/base_import/static/csv/o2m_suppliers_contacts.csv
deleted file mode 100644
index 6c7be9037b8..00000000000
--- a/addons/base_import/static/csv/o2m_suppliers_contacts.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-Name,Address type,Street,City,Country,Tags,Supplier,Customer,Is a company,Companies that refers to partner / Parent company
-Wood y Wood Pecker,,"Snow Street, 25",Kainuu,Finland,Supplier,1,0,1,
-Roger Pecker,Default,"Snow Street, 27",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker
-Sharon Pecker,Delivery,"Snow Street, 28",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker
-Thomas Pecker,Contact,"Snow Street, 27",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker
-Vicking Direct,,"Atonium Street, 45a",Brussels,Belgium,Supplier,1,0,1,
-Yvan Holiday,Invoice,"Atonium Street, 45b",Brussels,Belgium,Supplier,1,0,0,Vicking Direct
-Jack Unsworth,Contact,"Atonium Street, 45a",Brussels,Belgium,Supplier,1,0,0,Vicking Direct
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index c8b2b2c63dd..97bf3e66f7a 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -229,8 +229,8 @@
                         orders with their respective purchase order lines:</p>
                         <a href="/base_import/static/csv/o2m_purchase_order_lines.csv">Purchase orders with their respective purchase order lines</a>
                         <p>The following CSV file shows how to import 
-                        suppliers and their respective contacts</p>
-                        <a href="/base_import/static/csv/o2m_suppliers_contacts.csv">Suppliers and their respective contacts</a>
+                        customers and their respective contacts</p>
+                        <a href="/base_import/static/csv/o2m_customers_contacts.csv">Customers and their respective contacts</a>
                     </dd>
                 </dl>
 
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 99898f5a703..61b7fbc4c1d 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -14,9 +14,13 @@
                         <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
                     </separator>
                     <xpath expr="//button[@string='Install Modules']" position="replace">
-                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
+                        <button name="action_next" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
+                        <label string="or" invisible="context.get('menu',False)" class="oe_inline"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Skip']" position="replace">
+                        <button string="Ok" class="oe_highlight" special="cancel" invisible="context.get('active_model',False)"/>
+                        <button string="Skip" class="oe_link" special="cancel" invisible="context.get('menu',False)"/>
                     </xpath>
-                    
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
                             <field name="name" invisible="1"/>
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 a12becdc68c..669c8b8fb84 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,7 +1,7 @@
 #########################################################################
 #
 #  Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
-#  Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#  Copyright (C) 2004-2013 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
@@ -78,7 +78,7 @@ class ExportToRML( unohelper.Base, XJobExecutor ):
 
             res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'sxwtorml',base64.encodestring(data),file_type)
             if res['report_rml_content']:
-                write_data_to_file( get_absolute_file_path( filename[7:] ), res['report_rml_content'] )
+                write_data_to_file(get_absolute_file_path(filename), res['report_rml_content'])
         except Exception,e:
             import traceback,sys
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
@@ -99,8 +99,12 @@ class ExportToRML( unohelper.Base, XJobExecutor ):
 
         oFileDialog.setDefaultName(f_path )
 
-        sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or None
+        sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or ''
         oFileDialog.dispose()
+        sPath = sPath[7:]
+        if sPath.startswith('localhost/'):
+            slash = int(os.name == 'nt')
+            sPath = sPath[9 + slash:]
         return sPath
 
 if __name__<>"package" and __name__=="__main__":
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
index 5d6f8ca6dbc..e0176bfec62 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
@@ -61,8 +61,8 @@ class RPCSession(object):
         protocol = m.group(1)
         if not m:
             return -1
-        if protocol == 'http://' or protocol == 'http://':
-            self.gateway = XMLRPCGateway(host, port, 'http')
+        if protocol == 'http://' or protocol == 'https://':
+            self.gateway = XMLRPCGateway(host, port, protocol[:-3])
         elif protocol == 'socket://':
 
             self.gateway = NETRPCGateway(host, port)
diff --git a/addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip b/addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip
index 7d03f45dbb4..2fc61fbf679 100644
Binary files a/addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip and b/addons/base_report_designer/static/base-report-designer-plugin/openerp_report_designer.zip differ
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 93f65355baa..ab26ce496d6 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: 2013-05-27 12:19+0000\n"
-"Last-Translator: leksei <lirgus@gmail.com>\n"
+"PO-Revision-Date: 2013-06-17 10: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-05-28 05:17+0000\n"
-"X-Generator: Launchpad (build 16640)\n"
+"X-Launchpad-Export-Date: 2013-06-18 05:46+0000\n"
+"X-Generator: Launchpad (build 16673)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -92,7 +92,7 @@ msgstr "Общие настройки"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Спонсор"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -147,7 +147,7 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "Свойства заказчика"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -157,7 +157,7 @@ msgstr "Импорт / Экспорт"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "Свойства продаж"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
@@ -232,7 +232,7 @@ msgstr ""
 #. 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
@@ -263,7 +263,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "base.setup.terminology"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 33c5aa863bf..6b8578bbf47 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -36,6 +36,8 @@ class base_config_settings(osv.osv_memory):
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
+        'module_google_drive': fields.boolean('Attach Google documents to any record',
+                                              help="""This installs the module google_docs."""),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 8c48f5d7a6b..73685be95df 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -81,6 +81,15 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Google Drive"/>
+                        <div name="google_drive">
+                            <div name="module_google_drive">
+                                <field name="module_google_drive" class="oe_inline"/>
+                                <label for="module_google_drive"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
deleted file mode 100644
index edf9db166af..00000000000
--- a/addons/base_status/base_stage.py
+++ /dev/null
@@ -1,264 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-today OpenERP SA (<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 fields, osv
-from openerp.tools.translate import _
-
-class base_stage(object):
-    """ Base utility mixin class for objects willing to manage their stages.
-        Object that inherit from this class should inherit from mailgate.thread
-        to have access to the mail gateway, as well as Chatter. Objects
-        subclassing this class should define the following colums:
-        - ``date_open`` (datetime field)
-        - ``date_closed`` (datetime field)
-        - ``user_id`` (many2one to res.users)
-        - ``partner_id`` (many2one to res.partner)
-        - ``stage_id`` (many2one to a stage definition model)
-        - ``state`` (selection field, related to the stage_id.state)
-    """
-
-    def _get_default_partner(self, cr, uid, context=None):
-        """ Gives id of partner for current user
-            :param context: if portal not in context returns False
-        """
-        if context is None:
-            context = {}
-        if context.get('portal'):
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            return user.partner_id.id
-        return False
-
-    def _get_default_email(self, cr, uid, context=None):
-        """ Gives default email address for current user
-            :param context: if portal not in context returns False
-        """
-        if context is None:
-            context = {}
-        if context.get('portal'):
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            return user.email
-        return False        
-
-    def _get_default_user(self, cr, uid, context=None):
-        """ Gives current user id
-            :param context: if portal not in context returns False
-        """
-        if context is None:
-            context = {}
-        if not context or context.get('portal'):
-            return False
-        return uid
-
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False, context=None):
-        """ This function returns value of partner email based on Partner Address
-            :param add: Id of Partner's address
-            :param email: Partner's email ID
-        """
-        data = {'value': {'email_from': False, 'phone':False}}
-        if add:
-            address = self.pool.get('res.partner').browse(cr, uid, add)
-            data['value'] = {'partner_name': address and address.name or False,
-                             'email_from': address and address.email or False,
-                             'phone':  address and address.phone or False,
-                             'street': address and address.street or False,
-                             'street2': address and address.street2 or False,
-                             'city': address and address.city or False,
-                             'state_id': address.state_id and address.state_id.id or False,
-                             'zip': address and address.zip or False,
-                             'country_id': address.country_id and address.country_id.id or False,
-                             }
-        fields = self.fields_get(cr, uid, context=context or {})
-        for key in data['value'].keys():
-            if key not in fields:
-                del data['value'][key]
-        return data
-
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """ This function returns value of partner address based on partner
-            :param part: Partner's id
-            :param email: Partner's email ID
-        """
-        data={}
-        if  part:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-            data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
-
-    def _get_default_section_id(self, cr, uid, context=None):
-        """ Gives default section """
-        return False
-
-    def _get_default_stage_id(self, cr, uid, context=None):
-        """ Gives default stage_id """
-        return self.stage_find(cr, uid, [], None, [('state', '=', 'draft')], context=context)
-
-    def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
-        """ Find stage, with a given (optional) domain on the search,
-            ordered by the order parameter. If several stages match the
-            search criterions, the first one will be returned, according
-            to the requested search order.
-            This method is meant to be overriden by subclasses. That way
-            specific behaviors can be achieved for every class inheriting
-            from base_stage.
-
-            :param cases: browse_record of cases
-            :param section_id: section limitating the search, given for
-                               a generic search (for example default search).
-                               A section models concepts such as Sales team
-                               (for CRM), ou departments (for HR).
-            :param domain: a domain on the search of stages
-            :param order: order of the search
-        """
-        return False
-
-    def stage_set_with_state_name(self, cr, uid, cases, state_name, context=None):
-        """ Set a new stage, with a state_name instead of a stage_id
-            :param cases: browse_record of cases
-        """
-        if isinstance(cases, (int, long)):
-            cases = self.browse(cr, uid, cases, context=context)
-        for case in cases:
-            stage_id = self.stage_find(cr, uid, [case], None, [('state', '=', state_name)], context=context)
-            if stage_id:
-                self.stage_set(cr, uid, [case.id], stage_id, context=context)
-        return True
-
-    def stage_set(self, cr, uid, ids, stage_id, context=None):
-        """ Set the new stage. This methods is the right method to call
-            when changing states. It also checks whether an onchange is
-            defined, and execute it.
-        """
-        value = {}
-        if hasattr(self, 'onchange_stage_id'):
-            value = self.onchange_stage_id(cr, uid, ids, stage_id, context=context)['value']
-        value['stage_id'] = stage_id
-        return self.write(cr, uid, ids, value, context=context)
-
-    def stage_change(self, cr, uid, ids, op, order, context=None):
-        """ Change the stage and take the next one, based on a condition
-            writen for the 'sequence' field and an operator. This methods
-            checks whether the case has a current stage, and takes its
-            sequence. Otherwise, a default 0 sequence is chosen and this
-            method will therefore choose the first available stage.
-            For example if op is '>' and current stage has a sequence of
-            10, this will call stage_find, with [('sequence', '>', '10')].
-        """
-        for case in self.browse(cr, uid, ids, context=context):
-            seq = 0
-            if case.stage_id:
-                seq = case.stage_id.sequence or 0
-            section_id = None
-            next_stage_id = self.stage_find(cr, uid, [case], None, [('sequence', op, seq)],order, context=context)
-            if next_stage_id:
-                return self.stage_set(cr, uid, [case.id], next_stage_id, context=context)
-        return False
-
-    def stage_next(self, cr, uid, ids, context=None):
-        """ This function computes next stage for case from its current stage
-            using available stage for that case type
-        """
-        return self.stage_change(cr, uid, ids, '>','sequence', context)
-
-    def stage_previous(self, cr, uid, ids, context=None):
-        """ This function computes previous stage for case from its current
-            stage using available stage for that case type
-        """
-        return self.stage_change(cr, uid, ids, '<', 'sequence desc', context)
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        """ Overrides orm copy method to avoid copying messages,
-            as well as date_closed and date_open columns if they
-            exist."""
-        if default is None:
-            default = {}
-
-        if hasattr(self, '_columns'):
-            if self._columns.get('date_closed'):
-                default.update({ 'date_closed': False, })
-            if self._columns.get('date_open'):
-                default.update({ 'date_open': False })
-        return super(base_stage, self).copy(cr, uid, id, default, context=context)
-
-    def case_escalate(self, cr, uid, ids, context=None):
-        """ Escalates case to parent level """
-        for case in self.browse(cr, uid, ids, context=context):
-            data = {'active': True}
-            if case.section_id.parent_id:
-                data['section_id'] = case.section_id.parent_id.id
-                if case.section_id.parent_id.change_responsible:
-                    if case.section_id.parent_id.user_id:
-                        data['user_id'] = case.section_id.parent_id.user_id.id
-            else:
-                raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore."))
-            self.write(cr, uid, [case.id], data, context=context)
-        return True
-
-    def case_open(self, cr, uid, ids, context=None):
-        """ Opens case """
-        cases = self.browse(cr, uid, ids, context=context)
-        for case in cases:
-            data = {'active': True}
-            if not case.user_id:
-                data['user_id'] = uid
-            self.case_set(cr, uid, [case.id], 'open', data, context=context)
-        return True
-
-    def case_close(self, cr, uid, ids, context=None):
-        """ Closes case """
-        return self.case_set(cr, uid, ids, 'done', {'active': True, 'date_closed': fields.datetime.now()}, context=context)
-
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Cancels case """
-        return self.case_set(cr, uid, ids, 'cancel', {'active': True}, context=context)
-
-    def case_pending(self, cr, uid, ids, context=None):
-        """ Set case as pending """
-        return self.case_set(cr, uid, ids, 'pending', {'active': True}, context=context)
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """ Resets case as draft """
-        return self.case_set(cr, uid, ids, 'draft', {'active': True}, context=context)
-
-    def case_set(self, cr, uid, ids, new_state_name=None, values_to_update=None, new_stage_id=None, context=None):
-        """ Generic method for setting case. This methods wraps the update
-            of the record.
-
-            :params new_state_name: the new state of the record; this method
-                                    will call ``stage_set_with_state_name``
-                                    that will find the stage matching the
-                                    new state, using the ``stage_find`` method.
-            :params new_stage_id: alternatively, you may directly give the
-                                  new stage of the record
-            :params state_name: the new value of the state, such as
-                     'draft' or 'close'.
-            :params update_values: values that will be added with the state
-                     update when writing values to the record.
-        """
-        cases = self.browse(cr, uid, ids, context=context)
-        # 1. update the stage
-        if new_state_name:
-            self.stage_set_with_state_name(cr, uid, cases, new_state_name, context=context)
-        elif not (new_stage_id is None):
-            self.stage_set(cr, uid, ids, new_stage_id, context=context)
-        # 2. update values
-        if values_to_update:
-            self.write(cr, uid, ids, values_to_update, context=context)
-        return True
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
deleted file mode 100644
index b856bbd74ad..00000000000
--- a/addons/base_status/base_state.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-today OpenERP SA (<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 fields, osv
-from openerp.tools.translate import _
-
-class base_state(object):
-    """ Base utility mixin class for objects willing to manage their state.
-        Object subclassing this class should define the following colums:
-        - ``date_open`` (datetime field)
-        - ``date_closed`` (datetime field)
-        - ``user_id`` (many2one to res.users)
-        - ``partner_id`` (many2one to res.partner)
-        - ``email_from`` (char field)
-        - ``state`` (selection field)
-    """
-
-    def _get_default_partner(self, cr, uid, context=None):
-        """ Gives id of partner for current user
-            :param context: if portal not in context returns False
-        """
-        if context is None:
-            context = {}
-        if not context or not context.get('portal'):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if hasattr(user, 'partner_address_id') and user.partner_address_id:
-            return user.partner_address_id
-        return user.company_id.partner_id.id
-
-    def _get_default_email(self, cr, uid, context=None):
-        """ Gives default email address for current user
-            :param context: if portal not in context returns False
-        """
-        if context is None:
-            context = {}
-        if not context or not context.get('portal'):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.email
-
-    def _get_default_user(self, cr, uid, context=None):
-        """ Gives current user id
-            :param context: if portal not in context returns False
-        """
-        if context is None:
-            context = {}
-        if not context or not context.get('portal'):
-            return False
-        return uid
-
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
-        """ This function returns value of partner email based on Partner Address
-            :param add: Id of Partner's address
-            :param email: Partner's email ID
-        """
-        data = {'value': {'email_from': False, 'phone':False}}
-        if add:
-            address = self.pool.get('res.partner').browse(cr, uid, add)
-            data['value'] = {'email_from': address and address.email or False ,
-                             'phone':  address and address.phone or False}
-        if 'phone' not in self._columns:
-            del data['value']['phone']
-        return data
-
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
-        """ This function returns value of partner address based on partner
-            :param part: Partner's id
-            :param email: Partner's email ID
-        """
-        data={}
-        if  part:
-            addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
-            data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        return {'value': data}
-
-    def case_escalate(self, cr, uid, ids, context=None):
-        """ Escalates case to parent level """
-        cases = self.browse(cr, uid, ids, context=context)
-        cases[0].state # fill browse record cache, for _action having old and new values
-        data = {'active': True}
-        for case in cases:
-            parent_id = case.section_id.parent_id
-            if parent_id:
-                data['section_id'] = parent_id.id
-                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.'))
-            self.write(cr, uid, [case.id], data, context=context)
-            case.case_escalate_send_note(parent_id, context=context)
-        return True
-
-    def case_open(self, cr, uid, ids, context=None):
-        """ Opens case """
-        cases = self.browse(cr, uid, ids, context=context)
-        for case in cases:
-            values = {'active': True}
-            if case.state == 'draft':
-                values['date_open'] = fields.datetime.now()
-            if not case.user_id:
-                values['user_id'] = uid
-            self.case_set(cr, uid, [case.id], 'open', values, context=context)
-        return True
-
-    def case_close(self, cr, uid, ids, context=None):
-        """ Closes case """
-        return self.case_set(cr, uid, ids, 'done', {'date_closed': fields.datetime.now()}, context=context)
-
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Cancels case """
-        return self.case_set(cr, uid, ids, 'cancel', {'active': True}, context=context)
-
-    def case_pending(self, cr, uid, ids, context=None):
-        """ Sets case as pending """
-        return self.case_set(cr, uid, ids, 'pending', {'active': True}, context=context)
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """ Resets case as draft """
-        return self.case_set(cr, uid, ids, 'draft', {'active': True}, context=context)
-
-    def case_set(self, cr, uid, ids, state_name, update_values=None, context=None):
-        """ Generic method for setting case. This methods wraps the update
-            of the record, as well as call to _action and browse_record
-            case setting to fill the cache.
-
-            :params: state_name: the new value of the state, such as
-                     'draft' or 'close'.
-            :params: update_values: values that will be added with the state
-                     update when writing values to the record.
-        """
-        cases = self.browse(cr, uid, ids, context=context)
-        cases[0].state # fill browse record cache, for _action having old and new values
-        if update_values is None:
-            update_values = {}
-        update_values['state'] = state_name
-        return self.write(cr, uid, ids, update_values, context=context)
-    
-    # ******************************
-    # Notifications
-    # ******************************
-    
-    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-        return ''
-
-    def case_open_send_note(self, cr, uid, ids, context=None):
-        for id in ids:
-            msg = _('%s has been <b>opened</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
-        return True
-
-    def case_escalate_send_note(self, cr, uid, ids, new_section=None, context=None):
-        for id in ids:
-            if new_section:
-                msg = '%s has been <b>escalated</b> to <b>%s</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context), new_section.name)
-            else:
-                msg = '%s has been <b>escalated</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
-        return True
-
-    def case_close_send_note(self, cr, uid, ids, context=None):
-        for id in ids:
-            msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
-        return True
-
-    def case_cancel_send_note(self, cr, uid, ids, context=None):
-        for id in ids:
-            msg = _('%s has been <b>canceled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
-        return True
-
-    def case_pending_send_note(self, cr, uid, ids, context=None):
-        for id in ids:
-            msg = _('%s is now <b>pending</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
-        return True
-
-    def case_reset_send_note(self, cr, uid, ids, context=None):
-        for id in ids:
-            msg = _('%s has been <b>renewed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_post(cr, uid, [id], body=msg, context=context)
-        return True
diff --git a/addons/base_status/i18n/ar.po b/addons/base_status/i18n/ar.po
deleted file mode 100644
index 1a0e4f1c401..00000000000
--- a/addons/base_status/i18n/ar.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-01 18:05+0000\n"
-"Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
-"Language-Team: Arabic <ar@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"
-
-#. 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/base_status.pot b/addons/base_status/i18n/base_status.pot
deleted file mode 100644
index 3805dd46ce9..00000000000
--- a/addons/base_status/i18n/base_status.pot
+++ /dev/null
@@ -1,72 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_status
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 17:05+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \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/cs.po b/addons/base_status/i18n/cs.po
deleted file mode 100644
index 3fdb5247e7f..00000000000
--- a/addons/base_status/i18n/cs.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# Czech 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-03-30 12:43+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech <cs@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-31 05:28+0000\n"
-"X-Generator: Launchpad (build 16546)\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/de.po b/addons/base_status/i18n/de.po
deleted file mode 100644
index 9507cff81f4..00000000000
--- a/addons/base_status/i18n/de.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-08 13:50+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Fehler !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s wurde <b>eröffnet</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s wurde <b>erneuert</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Fehler !"
-
-#. 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 ""
-"Keine weitere Eskalation möglich, da Sie bereits die obersten Ebene erreicht "
-"haben."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s wurde geändert auf <b>Wiedervorlage</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s wurde <b>abgebrochen</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 ""
-"Keine weitere Eskalation möglich, da Sie bereits die obersten Ebene erreicht "
-"haben."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s wurde <b>beendet</b>."
diff --git a/addons/base_status/i18n/en_GB.po b/addons/base_status/i18n/en_GB.po
deleted file mode 100644
index f1461bf4f1b..00000000000
--- a/addons/base_status/i18n/en_GB.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# English (United Kingdom) 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-02-06 15:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Error !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s has been <b>opened</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s has been <b>renewed</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Error!"
-
-#. 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 ""
-"You can not escalate, you are already at the top level regarding your sales-"
-"team category."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s is now <b>pending</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s has been <b>canceled</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 ""
-"You are already at the top level of your sales-team category.\n"
-"Therefore you cannot escalate furthermore."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s has been <b>closed</b>."
diff --git a/addons/base_status/i18n/es.po b/addons/base_status/i18n/es.po
deleted file mode 100644
index 3ed75d4c160..00000000000
--- a/addons/base_status/i18n/es.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-10 22:19+0000\n"
-"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s ha sido  <b>abierto</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s ha sido  <b>renovado</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. 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 ""
-"No puede escalar, usted está en la categoría más alta de su equipo de ventas"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s está ahora  <b>pendiente</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s ha sido  <b>cancelado</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 ""
-"Está en el nivel más alto de la categoría de su equipo de ventas.\n"
-"Por lo tanto no puede escalar más allá."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s ha sido  <b>cerrado</b>."
diff --git a/addons/base_status/i18n/fr.po b/addons/base_status/i18n/fr.po
deleted file mode 100644
index 7a22f3be0f9..00000000000
--- a/addons/base_status/i18n/fr.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-05 09:30+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\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-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Erreur !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s a été <b>ouvert(e)</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s a été <b>renouvelé(e)</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Erreur !"
-
-#. 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 ""
-"Vous ne pouvez pas demander d'escalade : vous êtes déjà au plus haut niveau "
-"possible dans votre catégorie d'équipes de ventes."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s est maintenant <b>en attente</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s a été <b>annulé(e)</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 ""
-"Vous êtes déjà au plus haut niveau possible dans votre catégorie d'équipes "
-"de ventes.\n"
-"Par conséquent vous ne pouvez pas demander une escalade au niveau supérieur."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s a été <b>fermé(e)</b>."
diff --git a/addons/base_status/i18n/hr.po b/addons/base_status/i18n/hr.po
deleted file mode 100644
index 41d004aaf14..00000000000
--- a/addons/base_status/i18n/hr.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-09 19:46+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Croatian <hr@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Greška !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s je <b>otvoren</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s je <b>obnovljen</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Greška!"
-
-#. 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 "Ne možete eskaliarati. Vi ste na vrhu hijerarhije prodajnog tima."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s je sada <b>na čekanju</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s je <b>otkazan</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 ""
-"Vi ste na vrhu hijerarhije prodajnog tima.\n"
-"Stoga ne možete dalje eskalirati."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s je <b>zatvoren</b>."
diff --git a/addons/base_status/i18n/hu.po b/addons/base_status/i18n/hu.po
deleted file mode 100644
index e11ea554b07..00000000000
--- a/addons/base_status/i18n/hu.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-03-14 10:26+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-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Hiba!"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s meg lett <b>nyitva</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s meg lett <b>újítva</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Hiba!"
-
-#. 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 ""
-"Nem tud feljebb lépni, már az értékesítési csoportját illetően a legmagasabb "
-"fokon áll."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s ez nem <b>elintézetlen</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s ez <b>visszavont</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 ""
-"Már az értékesítési csoportjának a legmagasabb szintjén áll.\n"
-"Ezért nem tud tovább feljebb lépni."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s le lett <b>Zárva</b>."
diff --git a/addons/base_status/i18n/id.po b/addons/base_status/i18n/id.po
deleted file mode 100644
index a90023ef348..00000000000
--- a/addons/base_status/i18n/id.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Indonesian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-17 00:41+0000\n"
-"Last-Translator: Riza Kurniawan <rizabisnis@gmail.com>\n"
-"Language-Team: Indonesian <id@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Ada Kesalahan !!!"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s sedang <b>dibuka</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s sedang <b>diperbaharui</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Ada Kesalahan !"
-
-#. 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 ""
-"Tidak bisa ditingkatkan, anda pada tingkat tertinggi bersama tim sales anda."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s saat ini <b>ditunda</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s sedang = <b>dibatalkan</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 ""
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s sedang = <b>ditutup</b>."
diff --git a/addons/base_status/i18n/it.po b/addons/base_status/i18n/it.po
deleted file mode 100644
index 6594ff72e4e..00000000000
--- a/addons/base_status/i18n/it.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-13 19:22+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
-"Language-Team: Italian <it@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Errore !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s è stato <b>aperto</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s è stato <b>rinnovato</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Errore!"
-
-#. 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 "Impossibile scalare, si è già al livello massimo del team vendite."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s è ora <b>in attesa</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s è stato <b>annullato</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 ""
-"Si è già al massimo livello del team vendita.\n"
-"Quindi non è possibile scalare ulteriormente."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s è stato <b>chiuso</b>."
diff --git a/addons/base_status/i18n/lt.po b/addons/base_status/i18n/lt.po
deleted file mode 100644
index cdaf9b0db37..00000000000
--- a/addons/base_status/i18n/lt.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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/mk.po b/addons/base_status/i18n/mk.po
deleted file mode 100644
index 0f321e004b1..00000000000
--- a/addons/base_status/i18n/mk.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# Macedonian 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-02-21 13:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Macedonian <mk@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"
-
-#. 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 "%s е <b>отворен</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s е <b>обновен</b>."
-
-#. 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 "%s е <b>во исчекување</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s е <b>откажан</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 ""
-"Веќе сте на највисокото ниво на вашиот продажбен тим.\n"
-"Значи понатамошно ескалирање не е можно."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s е <b>затворен</b>."
diff --git a/addons/base_status/i18n/mn.po b/addons/base_status/i18n/mn.po
deleted file mode 100644
index 5bb891348e8..00000000000
--- a/addons/base_status/i18n/mn.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-27 16:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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:52+0000\n"
-"X-Generator: Launchpad (build 16532)\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 "%s <b>нээгдлээ</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s  <b>шинэчлэгдлээ</b>."
-
-#. 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 "%s одоо <b>хүлээгдэж буй</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s <b>цуцлагдлаа</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 ""
-"Та борлуулалтын багийн ангилалынхаа хамгийн дээд түвшин байна.\n"
-"Тиймээс та дахин томруулах боломжгүй."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s <b>хаагдлаа</b>."
diff --git a/addons/base_status/i18n/nl.po b/addons/base_status/i18n/nl.po
deleted file mode 100644
index 882e44d2ded..00000000000
--- a/addons/base_status/i18n/nl.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-20 14:05+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
-"Language-Team: Dutch <nl@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"
-
-#. 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>vernieuw</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 ""
-"Het is niet mogelijk om verder te escaleren. U bent al op het hoogste niveau "
-"van uw verkoopteam categorieën."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s is nu <b>in afwachting</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 het verkoopteam.\n"
-"Het is zodoende niet mogelijk om verder te 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/nl_BE.po b/addons/base_status/i18n/nl_BE.po
deleted file mode 100644
index 6a3c2d83fc7..00000000000
--- a/addons/base_status/i18n/nl_BE.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/pl.po b/addons/base_status/i18n/pl.po
deleted file mode 100644
index 61a1e96e6f4..00000000000
--- a/addons/base_status/i18n/pl.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-16 11:12+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: Polish <pl@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Błąd !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s zostało <b>otwarte</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s zostało <b>odnowione</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Błąd!"
-
-#. 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 ""
-"Nie możesz przekazywać nadrzędnym, bo jesteś na górze w kategorii zespołu."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s <b>oczekuje</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s zostało <b>anulowane</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 ""
-"Jesteś na najwyższym poziomie kategorii zespołów.\n"
-"Więc nie możesz przekazywać wyżej."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s zostało <b>zamknięte</b>."
diff --git a/addons/base_status/i18n/pt.po b/addons/base_status/i18n/pt.po
deleted file mode 100644
index 2e8648811c0..00000000000
--- a/addons/base_status/i18n/pt.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-13 16:39+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
-"Language-Team: Portuguese <pt@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s  foi <b>aberto</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s foi <b>renovado</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. 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 ""
-"Não pode subir de grau porque já está no topo no que concerne à categoria da "
-"sua equipa de vendas."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s agora está <b>pendente</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s  foi <b>cancelado</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 ""
-"Já está no topo no que concerne à categoria da sua equipa de vendas.\n"
-"Não pode subir mais."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s foi <b>fechado</b>."
diff --git a/addons/base_status/i18n/pt_BR.po b/addons/base_status/i18n/pt_BR.po
deleted file mode 100644
index 37bf13bed7c..00000000000
--- a/addons/base_status/i18n/pt_BR.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-16 23:52+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\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:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s foi <b>aberta</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s foi <b>renovado</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. 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 ""
-"Você não pode escalar, você já está no nível mais alto em relação a sua "
-"categoria de equipe de vendas."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s está agora <b>pendente</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s foi <b>cancelado</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 ""
-"Você já está no nível mais alto de sua categoria de equipe de vendas.\n"
-"Portanto, você não pode escalar além disso."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s foi <b>fechado</b>."
diff --git a/addons/base_status/i18n/ro.po b/addons/base_status/i18n/ro.po
deleted file mode 100644
index 4f82205f7e5..00000000000
--- a/addons/base_status/i18n/ro.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# Romanian 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-01-23 18:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Eroare !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s a fost <b>deschis</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s a fost <b>reinnoit</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Eroare!"
-
-#. 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 ""
-"Nu puteti avansa, sunteti deja la cel mai inalt nivel in ceea ce priveste "
-"categoria echipei d-voastra de vanzari."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s este acum <b>in asteptare</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s a fost <b>anulat</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 ""
-"Sunteti deja la cel mai inalt nivel al categoriei echipei dumneavoastra de "
-"vanzari.\n"
-"Prin urmare nu mai puteti avansa."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s a fost <b>inchis</b>."
diff --git a/addons/base_status/i18n/ru.po b/addons/base_status/i18n/ru.po
deleted file mode 100644
index 2dab7ceaf31..00000000000
--- a/addons/base_status/i18n/ru.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: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-06-06 05:21+0000\n"
-"X-Generator: Launchpad (build 16667)\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 "%s было <b>открыто</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s было <b>обновлено</b>."
-
-#. 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 "%s сейчас <b>в ожидании</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s было <b>отменено</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 ""
-"Вы уже на высшем уровне категории вашей команды продаж.\n"
-"Поэтому вы не можете обострить."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s было <b>закрыто</b>."
diff --git a/addons/base_status/i18n/sl.po b/addons/base_status/i18n/sl.po
deleted file mode 100644
index d4f00213381..00000000000
--- a/addons/base_status/i18n/sl.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-29 12:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Napaka!"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s je bil <b>od</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s je  <b>obnovljen</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Napaka!"
-
-#. 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 "Ste že na vrhu hierarhije vaših skupin prodaje."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s je na  <b>čakanju</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s je <b>preklican</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 "Ste že na vrhu hierarhije vaših skupin prodaje."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s je  <b>zaprt</b>."
diff --git a/addons/base_status/i18n/tr.po b/addons/base_status/i18n/tr.po
deleted file mode 100644
index 33eac53991e..00000000000
--- a/addons/base_status/i18n/tr.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# Turkish 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-02-03 12:04+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@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"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:107
-#, python-format
-msgid "Error !"
-msgstr "Hata !"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:166
-#, python-format
-msgid "%s has been <b>opened</b>."
-msgstr "%s  <b>açıldı</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s  <b>yenilendi</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_stage.py:210
-#, python-format
-msgid "Error!"
-msgstr "Hata!"
-
-#. 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 ""
-"Yükseltemezsiniz, satış-takımı kategorisine göre zaten en üst düzeydesiniz."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:193
-#, python-format
-msgid "%s is now <b>pending</b>."
-msgstr "%s şimdi <b>bekliyor</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s <b>iptal edildi</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 ""
-"Zaten satış takımı kategorisinin en üst düzeyindesiniz.\n"
-"Yani daha fazla yükseltemezsiniz."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s <b>kapatıldı</b>."
diff --git a/addons/base_status/i18n/zh_CN.po b/addons/base_status/i18n/zh_CN.po
deleted file mode 100644
index 154de7fb950..00000000000
--- a/addons/base_status/i18n/zh_CN.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-11-28 07:43+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.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"
-
-#. 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 "%s 已经被 <b>打开</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s 已经被 <b>更新</b>."
-
-#. 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 "%s 现在 <b>待定</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s 已经被 <b>取消</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 ""
-"你已经在您销售团队类别中的最高级了。\n"
-"因此，你不能再上报了。"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s 已经被 <b>关闭</b>."
diff --git a/addons/base_status/i18n/zh_TW.po b/addons/base_status/i18n/zh_TW.po
deleted file mode 100644
index 9a32a17d35e..00000000000
--- a/addons/base_status/i18n/zh_TW.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# Chinese (Traditional) 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-01-30 14:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@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"
-
-#. 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 "%s 已經 <b>開立</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:199
-#, python-format
-msgid "%s has been <b>renewed</b>."
-msgstr "%s 已經 <b>更新</b>."
-
-#. 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 "%s 現在是 <b>暫停</b>."
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:187
-#, python-format
-msgid "%s has been <b>canceled</b>."
-msgstr "%s 已經 <b>取消</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 "您已經是您銷售團隊類別中的最高等級了。因此您不能再升級了。"
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:181
-#, python-format
-msgid "%s has been <b>closed</b>."
-msgstr "%s 已經 <b>關閉</b>."
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index e699e091176..87771b2f518 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -31,7 +31,7 @@ Lets the user create a custom dashboard.
 Allows users to create custom dashboard.
     """,
     'author': 'OpenERP SA',
-    'depends': ['base'],
+    'depends': ['base', 'web'],
     'data': [
         'security/ir.model.access.csv',
         'board_view.xml',
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 3489b686e1b..65737ad234e 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -344,7 +344,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
     },
     load_data:function(){
         var board = new instance.web.Model('board.board');
-        return board.call('list');
+        return board.call('list', [board.context()]);
     },
     _x:function() {
         if (!instance.webclient) { return $.Deferred().reject(); }
@@ -381,6 +381,10 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
 
+        context.add({
+            group_by: instance.web.pyeval.eval('groupbys', data.groupbys || [])
+        });
+
         var c = instance.web.pyeval.eval('context', context);
         for(var k in c) {
             if (c.hasOwnProperty(k) && /^search_default_/.test(k)) {
diff --git a/addons/claim_from_delivery/i18n/vi.po b/addons/claim_from_delivery/i18n/vi.po
new file mode 100644
index 00000000000..f308bafb1ea
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/vi.po
@@ -0,0 +1,33 @@
+# Vietnamese 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-30 16:10+0000\n"
+"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
+"Language-Team: Vietnamese <vi@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-07-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: claim_from_delivery
+#: view:stock.picking.out:0
+msgid "Claims"
+msgstr "Các khiếu nại"
+
+#. module: claim_from_delivery
+#: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
+msgid "Delivery Order"
+msgstr ""
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim From Delivery"
+msgstr ""
diff --git a/addons/contacts/i18n/ko.po b/addons/contacts/i18n/ko.po
new file mode 100644
index 00000000000..19e46f9e0b0
--- /dev/null
+++ b/addons/contacts/i18n/ko.po
@@ -0,0 +1,37 @@
+# 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-06-28 09:32+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-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\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/contacts/i18n/vi.po b/addons/contacts/i18n/vi.po
new file mode 100644
index 00000000000..d404d947fe2
--- /dev/null
+++ b/addons/contacts/i18n/vi.po
@@ -0,0 +1,45 @@
+# Vietnamese 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-27 16:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\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"
+"            Nhấn để thêm liên lạc vào sổ địa chỉ.\n"
+"          </p><p>\n"
+"            OpenERP giúp bạn theo dõi các hoạt động liên quan tới\n"
+"            một khách hàng; thảo luận, lịch sử cơ hội kinh doanh,\n"
+"            tài liệu v.v....\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 "Liên hệ"
diff --git a/addons/contacts/static/src/img/icon.png b/addons/contacts/static/description/icon.png
similarity index 100%
rename from addons/contacts/static/src/img/icon.png
rename to addons/contacts/static/description/icon.png
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index e7ab7df27ea..1b4ba191b82 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -51,7 +51,6 @@ Dashboard for CRM will include:
     'depends': [
         'base_action_rule',
         'base_setup',
-        'base_status',
         'process',
         'mail',
         'email_template',
@@ -116,6 +115,7 @@ Dashboard for CRM will include:
         'test/crm_lead_onchange.yml',
         'test/crm_lead_copy.yml',
         'test/crm_lead_unlink.yml',
+        'test/crm_lead_find_stage.yml',
     ],
     'css': [
         'static/src/css/crm.css'
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 19baa5a5709..6bbd450ca38 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -19,7 +19,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_stage_graph"/>
-            <field name="domain">[('state', 'not in', ('done', 'cancel')), ('type', '=', 'opportunity')]</field>
+            <!-- avoid done / cancelled -->
+            <field name="domain">['|',
+                                    '!', '&amp;', ('probability', '=', 100), ('stage_id.on_change', '=', 1),
+                                    '!', '&amp;', ('probability', '=', 0), ('stage_id.sequence', '!=', 1),
+                                ('type', '=', 'opportunity')]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
@@ -43,8 +47,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
-            <field name="domain">[('state','!=','cancel'),('opening_date','&gt;',context_today().strftime("%Y-%m-%d"))]</field>
-            <field name="context">{'search_default_Stage':1}</field>
+            <!-- avoid cancelled -->
+            <field name="domain">['!', '&amp;', ('probability', '=', 0), ('stage_id.sequence', '!=', 1)]</field>
+            <field name="context">{'search_default_user': 1, 'search_default_Stage': 1}</field>
         </record>
 
         <record model="ir.ui.view" id="board_crm_statistical_form">
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4c9a60634a5..04a17b9dbc0 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -26,15 +26,6 @@ from openerp import tools
 from openerp.osv import fields
 from openerp.osv import osv
 
-MAX_LEVEL = 15
-AVAILABLE_STATES = [
-    ('draft', 'New'),
-    ('cancel', 'Cancelled'),
-    ('open', 'In Progress'),
-    ('pending', 'Pending'),
-    ('done', 'Closed')
-]
-
 AVAILABLE_PRIORITIES = [
     ('1', 'Highest'),
     ('2', 'High'),
@@ -72,16 +63,13 @@ class crm_case_stage(osv.osv):
         'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
         'on_change': fields.boolean('Change Probability Automatically', help="Setting this stage will change the probability automatically on the opportunity."),
         'requirements': fields.text('Requirements'),
-        'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', string='Sections',
+        'section_ids': fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
-        'state': fields.selection(AVAILABLE_STATES, 'Related Status', required=True,
-            help="The status of your document will automatically change 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."),
         'case_default': fields.boolean('Default to New Sales Team',
                         help="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."),
         'fold': fields.boolean('Fold by Default',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
-        'type': fields.selection([  ('lead','Lead'),
+        'type': fields.selection([('lead', 'Lead'),
                                     ('opportunity', 'Opportunity'),
                                     ('both', 'Both')],
                                     string='Type', size=16, required=True,
@@ -91,7 +79,7 @@ class crm_case_stage(osv.osv):
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'state': 'open',
+        'on_change': True,
         'fold': False,
         'type': 'both',
         'case_default': True,
@@ -222,17 +210,13 @@ class crm_case_section(osv.osv):
         return res
 
     def create(self, cr, uid, vals, context=None):
-        mail_alias = self.pool.get('mail.alias')
-        if not vals.get('alias_id'):
-            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': 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)
-        return res
+        if context is None:
+            context = {}
+        create_context = dict(context, alias_model_name='crm.lead', alias_parent_model_name=self._name)
+        section_id = super(crm_case_section, self).create(cr, uid, vals, context=create_context)
+        section = self.browse(cr, uid, section_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [section.alias_id.id], {'alias_parent_thread_id': section_id, 'alias_defaults': {'section_id': section_id, 'type': 'lead'}}, context=context)
+        return section_id
 
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the sales team.
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 7204f666db5..8eac91c06e2 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -5,7 +5,7 @@
         <record id="filter_draft_lead" model="ir.filters">
             <field name="name">Draft Leads</field>
             <field name="model_id">crm.lead</field>
-            <field name="domain">[('state','=','draft')]</field>
+            <field name="domain">[('stage_id.sequence', '=', 1)]</field>
             <field name="user_id" eval="False"/>
         </record>
         <record id="action_email_reminder_lead" model="ir.actions.server">
@@ -14,13 +14,7 @@
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="state">email</field>
-            <field name="email">object.user_id.email</field>
-            <field name="subject">Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or '']]</field>
-            <field name="message">Warning unprocessed incoming lead is more than 5 day old.
-Name: [[object.name ]]
-ID: [[object.id ]]
-Description: [[object.description]]
-            </field>
+            <field name="template_id" ref="email_template_opportunity_reminder_mail"/>
         </record>
         <record id="rule_set_reminder_lead" model="base.action.rule">
             <field name="name">Set Auto Reminder on leads which are not open since 5 days.</field>
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index be5611c03c4..c957311b47f 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -94,7 +94,7 @@
                                 <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>
+                                        <small><span class="oe_e oe_e_alias" 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">
@@ -168,17 +168,6 @@
                             <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>
@@ -187,12 +176,25 @@
                             <group>
                                 <field name="user_id"/>
                                 <field name="code"/>
-                            </group>
-                            <group>
                                 <field name="parent_id"/>
                                 <field name="change_responsible"/>
                                 <field name="active"/>
                             </group>
+                            <group>
+                                <label for="alias_name" string="Email Alias"
+                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                                <div name="alias_def"
+                                        attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <field name="alias_id" class="oe_read_only oe_inline"
+                                            string="Email Alias" required="0"/>
+                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                    </div>
+                                </div>
+                                <field name="alias_contact" class="oe_inline"
+                                        string="Accept Emails From"
+                                        attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                            </group>
                         </group>
                         <notebook colspan="4">
                             <page string="Team Members">
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index b8673e73927..c4e2cbdc91d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,18 +19,16 @@
 #
 ##############################################################################
 
-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, orm
-import time
+
 from openerp import SUPERUSER_ID
 from openerp import tools
-from openerp.tools.translate import _
-from openerp.tools import html2plaintext
-
 from openerp.addons.base.res.res_partner import format_address
+from openerp.osv import fields, osv, orm
+from openerp.tools import html2plaintext
+from openerp.tools.translate import _
 
 CRM_LEAD_FIELDS_TO_MERGE = ['name',
     'partner_id',
@@ -62,13 +60,9 @@ CRM_LEAD_FIELDS_TO_MERGE = ['name',
     'email_from',
     'email_cc',
     'partner_name']
-CRM_LEAD_PENDING_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
-class crm_lead(base_stage, format_address, osv.osv):
+
+class crm_lead(format_address, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead/Opportunity"
@@ -76,13 +70,11 @@ class crm_lead(base_stage, format_address, osv.osv):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     _track = {
-        'state': {
-            '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', 'draft', 'cancel', 'done'],
+            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence == 1,
+            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: (obj.stage_id and obj.stage_id.sequence != 1) and obj.probability < 100,
+            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj.probability == 100 and obj.stage_id and obj.stage_id.on_change,
+            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.probability == 0 and obj.stage_id and obj.stage_id.sequence != 1,
         },
     }
 
@@ -93,20 +85,6 @@ class crm_lead(base_stage, format_address, osv.osv):
         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 = {}
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('section_id'):
-                ctx['default_section_id'] = vals['section_id']
-            if vals.get('type'):
-                ctx['default_type'] = vals['type']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
-        # 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 """
         return self._resolve_section_id_from_context(cr, uid, context=context) or False
@@ -114,7 +92,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('sequence', '=', '1')], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -126,8 +104,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         if type(context.get('default_section_id')) in (int, long):
             return context.get('default_section_id')
         if isinstance(context.get('default_section_id'), basestring):
-            section_name = context['default_section_id']
-            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=section_name, context=context)
+            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=context['default_section_id'], context=context)
             if len(section_ids) == 1:
                 return int(section_ids[0][0])
         return None
@@ -166,7 +143,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
-        result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
+        result.sort(lambda x, y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
 
         fold = {}
         for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
@@ -174,7 +151,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         return result, fold
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(crm_lead,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        res = super(crm_lead, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         if view_type == 'form':
             res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
         return res
@@ -236,17 +213,6 @@ class crm_lead(base_stage, format_address, osv.osv):
                 res[lead.id][field] = abs(int(duration))
         return res
 
-    def _history_search(self, cr, uid, obj, name, args, context=None):
-        res = []
-        msg_obj = self.pool.get('mail.message')
-        message_ids = msg_obj.search(cr, uid, [('email_from','!=',False), ('subject', args[0][1], args[0][2])], context=context)
-        lead_ids = self.search(cr, uid, [('message_ids', 'in', message_ids)], context=context)
-
-        if lead_ids:
-            return [('id', 'in', lead_ids)]
-        else:
-            return [('id', '=', '0')]
-
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', track_visibility='onchange',
             select=True, help="Linked partner (optional). Usually created when converting the lead."),
@@ -259,10 +225,10 @@ class crm_lead(base_stage, format_address, osv.osv):
         'email_from': fields.char('Email', size=128, help="Email address of the contact", select=1),
         'section_id': fields.many2one('crm.case.section', 'Sales Team',
                         select=True, track_visibility='onchange', help='When sending mails, the default email address is taken from the sales team.'),
-        'create_date': fields.datetime('Creation Date' , readonly=True),
-        'email_cc': fields.text('Global CC', size=252 , help="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"),
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'email_cc': fields.text('Global CC', help="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"),
         'description': fields.text('Notes'),
-        'write_date': fields.datetime('Update Date' , readonly=True),
+        'write_date': fields.datetime('Update Date', readonly=True),
         'categ_ids': fields.many2many('crm.case.categ', 'crm_lead_category_rel', 'lead_id', 'category_id', 'Categories', \
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]"),
         'type_id': fields.many2one('crm.case.resource.type', 'Campaign', \
@@ -280,17 +246,15 @@ class crm_lead(base_stage, format_address, osv.osv):
                         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),
+        'date_open': fields.datetime('Assigned', readonly=True),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 multi='day_open', type="float", store=True),
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
-        'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
-                help='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\'.'),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
 
         # Only used for type opportunity
-        'probability': fields.float('Success Rate (%)',group_operator="avg"),
+        'probability': fields.float('Success Rate (%)', group_operator="avg"),
         'planned_revenue': fields.float('Expected Revenue', track_visibility='always'),
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
         'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
@@ -326,13 +290,13 @@ class crm_lead(base_stage, format_address, osv.osv):
     _defaults = {
         'active': 1,
         'type': 'lead',
-        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
         'color': 0,
+        'date_last_stage_update': fields.datetime.now(),
     }
 
     _sql_constraints = [
@@ -341,30 +305,29 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
         if not stage_id:
-            return {'value':{}}
-        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
+            return {'value': {}}
+        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context=context)
         if not stage.on_change:
-            return {'value':{}}
-        return {'value':{'probability': stage.probability}}
+            return {'value': {}}
+        return {'value': {'probability': stage.probability}}
 
-    def on_change_partner(self, cr, uid, ids, partner_id, context=None):
-        result = {}
+    def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):
         values = {}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
-                'partner_name' : partner.name,
-                'street' : partner.street,
-                'street2' : partner.street2,
-                'city' : partner.city,
-                'state_id' : partner.state_id and partner.state_id.id or False,
-                'country_id' : partner.country_id and partner.country_id.id or False,
-                'email_from' : partner.email,
-                'phone' : partner.phone,
-                'mobile' : partner.mobile,
-                'fax' : partner.fax,
+                'partner_name': partner.name,
+                'street': partner.street,
+                'street2': partner.street2,
+                'city': partner.city,
+                'state_id': partner.state_id and partner.state_id.id or False,
+                'country_id': partner.country_id and partner.country_id.id or False,
+                'email_from': partner.email,
+                'phone': partner.phone,
+                'mobile': partner.mobile,
+                'fax': partner.fax,
             }
-        return {'value' : values}
+        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
@@ -376,22 +339,6 @@ class crm_lead(base_stage, format_address, osv.osv):
                 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
-            Only works on not done and cancelled cases
-        """
-        cr.execute('select * from crm_case \
-                where (date_action_last<%s or date_action_last is null) \
-                and (date_action_next<=%s or date_action_next is null) \
-                and state not in (\'cancel\',\'done\')',
-                (time.strftime("%Y-%m-%d %H:%M:%S"),
-                    time.strftime('%Y-%m-%d %H:%M:%S')))
-
-        ids2 = map(lambda x: x[0], cr.fetchall() or [])
-        cases = self.browse(cr, uid, ids2, context=context)
-        return self._action(cr, uid, cases, False, context=context)
-
     def stage_find(self, cr, uid, cases, section_id, domain=None, order='sequence', context=None):
         """ Override of the base.stage method
             Parameter of the stage search taken from the lead:
@@ -403,16 +350,16 @@ class crm_lead(base_stage, format_address, osv.osv):
         if isinstance(cases, (int, long)):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
-        section_ids = []
+        section_ids = set()
         types = ['both']
-        if not cases :
-            type = context.get('default_type')
-            types += [type]
+        if not cases:
+            ctx_type = context.get('default_type')
+            types += [ctx_type]
         if section_id:
-            section_ids.append(section_id)
+            section_ids.add(section_id)
         for lead in cases:
             if lead.section_id:
-                section_ids.append(lead.section_id.id)
+                section_ids.add(lead.section_id.id)
             if lead.type not in types:
                 types.append(lead.type)
         # OR all section_ids and OR with case_default
@@ -421,8 +368,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             search_domain += [('|')] * len(section_ids)
             for section_id in section_ids:
                 search_domain.append(('section_ids', '=', section_id))
-        else:
-            search_domain.append(('case_default', '=', True))
+        search_domain.append(('case_default', '=', True))
         # AND with cases types
         search_domain.append(('type', 'in', types))
         # AND with the domain in parameter
@@ -433,48 +379,58 @@ class crm_lead(base_stage, format_address, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Overrides case_cancel from base_stage to set probability """
-        res = super(crm_lead, self).case_cancel(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability' : 0.0}, context=context)
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """ Overrides case_reset from base_stage to set probability """
-        res = super(crm_lead, self).case_reset(cr, uid, ids, context=context)
-        self.write(cr, uid, ids, {'probability': 0.0}, context=context)
-        return res
-
     def case_mark_lost(self, cr, uid, ids, context=None):
         """ Mark the case as lost: state=cancel and probability=0 """
         for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0),('on_change','=',True)], context=context)
+            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 0.0), ('on_change', '=', True), ('sequence', '>', 1)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 0.0}, new_stage_id=stage_id, context=context)
-        return True
+                return self.write(cr, uid, [lead.id], {'stage_id': stage_id}, context=context)
+            else:
+                raise osv.except_osv(_('Warning!'),
+                    _('To relieve your sales pipe and group all Lost opportunities, configure one of your sales stage as follow:\n'
+                        'probability = 0 %, select "Change Probability Automatically".\n'
+                        'Create a specific stage or edit an existing one by editing columns of your opportunity pipe.'))
 
     def case_mark_won(self, cr, uid, ids, context=None):
         """ Mark the case as won: state=done and probability=100 """
         for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0),('on_change','=',True)], context=context)
+            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, [('probability', '=', 100.0), ('on_change', '=', True), ('sequence', '>', 1)], context=context)
             if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={'probability': 100.0}, new_stage_id=stage_id, context=context)
+                return self.write(cr, uid, [lead.id], {'stage_id': stage_id}, context=context)
+            else:
+                raise osv.except_osv(_('Warning!'),
+                    _('To relieve your sales pipe and group all Won opportunities, configure one of your sales stage as follow:\n'
+                        'probability = 100 % and select "Change Probability Automatically".\n'
+                        'Create a specific stage or edit an existing one by editing columns of your opportunity pipe.'))
+
+    def case_escalate(self, cr, uid, ids, context=None):
+        """ Escalates case to parent level """
+        for case in self.browse(cr, uid, ids, context=context):
+            data = {'active': True}
+            if case.section_id.parent_id:
+                data['section_id'] = case.section_id.parent_id.id
+                if case.section_id.parent_id.change_responsible:
+                    if case.section_id.parent_id.user_id:
+                        data['user_id'] = case.section_id.parent_id.user_id.id
+            else:
+                raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore."))
+            self.write(cr, uid, [case.id], data, context=context)
         return True
 
-    def set_priority(self, cr, uid, ids, priority):
+    def set_priority(self, cr, uid, ids, priority, context=None):
         """ Set lead priority
         """
-        return self.write(cr, uid, ids, {'priority' : priority})
+        return self.write(cr, uid, ids, {'priority': priority}, context=context)
 
     def set_high_priority(self, cr, uid, ids, context=None):
         """ Set lead priority to high
         """
-        return self.set_priority(cr, uid, ids, '1')
+        return self.set_priority(cr, uid, ids, '1', context=context)
 
     def set_normal_priority(self, cr, uid, ids, context=None):
         """ Set lead priority to normal
         """
-        return self.set_priority(cr, uid, ids, '3')
+        return self.set_priority(cr, uid, ids, '3', context=context)
 
     def _merge_get_result_type(self, cr, uid, opps, context=None):
         """
@@ -631,7 +587,7 @@ class crm_lead(base_stage, format_address, osv.osv):
                 attachment.write(values)
         return True
 
-    def merge_opportunity(self, cr, uid, ids, context=None):
+    def merge_opportunity(self, cr, uid, ids, user_id=False, section_id=False, context=None):
         """
         Different cases of merge:
         - merge leads together = 1 new lead
@@ -650,7 +606,8 @@ class crm_lead(base_stage, format_address, osv.osv):
         sequenced_opps = []
         for opportunity in opportunities:
             sequence = -1
-            if opportunity.stage_id and opportunity.stage_id.state != 'cancel':
+            # TDE: was "if opportunity.stage_id and opportunity.stage_id.state != 'cancel':"
+            if opportunity.probability == 0 and opportunity.stage_id and opportunity.stage_id.sequence != 1 and opportunity.stage_id.fold:
                 sequence = opportunity.stage_id.sequence
             sequenced_opps.append(((int(sequence != -1 and opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity))
 
@@ -665,6 +622,11 @@ class crm_lead(base_stage, format_address, osv.osv):
         fields = list(CRM_LEAD_FIELDS_TO_MERGE)
         merged_data = self._merge_data(cr, uid, ids, highest, fields, context=context)
 
+        if user_id:
+            merged_data['user_id'] = user_id
+        if section_id:
+            merged_data['section_id'] = section_id
+
         # Merge messages and attachements into the first opportunity
         self._merge_opportunity_history(cr, uid, highest.id, tail_opportunities, context=context)
         self._merge_opportunity_attachments(cr, uid, highest.id, tail_opportunities, context=context)
@@ -706,7 +668,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             'phone': customer and customer.phone or lead.phone,
         }
         if not lead.stage_id or lead.stage_id.type=='lead':
-            val['stage_id'] = self.stage_find(cr, uid, [lead], section_id, [('state', '=', 'draft'),('type', 'in', ('opportunity','both'))], context=context)
+            val['stage_id'] = self.stage_find(cr, uid, [lead], section_id, [('sequence', '=', '1'), ('type', 'in', ('opportunity','both'))], context=context)
         return val
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
@@ -715,11 +677,11 @@ class crm_lead(base_stage, format_address, osv.osv):
             partner = self.pool.get('res.partner')
             customer = partner.browse(cr, uid, partner_id, context=context)
         for lead in self.browse(cr, uid, ids, context=context):
-            if lead.state in ('done', 'cancel'):
+            # TDE: was if lead.state in ('done', 'cancel'):
+            if (lead.probability == '100') or (lead.probability == '0' and lead.stage_id.sequence != '1'):
                 continue
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
-        self.message_post(cr, uid, ids, body=_("Lead <b>converted into an Opportunity</b>"), subtype="crm.mt_lead_convert_to_opportunity", context=context)
 
         if user_ids or section_id:
             self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)
@@ -868,9 +830,9 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'priority': lead.priority,
             }
             new_id = phonecall.create(cr, uid, vals, context=context)
-            phonecall.case_open(cr, uid, [new_id], context=context)
+            phonecall.write(cr, uid, [new_id], {'state': 'open'}, context=context)
             if action == 'log':
-                phonecall.case_close(cr, uid, [new_id], context=context)
+                phonecall.write(cr, uid, [new_id], {'state': 'done'}, context=context)
             phonecall_dict[lead.id] = new_id
             self.schedule_phonecall_send_note(cr, uid, [lead.id], new_id, action, context=context)
         return phonecall_dict
@@ -933,49 +895,27 @@ class crm_lead(base_stage, format_address, osv.osv):
         }
         return res
 
-    def write(self, cr, uid, ids, vals, context=None):
-        if vals.get('stage_id') and not vals.get('probability'):
-            # change probability of lead(s) if required by stage
-            stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
-            if stage.on_change:
-                vals['probability'] = stage.probability
-        return super(crm_lead, self).write(cr, uid, ids, vals, context=context)
-
-    def new_mail_send(self, cr, uid, ids, context=None):
-        '''
-        This function opens a window to compose an email, with the edi sale template message loaded by default
-        '''
-        assert len(ids) == 1, 'This option should only be used for a single id at a time.'
-        ir_model_data = self.pool.get('ir.model.data')
-        try:
-            template_id = ir_model_data.get_object_reference(cr, uid, 'crm', 'email_template_opportunity_mail')[1]
-        except ValueError:
-            template_id = False
-        try:
-            compose_form_id = ir_model_data.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')[1]
-        except ValueError:
-            compose_form_id = False
+    def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        ctx = context.copy()
-        ctx.update({
-            'default_model': 'crm.lead',
-            'default_res_id': ids[0],
-            'default_use_template': bool(template_id),
-            'default_template_id': template_id,
-            'default_composition_mode': 'comment',
-        })
-        return {
-            'name': _('Compose Email'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'mail.compose.message',
-            'views': [(compose_form_id, 'form')],
-            'view_id': compose_form_id,
-            'target': 'new',
-            'context': ctx,
-        }
+        if vals.get('type') and not context.get('default_type'):
+            context['default_type'] = vals.get('type')
+        if vals.get('section_id') and not context.get('default_section_id'):
+            context['default_section_id'] = vals.get('section_id')
+
+        # 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 write(self, cr, uid, ids, vals, context=None):
+        # stage change: update date_last_stage_update
+        if 'stage_id' in vals:
+            vals['date_last_stage_update'] = fields.datetime.now()
+        # stage change with new stage: update probability
+        if vals.get('stage_id') and not vals.get('probability'):
+            onchange_stage_values = self.onchange_stage_id(cr, uid, ids, vals.get('stage_id'), context=context)['value']
+            vals.update(onchange_stage_values)
+        return super(crm_lead, self).write(cr, uid, ids, vals, context=context)
 
     # ----------------------------------------
     # Mail Gateway
@@ -1015,17 +955,15 @@ class crm_lead(base_stage, format_address, osv.osv):
         """
         if custom_values is None:
             custom_values = {}
-        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         defaults = {
             'name':  msg.get('subject') or _("No Subject"),
-            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'partner_id': msg.get('author_id', False),
             'user_id': False,
         }
         if msg.get('author_id'):
-            defaults.update(self.on_change_partner(cr, uid, None, msg.get('author_id'), context=context)['value'])
+            defaults.update(self.on_change_partner_id(cr, uid, None, msg.get('author_id'), context=context)['value'])
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             defaults['priority'] = msg.get('priority')
         defaults.update(custom_values)
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 0979a94eb3f..3c299fef704 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -5,71 +5,57 @@
         <!-- Crm stages -->
         <record model="crm.case.stage" id="stage_lead1">
             <field name="name">New</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">draft</field>
-            <field eval="0" name="probability"/>
-            <field eval="10" name="sequence"/>
+            <field name="case_default">1</field>
+            <field name="probability">0</field>
+            <field name="on_change">1</field>
+            <field name="sequence">1</field>
             <field name="type">both</field>
         </record>
         <record model="crm.case.stage" id="stage_lead2">
-            <field name="name">Opportunity</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">open</field>
-            <field eval="20" name="probability"/>
-            <field eval="20" name="sequence"/>
-            <field name="type">lead</field>
-        </record>
-        <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Dead</field>
-            <field eval="1" name="case_default"/>
-            <field eval="False" name="fold"/>
-            <field name="state">cancel</field>
-            <field eval="0" name="probability"/>
-            <field eval="30" name="sequence"/>
+            <field name="case_default">1</field>
+            <field name="probability">0</field>
+            <field name="on_change">1</field>
+            <field name="sequence">30</field>
             <field name="type">lead</field>
         </record>
         <record model="crm.case.stage" id="stage_lead3">
             <field name="name">Qualification</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">open</field>
-            <field eval="20" name="probability"/>
-            <field eval="100" name="sequence"/>
+            <field name="case_default">1</field>
+            <field name="probability">20</field>
+            <field name="on_change">1</field>
+            <field name="sequence">40</field>
             <field name="type">opportunity</field>
         </record>
         <record model="crm.case.stage" id="stage_lead4">
             <field name="name">Proposition</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">open</field>
-            <field eval="40" name="probability"/>
-            <field eval="110" name="sequence"/>
+            <field name="case_default">1</field>
+            <field name="probability">40</field>
+            <field name="sequence">50</field>
             <field name="type">opportunity</field>
         </record>
         <record model="crm.case.stage" id="stage_lead5">
             <field name="name">Negotiation</field>
-            <field eval="1" name="case_default"/>
-            <field name="state">open</field>
-            <field eval="60" name="probability"/>
-            <field eval="120" name="sequence"/>
+            <field name="case_default">1</field>
+            <field name="probability">60</field>
+            <field name="sequence">60</field>
             <field name="type">opportunity</field>
         </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"/>
-            <field eval="130" name="sequence"/>
-            <field eval="1" name="on_change"/>
+            <field name="case_default">1</field>
+            <field name="probability">100</field>
+            <field name="on_change">1</field>
+            <field name="sequence">70</field>
             <field name="type">opportunity</field>
         </record>
-        <record model="crm.case.stage" id="stage_lead8">
+        <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Lost</field>
-            <field eval="1" name="case_default"/>
-            <field eval="True" name="fold"/>
-            <field eval="1" name="on_change"/>
-            <field name="state">cancel</field>
-            <field eval="0" name="probability"/>
-            <field eval="140" name="sequence"/>
+            <field name="case_default">1</field>
+            <field name="fold">1</field>
+            <field name="probability">0</field>
+            <field name="on_change">1</field>
+            <field name="sequence">80</field>
             <field name="type">opportunity</field>
         </record>
         
@@ -77,7 +63,7 @@
             <field name="stage_ids" eval="[ (4, ref('stage_lead1')), (4, ref('stage_lead2')),
                                             (4, ref('stage_lead3')), (4, ref('stage_lead4')),
                                             (4, ref('stage_lead5')), (4, ref('stage_lead6')),
-                                            (4, ref('stage_lead7')), (4, ref('stage_lead8'))]"/>
+                                            (4, ref('stage_lead7'))]"/>
         </record>
 
         <!-- Crm campain -->
@@ -161,13 +147,7 @@
             <field name="name">Lead Created</field>
             <field name="res_model">crm.lead</field>
             <field name="default" eval="False"/>
-            <field name="description">Opportunity created</field>
-        </record>
-        <record id="mt_lead_convert_to_opportunity" model="mail.message.subtype">
-            <field name="name">Lead to Opportunity</field>
-            <field name="res_model">crm.lead</field>
-            <field name="default" eval="False"/>
-            <field name="description">Lead converted into an opportunity</field>
+            <field name="description">Lead created</field>
         </record>
         <record id="mt_lead_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
@@ -195,13 +175,6 @@
             <field name="parent_id" eval="ref('mt_lead_create')"/>
             <field name="relation_field">section_id</field>
         </record>
-        <record id="mt_salesteam_lead_opportunity" model="mail.message.subtype">
-            <field name="name">Lead to Opportunity</field>
-            <field name="default" eval="False"/>
-            <field name="res_model">crm.case.section</field>
-            <field name="parent_id" eval="ref('mt_lead_convert_to_opportunity')"/>
-            <field name="relation_field">section_id</field>
-        </record>
         <record id="mt_salesteam_lead_stage" model="mail.message.subtype">
             <field name="name">Opportunity Stage Changed</field>
             <field name="res_model">crm.case.section</field>
@@ -233,6 +206,20 @@
             <field name="email_to">${not object.partner_id and object.email_from}</field>
             <field name="body_html"></field>
         </record>
+        <record id="email_template_opportunity_reminder_mail" model="email.template">
+            <field name="name">Reminder to User</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="email_from">admin@example.com</field>
+            <field name="email_to">${object.user_id != False and object.user_id.email}</field>
+            <field name="subject">Reminder on Lead: ${object.id} from ${object.partner_id != False and object.partner_id.name or object.contact_name}</field>
+            <field name="body_html"><![CDATA[<p>This opportunity did not have any activity since at least 5 days. Here are some details:</p>
+<ul>
+<li>Name: ${object.name}</li>
+<li>ID: ${object.id}</li>
+<li>Description: ${object.description}</field></li>
+</ul>]]></field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index e7e6beae33e..dab17888d7a 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -6,9 +6,9 @@
         <record id="crm_case_1" model="crm.lead">
             <field name="type">lead</field>
             <field name="name">Plan to Attend a Training</field>
-            <field name="contact_name">Jason Dunagan</field>
+            <field name="contact_name">Jacques Dunagan</field>
             <field name="partner_name">Le Club SARL</field>
-            <field name="email_from">jason@leclub.fr</field>
+            <field name="email_from">jdunagan@leclub.fr</field>
             <field name="partner_id" ref=""/>
             <field name="function">Training Manager</field>
             <field name="street">73, rue Léon Dierx</field>
@@ -20,14 +20,25 @@
             <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_2"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
-I am Jason from Le Club SARL.
-I am intertested to attend a training organized in your company.
-Can you send me the details ?</field>
-            <field eval="1" name="active"/>
+I am Jacques from Le Club SARL.
+I am interested to attend a training organized in your company.
+Could you please send me the details ?</field>
+        </record>
+        <record id="crm_case_1" model="crm.lead">
+            <field name="create_date" eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_case1_1" model="mail.message">
+            <field name="subject">Inquiry</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_1"/>
+            <field name="body"><![CDATA[<p>Hello,<br />
+            I am Jacques from Le Club SARL. I am interested to attend a training organized in your company.<br />
+            Can you send me the details ?</p>]]></field>
+            <field name="type">email</field>
         </record>
 
         <record id="crm_case_2" model="crm.lead">
@@ -44,10 +55,20 @@ 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_2"/>
+            <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field eval="1" name="active"/>
+        </record>
+        <record id="crm_case_2" model="crm.lead">
+            <field name="create_date" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
+        </record>
+        <record id="msg_case2_1" model="mail.message">
+            <field name="subject">Need Details</field>
+            <field name="model">crm.lead</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="res_id" ref="crm_case_2"/>
+            <field name="body">Want to know features and benefits to use the new software.</field>
+            <field name="type">comment</field>
         </record>
 
         <record id="crm_case_3" model="crm.lead">
@@ -65,8 +86,10 @@ Can you send me the details ?</field>
             <field name="priority">2</field>
             <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"/>
+            <field name="stage_id" ref="stage_lead1"/>
+        </record>
+        <record id="crm_case_2" model="crm.lead">
+            <field name="create_date" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_4" model="crm.lead">
@@ -82,10 +105,12 @@ 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_1"/>
-            <field name="user_id" ref=""/>
-            <field name="stage_id" ref="stage_lead7"/>
-            <field eval="1" name="active"/>
+            <field name="section_id" ref="crm_case_section_2"/>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="stage_id" ref="stage_lead6"/>
+        </record>
+        <record id="crm_case_2" model="crm.lead">
+            <field name="create_date" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
         <record id="crm_case_5" model="crm.lead">
@@ -105,8 +130,8 @@ Can you send me the details ?</field>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">3</field>
-            <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="section_id" ref="crm_case_section_1"/>
+            <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
 Can you send me a quotation for 20 computers with speakers?
@@ -116,7 +141,6 @@ Purchase Manager
 Stonage IT,
 Franklinville
 Contact: +1 813 494 5005</field>
-            <field eval="1" name="active"/>
         </record>
 
         <record id="crm_case_6" model="crm.lead">
@@ -134,9 +158,8 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field eval="1" name="active"/>
         </record>
 
         <record id="crm_case_7" model="crm.lead">
@@ -153,9 +176,8 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref=""/>
             <field name="priority">5</field>
             <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"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="stage_id" ref="stage_lead1"/>
         </record>
 
         <record id="crm_case_8" model="crm.lead">
@@ -173,9 +195,8 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref=""/>
             <field name="priority">4</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="stage_lead7"/>
-            <field eval="1" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="stage_id" ref="stage_lead1"/>
         </record>
 
         <record id="crm_case_9" model="crm.lead">
@@ -193,12 +214,8 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">2</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="user_id" ref="base.user_demo"/>
             <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">
@@ -215,14 +232,13 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">2</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref=""/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hi,
 I would like to know more about specification and cost of laptops of your company.
 
 Thanks,
 Andrew</field>
-            <field eval="1" name="active"/>
         </record>
 
         <record id="crm_case_11" model="crm.lead">
@@ -239,9 +255,8 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_direct"/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_1"/>
-            <field name="user_id" ref="base.user_demo"/>
+            <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field eval="1" name="active"/>
         </record>
 
         <record id="crm_case_12" model="crm.lead">
@@ -258,22 +273,23 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">2</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="stage_lead2"/>
-            <field eval="1" name="active"/>
+            <field name="user_id" ref=""/>
+            <field name="stage_id" ref="stage_lead1"/>
         </record>
 
         <!-- Call Function to Cancel the leads (set as Dead) -->
-        <function model="crm.lead" name="case_cancel"
-            eval="[ ref('crm_case_12'), ref('crm_case_7'),
-                    ref('crm_case_3'), ref('crm_case_8')],
-                  {'install_mode': True}"
+        <function model="crm.lead" name="write"
+            eval="[ ref('crm_case_7'), ref('crm_case_8'),
+                    ref('crm_case_9'), ref('crm_case_10'),
+                    ref('crm_case_11'), ref('crm_case_12')],
+                    {'stage_id': ref('stage_lead2')},
+                    {'install_mode': True}"
         />
 
         <!-- Call Function to set the leads as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_1'), ref('crm_case_2'),
-                    ref('crm_case_5'), ref('crm_case_11')], {}"
+                    ref('crm_case_5'), ref('crm_case_6')], {}"
         />
 
         <!-- Demo Opportunities -->
@@ -296,8 +312,7 @@ Andrew</field>
             <field name="title_action">Meeting for pricing information.</field>
             <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"/>
+            <field name="stage_id" ref="crm.stage_lead1"/>
         </record>
 
         <record id="crm_case_14" model="crm.lead">
@@ -323,7 +338,6 @@ Andrew</field>
             <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"/>
         </record>
 
         <record id="crm_case_15" model="crm.lead">
@@ -344,10 +358,12 @@ Andrew</field>
             <field name="title_action">Call to ask system requirement</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead6"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
+        <record id="crm_case_15" model="crm.lead">
+            <field name="message_follower_ids" eval="[(3, ref('base.partner_root')), (4, ref('base.partner_demo'))]"/>
+        </record>
 
         <record id="crm_case_16" model="crm.lead">
             <field name="type">opportunity</field>
@@ -369,8 +385,7 @@ Andrew</field>
             <field name="title_action">Convert to quote</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead6"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead3"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
@@ -395,10 +410,12 @@ Andrew</field>
             <field name="title_action">Send price list regarding our interventions</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead6"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead4"/>
             <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">
+            <field name="message_follower_ids" eval="[(3, ref('base.partner_root')), (4, ref('base.partner_demo'))]"/>
+        </record>
 
         <record id="crm_case_18" model="crm.lead">
             <field name="type">opportunity</field>
@@ -420,9 +437,12 @@ Andrew</field>
             <field name="title_action">Call to define real needs about training</field>
             <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_lead4"/>
             <field eval="1" name="active"/>
         </record>
+        <record id="crm_case_18" model="crm.lead">
+            <field name="message_follower_ids" eval="[(4, ref('base.partner_demo'))]"/>
+        </record>
 
         <record id="crm_case_19" model="crm.lead">
             <field name="type">opportunity</field>
@@ -444,8 +464,7 @@ 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_lead6"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=3)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
@@ -462,8 +481,7 @@ Andrew</field>
             <field name="priority">2</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="stage_id" ref="crm.stage_lead1"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead4"/>
         </record>
 
         <record id="crm_case_21" model="crm.lead">
@@ -477,8 +495,7 @@ Andrew</field>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="stage_id" ref="crm.stage_lead6"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead4"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
@@ -496,8 +513,7 @@ Andrew</field>
             <field name="priority">3</field>
             <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"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
 
         <record id="crm_case_23" model="crm.lead">
@@ -512,8 +528,7 @@ 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_lead6"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
@@ -532,8 +547,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="stage_id" ref="crm.stage_lead6"/>
-            <field eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
             <field name="date_closed" eval="(DateTime.today() - relativedelta(month=1)).strftime('%Y-%m-%d %H:%M')"/>
         </record>
 
@@ -556,8 +570,7 @@ Andrew</field>
             <field name="title_action">Conf call with technical service</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 eval="1" name="active"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
         </record>
 
         <record id="crm_case_26" model="crm.lead">
@@ -581,21 +594,10 @@ Andrew</field>
             <field name="title_action">Send Catalogue by Email</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <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')"/>
+            <field name="stage_id" ref="crm.stage_lead5"/>
+            <!-- <field name="date_closed" eval="(DateTime.today() - relativedelta(hours=1)).strftime('%Y-%m-%d %H:%M')"/> -->
         </record>
 
-        <!-- Unsubscribe Admin from case15, subscribe Demo -->
-        <record id="crm_case_15" model="crm.lead">
-            <field name="message_follower_ids" eval="[(3, ref('base.partner_root')), (4, ref('base.partner_demo'))]"/>
-        </record>
-        <record id="crm_case_17" model="crm.lead">
-            <field name="message_follower_ids" eval="[(3, ref('base.partner_root')), (4, ref('base.partner_demo'))]"/>
-        </record>
-        <record id="crm_case_18" model="crm.lead">
-            <field name="message_follower_ids" eval="[(4, ref('base.partner_demo'))]"/>
-        </record>
         <!-- Some messages linked to the previous opportunities -->
         <record id="msg_case15_attach1" model="ir.attachment">
             <field name="datas">bWlncmF0aW9uIHRlc3Q=</field>
@@ -689,22 +691,6 @@ Andrew</field>
             <field name="parent_id" ref="msg_case18_1"/>
             <field name="author_id" ref="base.partner_demo"/>
         </record>
-        <record id="msg_case1_1" model="mail.message">
-            <field name="subject">Inquiry</field>
-            <field name="model">crm.lead</field>
-            <field name="res_id" ref="crm_case_1"/>
-            <field name="body"><![CDATA[<p>Hello,<br />
-            I am Jason from Le Club SARL. I am interested to attend a training organized in your company.<br />
-            Can you send me the details ?</p>]]></field>
-            <field name="type">email</field>
-        </record>
-        <record id="msg_case2_1" model="mail.message">
-            <field name="subject">Need Details</field>
-            <field name="model">crm.lead</field>
-            <field name="res_id" ref="crm_case_2"/>
-            <field name="body">Want to know features and benefits to use the new software.</field>
-            <field name="type">comment</field>
-        </record>
         <function model="mail.message" name="set_message_starred"
             eval="[ ref('msg_case18_1'), ref('msg_case18_2')], True, {}"
         />
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6ddd06c1c90..849cecaac85 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -12,9 +12,10 @@
             <field name="model">crm.case.stage</field>
             <field name="arch" type="xml">
                 <search string="Stage Search">
-                    <field name="name" string="Stage Name"/>
-                    <field name="state"/>
+                    <field name="name"/>
                     <field name="type"/>
+                    <field name="sequence"/>
+                    <field name="probability"/>
                 </search>
             </field>
         </record>
@@ -94,11 +95,8 @@
             <form string="Leads Form" version="7.0">
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
-                            states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_reset" string="Reset" type="object"
-                            states="cancel"/>
-                    <button name="case_cancel" string="Cancel Case" type="object"
-                            states="draft,open,pending"/>
+                            attrs="{'invisible': [('probability', '=', 100)]}"
+                            help="Convert to Opportunity" class="oe_highlight"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
                             domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
                             on_change="onchange_stage_id(stage_id)"/>
@@ -118,7 +116,7 @@
                             <field name="partner_name" string="Company Name"/>
                             <!-- Preload all the partner's information -->
                             <field name="partner_id" string="Customer"
-                                on_change="on_change_partner(partner_id)"
+                                on_change="on_change_partner_id(partner_id)"
                                 options='{"create_name_field": "name"}'
                                 context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_section_id': section_id}"/>
                             <label for="street" string="Address"/>
@@ -144,12 +142,6 @@
                             <field name="phone"/>
                             <field name="mobile"/>
                             <field name="fax"/>
-                            <!--
-                            This should be integrated in Open Chatter
-                            <button string="Mail"
-                                name="%(mail.action_email_compose_message_wizard)d"
-                                icon="terp-mail-message-new" type="action" colspan="1"/>
-                            -->
                         </group>
                         <group>
                             <field name="user_id" on_change="on_change_user(user_id, context)"
@@ -159,7 +151,7 @@
                                 <field name="section_id"/>
                                 <button name="case_escalate" string="Escalate"
                                         type="object" class="oe_link"
-                                        attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
+                                        attrs="{'invisible': ['|', ('section_id','=',False), ('probability', '=', 100)]}"/>
                             </div>
                             <field name="type" invisible="1"/>
                         </group>
@@ -177,20 +169,24 @@
                         <field name="description"/>
                     </page>
                     <page string="Extra Info">
-                        <group>
-                            <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
-                                <field name="company_id"
-                                    groups="base.group_multi_company"
-                                    widget="selection" colspan="2"/>
-                                <field name="state" groups="base.group_no_one"/>
-                            </group>
-                            <group string="Mailings">
-                                <field name="opt_out"/>
-                            </group>
-                            <group string="Misc">
+                        <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
+                            <field name="company_id"
+                                groups="base.group_multi_company"
+                                widget="selection" colspan="2"/>
+                        </group>
+                        <group string="Mailings">
+                            <field name="opt_out"/>
+                        </group>
+                        <group string="Misc">
+                            <group>
+                                <field name="probability" groups="base.group_no_one"/>
                                 <field name="active"/>
                                 <field name="referred"/>
                             </group>
+                            <group>
+                                <field name="date_open" groups="base.group_no_one"/>
+                                <field name="date_closed" groups="base.group_no_one"/>
+                            </group>
                         </group>
                     </page>
                     </notebook>
@@ -220,7 +216,7 @@
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Leads" fonts="bold:message_unread==True" colors="grey:state in ('cancel', 'done')">
+                <tree string="Leads" fonts="bold:message_unread==True" colors="grey:probability == 100">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date"/>
                     <field name="name"/>
@@ -232,7 +228,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="section_id" invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
-                    <field name="state" invisible="1"/>
+                    <field name="probability" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
@@ -262,7 +258,6 @@
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id">
-                    <field name="state" groups="base.group_no_one"/>
                     <field name="stage_id"/>
                     <field name="color"/>
                     <field name="priority"/>
@@ -335,16 +330,17 @@
                     <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" 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="Unassigned" name="unassigned"
+                            domain="[('user_id','=', False)]"
+                            help="No salesperson"/>
                     <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)"
+                    <filter string="Assigned to My Team(s)" groups="base.group_multi_salesteams"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                            help="Leads that are assigned to any sales teams I am member of" groups="base.group_multi_salesteams"/>
+                            help="Leads that are assigned to any sales teams I am member of"/>
+                    <filter string="Dead" name="dead"
+                            domain="[('probability', '=', '0'), ('stage_id.sequence', '!=', 1)]"/>
                     <separator />
                     <filter string="Available for mass mailing"
                             name='not_opt_out' domain="[('opt_out', '=', False)]"
@@ -382,20 +378,19 @@
             <field name="arch" type="xml">
                 <form string="Opportunities" version="7.0">
                     <header>
-                        <button name="case_mark_won" string="Mark Won" type="object"
-                                states="draft,open,pending" class="oe_highlight"/>
-                        <button name="case_mark_lost" string="Mark Lost" type="object"
-                                states="draft,open" class="oe_highlight"/>
-                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                        <button name="case_mark_won" string="Mark Won" type="object" class="oe_highlight"
+                                attrs="{'invisible': [('probability', '=', 100)]}"/>
+                        <button name="case_mark_lost" string="Mark Lost" type="object" class="oe_highlight"
+                                attrs="{'invisible': ['|', ('probability', '=', 0), ('probability', '=', 100)]}"/>
+                        <field name="stage_id" widget="statusbar" clickable="True"
+                                domain="['&amp;', ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"/>
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button string="Schedule/Log Call"
-                                name="%(opportunity2phonecall_act)d"
-                                type="action"/>
-                            <button string="Meeting"
+                            <button string="Schedule/Log Call" type="action"
+                                name="%(opportunity2phonecall_act)d"/>
+                            <button string="Meeting" type="object"
                                 name="action_makeMeeting"
-                                type="object"
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"/>
                         </div>
                         <div class="oe_title">
@@ -412,7 +407,7 @@
                         <group>
                             <group>
                                 <field name="partner_id"
-                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    on_change="on_change_partner_id(partner_id)"
                                     string="Customer"
                                     context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
                                 <field name="email_from" string="Email"/>
@@ -434,7 +429,8 @@
                                 <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'])]}"/>
+                                    <button name="case_escalate" string="Escalate" type="object" class="oe_link"
+                                            attrs="{'invisible': ['|', ('section_id','=',False), ('probability', '=', 100)]}"/>
                                 </div>
                             </group>
                             <group>
@@ -485,7 +481,6 @@
                                     <field name="day_open" groups="base.group_no_one"/>
                                     <field name="day_close" groups="base.group_no_one"/>
                                     <field name="referred"/>
-                                    <field name="state" invisible="1"/>
                                     <field name="type" invisible="1"/>
                                 </group>
                                 <group string="References">
@@ -515,7 +510,7 @@
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Opportunities" fonts="bold:message_unread==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Opportunities" fonts="bold:message_unread==True" colors="gray:probability == 100;red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date"/>
                     <field name="name" string="Opportunity"/>
@@ -533,7 +528,8 @@
                     <field name="referred" invisible="1"/>
                     <field name="priority" invisible="1"/>
                     <field name="message_unread" invisible="1"/>
-                    <field name="state" invisible="1"/>
+                    <field name="probability" invisible="1"/>
+                    <field name="write_date" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -550,15 +546,19 @@
                     <field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id','child_of',self)]"/>
+                    <field name="stage_id" domain="[]"/>
+                    <field name="probability"/>
                     <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" 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="New" name="new"
+                            domain="[('probability', '=', 0), ('stage_id.sequence', '=', 1)]"/>
+                    <filter string="Won" name="won"
+                            domain="[('probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
+                    <filter string="Lost" name="lost"
+                            domain="[('probability', '=', 0), ('stage_id.sequence', '!=', 1)]"/>
+                    <filter string="Unassigned" name="unassigned"
+                            domain="[('user_id','=', False)]" help="No salesperson"/>
                     <filter string="My Opportunities" name="assigned_to_me"
-                            domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
+                            domain="[('user_id', '=', uid)]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to me"/>
                     <filter string="Assigned to My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
@@ -576,6 +576,7 @@
                         <filter string="Campaign" domain="[]" context="{'group_by':'type_id'}"/>
                         <filter string="Channel" domain="[]" context="{'group_by':'channel_id'}"/>
                         <filter string="Creation" domain="[]" context="{'group_by':'create_date'}"/>
+                        <filter string="Last Update Month" domain="[]" context="{'group_by':'write_date'}"/>
                     </group>
                     <group string="Display">
                         <filter string="Show Sales Team" context="{'invisible_section': False}" domain="[]" help="Show Sales Team" groups="base.group_multi_salesteams"/>
@@ -601,7 +602,9 @@
                             'default_email_to':'{$object.email or \'\'}',
                             'default_use_template': True,
                             'default_template_id': ref('crm.email_template_opportunity_mail'),
-                        }"/>
+                        }"
+                groups="base.group_sale_salesman"
+                />
 
         <!--Update of email_template defined in crm_lead_data, to add ref_ir_act_window
             allowing to have a well formed email template (context action considered as set). -->
@@ -615,8 +618,9 @@
             <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)
+                    self.case_mark_lost(cr, uid, context['active_ids'], context=context)
             </field>
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
         <record id="ir_mark_as_lost" model="ir.values">
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 0d7004e005b..1e67c50a2c3 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -19,21 +19,19 @@
 #
 ##############################################################################
 
-from openerp.addons.base_status.base_state import base_state
 import crm
 from datetime import datetime
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.translate import _
 
-class crm_phonecall(base_state, osv.osv):
+class crm_phonecall(osv.osv):
     """ Model for CRM phonecalls """
     _name = "crm.phonecall"
     _description = "Phonecall"
     _order = "id desc"
     _inherit = ['mail.thread']
     _columns = {
-        # base_state required fields
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
         'create_date': fields.datetime('Creation Date' , readonly=True),
@@ -43,22 +41,21 @@ class crm_phonecall(base_state, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Contact'),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
-        'state': fields.selection([ ('draft', 'Draft'),
-                                    ('open', 'Confirmed'),
-                                    ('pending', 'Not Held'),
-                                    ('cancel', 'Cancelled'),
-                                    ('done', 'Held'),],
-                        string='Status', size=16, readonly=True, track_visibility='onchange',
-                        help='The status is set to \'Todo\', when a case is created.\
-                                If the case is in progress the status is set to \'Open\'.\
-                                When the call is over, the status is set to \'Held\'.\
-                                If the call needs to be done then the status is set to \'Not Held\'.'),
+        'state': fields.selection(
+            [('open', 'Confirmed'),
+             ('cancel', 'Cancelled'),
+             ('pending', 'Pending'),
+             ('done', 'Held')
+             ], string='Status', readonly=True, track_visibility='onchange',
+            help='The status is set to Confirmed, when a case is created.\n'
+                 'When the call is over, the status is set to Held.\n'
+                 'If the callis not applicable anymore, the status can be set to Cancelled.'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'date_open': fields.datetime('Opened', readonly=True),
         # phonecall fields
         'name': fields.char('Call Summary', size=64, required=True),
         'active': fields.boolean('Active', required=False),
-        'duration': fields.float('Duration', help="Duration in Minutes"),
+        'duration': fields.float('Duration', help='Duration in minutes and seconds.'),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                         domain="['|',('section_id','=',section_id),('section_id','=',False),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
@@ -71,7 +68,7 @@ class crm_phonecall(base_state, osv.osv):
     }
 
     def _get_default_state(self, cr, uid, context=None):
-        if context and context.get('default_state', False):
+        if context and context.get('default_state'):
             return context.get('default_state')
         return 'open'
 
@@ -79,29 +76,38 @@ class crm_phonecall(base_state, osv.osv):
         'date': fields.datetime.now,
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'state':  _get_default_state,
-        'user_id': lambda self,cr,uid,ctx: uid,
+        'user_id': lambda self, cr, uid, ctx: uid,
         'active': 1
     }
 
-    def case_close(self, cr, uid, ids, context=None):
-        """ Overrides close for crm_case for setting duration """
-        res = True
-        for phone in self.browse(cr, uid, ids, context=context):
-            phone_id = phone.id
-            data = {}
-            if phone.duration <=0:
-                duration = datetime.now() - datetime.strptime(phone.date, DEFAULT_SERVER_DATETIME_FORMAT)
-                data['duration'] = duration.seconds/float(60)
-            res = super(crm_phonecall, self).case_close(cr, uid, [phone_id], context=context)
-            self.write(cr, uid, [phone_id], data, context=context)
-        return res
+    def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):
+        values = {}
+        if partner_id:
+            partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            values = {
+                'partner_phone': partner.phone,
+                'partner_mobile': partner.mobile,
+            }
+        return {'value': values}
 
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as Todo
-        """
-        res = super(crm_phonecall, self).case_reset(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'duration': 0.0, 'state':'open'}, context=context)
-        return res
+    def write(self, cr, uid, ids, values, context=None):
+        """ Override to add case management: open/close dates """
+        if values.get('state'):
+            if values.get('state') == 'done':
+                values['date_closed'] = fields.datetime.now()
+                self.compute_duration(cr, uid, ids, context=context)
+            elif values.get('state') == 'open':
+                values['date_open'] = fields.datetime.now()
+                values['duration'] = 0.0
+        return super(crm_phonecall, self).write(cr, uid, ids, values, context=context)
+
+    def compute_duration(self, cr, uid, ids, context=None):
+        for phonecall in self.browse(cr, uid, ids, context=context):
+            if phonecall.duration <= 0:
+                duration = datetime.now() - datetime.strptime(phonecall.date, DEFAULT_SERVER_DATETIME_FORMAT)
+                values = {'duration': duration.seconds/float(60)}
+                self.write(cr, uid, [phonecall.id], values, context=context)
+        return True
 
     def schedule_another_phonecall(self, cr, uid, ids, schedule_time, call_summary, \
                     user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
@@ -135,7 +141,7 @@ class crm_phonecall(base_state, osv.osv):
             }
             new_id = self.create(cr, uid, vals, context=context)
             if action == 'log':
-                self.case_close(cr, uid, [new_id])
+                self.write(cr, uid, [new_id], {'state': 'done'}, context=context)
             phonecall_dict[call.id] = new_id
         return phonecall_dict
 
@@ -243,12 +249,11 @@ class crm_phonecall(base_state, osv.osv):
                             'email_from': default_contact and default_contact.email,
                         })
             vals = {
-                    'partner_id': partner_id,
-                    'opportunity_id' : opportunity_id,
+                'partner_id': partner_id,
+                'opportunity_id': opportunity_id,
+                'state': 'done',
             }
-            self.write(cr, uid, [call.id], vals)
-            self.case_close(cr, uid, [call.id])
-            opportunity.case_open(cr, uid, [opportunity_id])
+            self.write(cr, uid, [call.id], vals, context=context)
             opportunity_dict[call.id] = opportunity_id
         return opportunity_dict
 
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 2344604a294..f6f94547173 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -58,7 +58,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context">{}</field>
+        <field name="context">{'default_state': 'done'}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6c1b31180be..41a0eb5f805 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -50,14 +50,6 @@
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1"/>
                 <field name="state"/>
-                <button name="case_open" string="Confirm" type="object"
-                        states="draft,pending" icon="gtk-go-forward"/>
-                <button name="case_close" string="Held" type="object"
-                        states="open,pending" icon="gtk-jump-to"/>
-                <button name="case_cancel" string="Cancel" type="object"
-                        states="draft,open,pending" icon="gtk-cancel"/>
-                <button name="case_reset" string="Reset to Todo" type="object"
-                        states="cancel" icon="gtk-convert"/>
             </tree>
         </field>
     </record>
@@ -69,13 +61,7 @@
         <field name="arch" type="xml">
             <form string="Phone Call" version="7.0">
                 <header>
-                    <button name="case_close" string="Call Done" type="object" class="oe_highlight"
-                            states="open,pending"/>
-                    <button name="case_reset" string="Reset to Todo" type="object"
-                            states="cancel"/>
-                    <button name="case_cancel" string="Cancel Call" type="object"
-                            states="draft,open,pending"/>
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
+                    <field name="state" nolabel="1" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Phone Call">
                     <div class="oe_right">
@@ -102,11 +88,13 @@
                     <group col="4">
                         <field name="date"/>
                         <field name="user_id"/>
-                        <field name="duration" widget="float_time"/>
+                        <label for="duration"/>
+                        <div>
+                        	<field name="duration" widget="float_time" class="oe_inline" style="vertical-align:baseline"/> <b> min(s)</b>
+                        </div>
                         <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="partner_id" on_change="on_change_partner_id(partner_id)"/>
                         <field name="categ_id" widget="selection"
                             domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <field name="partner_mobile"/>
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index a84ae553b4a..d0dcc07fcb0 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -80,7 +80,6 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="probability"/>
-                    <field name="state"/>
                     <field name="type"/>
                 </tree>
             </field>
@@ -96,7 +95,6 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="state"/>
                         <field name="probability"/>
                         <field name="type"/>
                         <field name="on_change"/>
diff --git a/addons/crm/doc/changelog.rst b/addons/crm/doc/changelog.rst
new file mode 100644
index 00000000000..5312329f4f5
--- /dev/null
+++ b/addons/crm/doc/changelog.rst
@@ -0,0 +1,18 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- Stage/state update
+
+  - ``crm.phonecall``: removed inheritance towards ``base_state``.
+  - ``crm.lead``: removed ``state`` field. Added ``date_last_stage_update`` field
+    holding last stage_id modification. Updated reports.
+  - ``crm.case.stage``: removed ``state`` field.
+
+- ``crm``, ``crm_claim``: removed inheritance from ``base_stage`` class. Missing
+  methods have been added into ``crm`` and ``crm_claim``. Also removed inheritance
+  in ``crm_helpdesk`` because it uses states, not stages.
\ No newline at end of file
diff --git a/addons/crm/doc/index.rst b/addons/crm/doc/index.rst
new file mode 100644
index 00000000000..f98ca145a56
--- /dev/null
+++ b/addons/crm/doc/index.rst
@@ -0,0 +1,18 @@
+CRM module documentation
+========================
+
+CRM documentation topics
+'''''''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/crm/doc/stage_status.rst b/addons/crm/doc/stage_status.rst
new file mode 100644
index 00000000000..ca5d3d3d6e1
--- /dev/null
+++ b/addons/crm/doc/stage_status.rst
@@ -0,0 +1,61 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+Stage
++++++
+
+This revision removed the concept of state on crm.lead objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
+
+ - ``crm.lead`` now use only stages. However conventions still exist about
+   'New', 'Won' and 'Lost' stages. Those conventions are:
+
+   - ``new``: ``stage_id and stage_id.sequence = 1``
+   - ``won``: ``stage_id and stage_id.probability = 100 and stage_id.on_change = True``
+   - ``lost``: ``stage_id and stage_id.probability = 0 and stage_id.on_change = True
+     and stage_id.sequence != 1``
+
+ - ``crm.case.stage`` do not have any ``state`` field anymore. 
+ - ``crm.lead.report`` do not have any ``state`` field anymore. 
+
+By default a newly created lead is in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+
+Stage analysis
+++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``crm.lead.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
++++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
+++++++++
+
+The following subtypes are triggered on ``crm.lead``:
+
+ - ``mt_lead_create``: new leads. Condition: ``obj.probability == 0 and obj.stage_id
+   and obj.stage_id.sequence == 1``
+ - ``mt_lead_stage``: stage changed. Condition: ``(obj.stage_id and obj.stage_id.sequence != 1)
+   and obj.probability < 100``
+ - ``mt_lead_won``: lead/oportunity is won. condition: `` obj.probability == 100
+   and obj.stage_id and obj.stage_id.on_change``
+ - ``mt_lead_lost``: lead/opportunity is lost. Condition: ``obj.probability == 0
+   and obj.stage_id and obj.stage_id.sequence != 1'``
+
+
+Those subtypes are also available on the ``crm.case.section`` model and are used
+for the auto subscription.
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index 7b09f194742..524cdd9fa8f 100644
--- a/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@ -1,25 +1,26 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* crm
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2009-09-15 15:45+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2013-08-15 15:46+0000\n"
+"Last-Translator: Laureano Kloss <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@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:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-08-16 05:12+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "# Iniciativas"
 
 #. module: crm
 #: help:sale.config.settings,fetchmail_lead:0
@@ -27,9 +28,11 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Le permite configurar su servidor de correo entrante y crear iniciativas "
+"desde los correos entrantes."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:881
+#: code:addons/crm/crm_lead.py:898
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
@@ -37,13 +40,13 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #, python-format
 msgid "Lead"
-msgstr ""
+msgstr "Iniciativa"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr ""
+msgstr "Denominación"
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_lead
@@ -54,40 +57,45 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"Advertencia: Una iniciativa entrante está sin procesar más de 5 días.\n"
+"Nombre: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Descripción: [[object.description]]\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "Establecer como equipo al Departamento de ventas"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "Seleccionar oportunidades"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Administrar recaudación de fondos"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Demora para cerrar"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Nombre de etapa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -95,52 +103,52 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Comercial"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "Análisis Iniciativas CRM"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Nombre de la compañía"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Formación"
 
 #. 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 "Etiquetas de ventas"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "Cierre Esperado"
 
 #. module: crm
 #: help:crm.case.section,message_unread:0
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si está marcado, los nuevos mensajes requerirán su atención"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "Fecha creación"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -151,7 +159,7 @@ msgstr "Nombre de regla"
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "Sólo es posible convertir una llamada telefónica cada vez."
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -161,17 +169,17 @@ msgstr ""
 #: field:crm.lead.report,type_id:0
 #: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Busqueda de oportunidades"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "Mes esperado de cierre"
 
 #. module: crm
 #: help:crm.case.section,message_summary:0
@@ -181,14 +189,17 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contiene el resumen del chatter (nº de mensajes, ...). Este resumen está "
+"generado directamente en formato HTML para poder ser insertado en las vistas "
+"kanban."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
-#: code:addons/crm/crm_lead.py:744
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Alerta!"
 
 #. module: crm
 #: view:crm.lead:0
@@ -203,46 +214,46 @@ msgstr ""
 #: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr "Partner"
+msgstr "Empresa"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Planificar otra llamada"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Llamada de teléfono"
 
 #. module: crm
 #: field:crm.lead,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "No acepta recibir mensajes"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "Nº reuniones"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Recordatorio al usuario"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "Criterios"
+msgstr "Criterio"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -252,26 +263,28 @@ msgstr "Respuestas excluidas:"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "Fusionar oportunidades"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Análisis de iniciativas"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
 msgstr ""
+"Copy text \t\r\n"
+"<b>%s una llamada</b> para el <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "Campañas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -286,6 +299,9 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Si se marca la casilla 'No acepta recibir mensajes', este contacto ha "
+"rehusado recibir correos electrónicos o ha eliminado su suscripción a una "
+"campaña."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -293,15 +309,15 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:982
+#: code:addons/crm/crm_lead.py:1002
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Sin título"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Nombre del contacto"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -309,7 +325,7 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
-"La categoría del partner que será añadida a las empresas que cumplan los "
+"La categoría del partner será añadida a las empresas que cumplan los "
 "criterios de segmentación después del cálculo."
 
 #. module: crm
@@ -325,40 +341,50 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir una nueva segmentación de clientes.\n"
+"</p><p>\n"
+"Cree categorías específicas que puede asignar a sus contactos para "
+"administrar mejor sus interacciones con ellos. La herramienta de "
+"segmentación es capaz de asignar categorías a los contactos de acuerdo a los "
+"criterios que establezca.\n"
+"</p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
 #: field:crm.phonecall,partner_id:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the salesman with the team leader."
 msgstr ""
+"Al escalar a este equipo sobreescribir al comercial con el jefe de equipo."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Reunión de oportunidad"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0
 #: help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Número de días para cerrar el caso"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Cuando un proyecto/oportunidad es detectado"
 
 #. module: crm
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Iniciativas y oportunidades"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.relate_partner_opportunities
@@ -377,12 +403,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una oportunidad relacionada con este cliente.\n"
+"</p><p>\n"
+"Use las oportunidades para seguir la pista al flujo de sus ventas, seguir "
+"una venta potencial y prever mejor sus futuros ingresos.\n"
+"</p><p>\n"
+"Podrá planificar reuniones y llamadas telefónicas desde las oportunidades, "
+"convertirlas en ofertas, adjuntar documentos relacionados, rastrear todas "
+"las discusiones, y mucho más.\n"
+"</p>\n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "Muerta"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -390,7 +427,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensajes no leídos"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -404,17 +441,17 @@ msgstr "Segmentación"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Enlace a cliente existente"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Actualizar fecha"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "Jefe de equipo"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -422,6 +459,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Este porcentaje representa la probabilidad por defecto / media para que los "
+"casos de esta etapa tengan éxito."
 
 #. module: crm
 #: view:crm.lead:0
@@ -436,24 +475,27 @@ msgstr "Categoría"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "# Oportunidades"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
+#: code:addons/crm/crm_lead.py:640
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
 msgstr ""
+"Seleccione más de un elemento (iniciativa u oportunidad) desde la vista "
+"lista."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
+"Iniciativas asignadas a uno de los equipos que gestiono, o a mí mismo"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Dirección de correo del contacto de la empresa"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -467,11 +509,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir un nuevo equipo de ventas.\n"
+"</p><p>\n"
+"Use los equipos de venta para organizar a los diferentes comerciales o "
+"departamentos en equipos separados. Cada equipo trabajará en su propia lista "
+"de oportunidades.\n"
+"</p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Reunión o conferencia telefónica para oportunidad"
 
 #. module: crm
 #: field:crm.lead,state:0
@@ -480,17 +530,17 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Crear oportunidad"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -500,19 +550,19 @@ msgstr "Escalar"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "Mailings"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Etapa cambiada"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -522,19 +572,19 @@ msgstr "No está en ejecución"
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr "Ingreso planeado"
+msgstr "Ingreso previsto"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Ingreso esperado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -550,23 +600,27 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"El estado se establece a 'Para hacer', cuando un caso es creado. Si el caso "
+"está en progreso el estado se establece a 'Abierto'. Cuando la llamada "
+"finaliza, el estado se establece a 'Realizada'. si la llamada requiere ser "
+"realizada entonces el estado se establece a 'No realizada'"
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
 #: field:crm.lead,message_summary:0
 #: field:crm.phonecall,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Fusionar"
 
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
 msgid "Opportunity ${object.name | h})"
-msgstr ""
+msgstr "Oportunidad ${object.name | h})"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -576,7 +630,7 @@ msgstr "Categoría del caso"
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Nombre del contacto de la empresa"
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -584,6 +638,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Recordatorio en iniciativa: [[object.id ]] [[object.partner_id and 'of ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -593,24 +649,24 @@ msgstr "Opciones de perfiles"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "#Llamadas telefónicas"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "¡El código del equipo de ventas debe ser único!"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "Email address of the contact"
-msgstr ""
+msgstr "Dirección de correo electrónico del contacto"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
 #: view:crm.lead:0
 #: selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En proceso"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -624,6 +680,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir una nueva categoría.\n"
+"</p><p>\n"
+"Cree categorías específicas de llamadas telefónicas para definir mejor el "
+"tipo de llamadas registradas en el sistema.\n"
+"</p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -631,54 +694,57 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"La dirección de correo electrónico usada como \"Responder a\" de todos los "
+"correos electrónicos enviados por OpenERP para los casos de este equipo de "
+"ventas."
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mes de creación"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr ""
+msgstr "Horario de trabajo"
 
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "Líneas de Segmentación de Empresa"
+msgstr "Líneas de segmentación de empresa"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "Análisis de llamadas"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Formulario de iniciativas"
 
 #. module: crm
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "Segmentación de Empresa"
+msgstr "Segmentación de empresa"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Moneda"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Ingreso estimado"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "Mes de creación"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -693,20 +759,20 @@ msgstr "Probabilidad (%)"
 #. module: crm
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
-msgstr ""
+msgstr "¡La probabilidad de cierre debería estar entre 0% y 100%!"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Generación de iniciativas"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Tablero de estadísticas"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/crm_lead.py:878
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -717,48 +783,50 @@ msgstr ""
 #: field:res.partner,opportunity_count:0
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Oportunidad"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisión"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Convertir a oportunidad"
 
 #. 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
 msgid "Stop Process"
-msgstr "Detener Proceso"
+msgstr "Detener el proceso"
 
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Buscar llamadas"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Iniciativas/Oportunidades que están asignadas a uno de los equipos de venta "
+"que gestiono"
 
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Tipo de evento"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -766,15 +834,15 @@ msgid "Exclusive"
 msgstr "Exclusivo"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:584
+#: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "Desde %s : %s"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Convertir a oportunidad"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -783,13 +851,13 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -802,22 +870,24 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Enlace entre etapas y equipos de ventas. Cuando se asigna, las etapas están "
+"limitadas al equipo de venta seleccionado."
 
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Requisitos"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Código postal"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Llamadas sin asignar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -830,17 +900,17 @@ msgstr ""
 #: model:process.node,name:crm.process_node_opportunities0
 #: view:res.partner:0
 msgid "Opportunities"
-msgstr ""
+msgstr "Oportunidades"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "Categoría de partner"
+msgstr "Categoría de empresa"
 
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Tasa de éxito (%)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -850,50 +920,50 @@ msgstr "Utiliza las reglas de compra-ventas"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "Saliente"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Marcar como ganado"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "Iniciativas de EEUU"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Marcar perdido"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "Iniciativas borrador"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "Enviar correo electrónico"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
 #, python-format
 msgid "Warning !"
-msgstr "Atención !"
+msgstr "Alerta!"
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Días para abrir"
 
 #. module: crm
 #: field:crm.lead,mobile:0
@@ -934,7 +1004,7 @@ msgid "Next Action"
 msgstr "Próxima acción"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:763
+#: code:addons/crm/crm_lead.py:780
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
 msgstr ""
@@ -1024,7 +1094,7 @@ msgid "Creation Date"
 msgstr "Fecha de creación"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:698
+#: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
 msgstr ""
@@ -1213,7 +1283,9 @@ msgid "Days to Close"
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:1057
 #: field:crm.case.section,complete_name:0
+#, python-format
 msgid "unknown"
 msgstr ""
 
@@ -1296,7 +1368,7 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:565
+#: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
 msgstr ""
@@ -1856,7 +1928,7 @@ msgid "Leads"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:563
+#: code:addons/crm/crm_lead.py:579
 #, python-format
 msgid "Merged leads"
 msgstr ""
@@ -1950,7 +2022,6 @@ msgid "Global CC"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
@@ -2878,7 +2949,7 @@ msgid "Working Hours"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:968
+#: code:addons/crm/crm_lead.py:986
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index 98313efb4f3..791273361eb 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -7,14 +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-04-13 08:42+0000\n"
+"PO-Revision-Date: 2013-07-25 13:52+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-04-14 05:12+0000\n"
-"X-Generator: Launchpad (build 16564)\n"
+"X-Launchpad-Export-Date: 2013-07-26 05:14+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
+
+#. module: crm
+#: model:crm.case.stage,name:crm.stage_lead3
+msgid "Qualification"
+msgstr "Besorolás"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -31,7 +36,7 @@ msgstr ""
 "létrehozását a bejövő levelekből."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:881
+#: code:addons/crm/crm_lead.py:898
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
@@ -192,8 +197,8 @@ msgstr ""
 "direkt HTML formátumú ahhoz hogy beilleszthető legyen a kanban nézetekbe."
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
-#: code:addons/crm/crm_lead.py:744
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
@@ -236,7 +241,7 @@ msgstr "Kilép"
 #: view:crm.lead:0
 #: field:crm.lead,state_id:0
 msgid "State"
-msgstr "Állapot"
+msgstr "Állam/Megye"
 
 #. module: crm
 #: field:res.partner,meeting_count:0
@@ -304,7 +309,7 @@ msgid "Prospect Partner"
 msgstr "Leendő partner"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:982
+#: code:addons/crm/crm_lead.py:1002
 #, python-format
 msgid "No Subject"
 msgstr "Nincs tárgy"
@@ -482,7 +487,7 @@ msgid "#Opportunities"
 msgstr "Lehetőségek száma"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
+#: code:addons/crm/crm_lead.py:640
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
@@ -782,7 +787,7 @@ msgid "Statistics Dashboard"
 msgstr "Statisztika vezérlőpult"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/crm_lead.py:878
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -844,7 +849,7 @@ msgid "Exclusive"
 msgstr "Kizárólagos"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:584
+#: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
 msgstr "Ettől %s : %s"
@@ -1016,7 +1021,7 @@ msgid "Next Action"
 msgstr "Következő művelet"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:763
+#: code:addons/crm/crm_lead.py:780
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
 msgstr "<b>Partner</b> beállítva mint <em>%s</em>."
@@ -1109,7 +1114,7 @@ msgid "Creation Date"
 msgstr "Létrehozás dátuma"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:698
+#: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
 msgstr "Tervezet <b>lehetőséggé átalakítva lehetőséggé</b>"
@@ -1324,7 +1329,9 @@ msgid "Days to Close"
 msgstr "Lezárásig hátralévő napok"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:1057
 #: field:crm.case.section,complete_name:0
+#, python-format
 msgid "unknown"
 msgstr "Ismeretlen"
 
@@ -1415,7 +1422,7 @@ msgid "Lead Description"
 msgstr "Érdeklődés leírása"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:565
+#: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
 msgstr "Lehetőségek összefésülése"
@@ -1989,7 +1996,7 @@ msgid "Leads"
 msgstr "Érdeklődők"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:563
+#: code:addons/crm/crm_lead.py:579
 #, python-format
 msgid "Merged leads"
 msgstr "Össztefésült érdeklődések"
@@ -2085,7 +2092,6 @@ msgid "Global CC"
 msgstr "Globális CC /másolat/"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
@@ -2399,7 +2405,7 @@ msgstr "Érdeklődés átalakítva egy lehetőséggé"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr "Nem iktatott rdeklődések"
+msgstr "Nem iktatott érdeklődések"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
@@ -2685,11 +2691,6 @@ msgstr "Valószínűség automatikus változtatása"
 msgid "My Phone Calls"
 msgstr "Telefonhívásaim"
 
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead3
-msgid "Qualification"
-msgstr "Besorolás"
-
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
@@ -3100,7 +3101,7 @@ msgid "Working Hours"
 msgstr "Munkaórák"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:968
+#: code:addons/crm/crm_lead.py:986
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
@@ -3960,9 +3961,19 @@ msgstr ""
 #~ msgid "Can not add note!"
 #~ msgstr "Nem lehet hozzáadni megjegyzést!"
 
+#, python-format
+#~ msgid ""
+#~ "Opportunity must have Partner assigned before merging with other Opportunity."
+#~ msgstr ""
+#~ "Csak a Partnerhez rendelt Lehetőséget lehet más Lehetőséggel összefűzni."
+
 #~ msgid "_Merge"
 #~ msgstr "Össze_fésülés"
 
+#, python-format
+#~ msgid "The opportunity '%s' has been marked as lost."
+#~ msgstr "A '%s' lehetőséget elvesztettnek jelöltem."
+
 #, python-format
 #~ msgid "Lead '%s' has been converted to an opportunity."
 #~ msgstr "A '%s'"
@@ -3990,3 +4001,17 @@ msgstr ""
 
 #~ msgid "Convert To Opportunity"
 #~ msgstr "Átalakítás lehetőséggé"
+
+#~ msgid "Edit all Occurrences  of recurrent Meeting."
+#~ msgstr "Az ismétlődő találkozók összes eseményének szerkesztése."
+
+#~ msgid ""
+#~ "Leads Analysis allows you to check different CRM related information. Check "
+#~ "for treatment delays, number of responses given and emails sent. You can "
+#~ "sort out your leads analysis by different groups to get accurate grained "
+#~ "analysis."
+#~ msgstr ""
+#~ "Az érdeklődések elemzése több CRM-hez kapcsolódó információt nyújt. "
+#~ "Ellenőrizhetjük az eljárás elnapolását, a kiküldött válaszok és e-mailek "
+#~ "számát. A részletes eredmény érdekében az érdeklődéseket különféle "
+#~ "csoportosítások szerint is elemezhetjük."
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index ec2a9f35ee5..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-05-30 13:52+0000\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-05-31 05:38+0000\n"
-"X-Generator: Launchpad (build 16660)\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
@@ -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
@@ -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
@@ -2721,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
@@ -2830,7 +2835,7 @@ msgstr "Дата создания"
 #. module: crm
 #: view:crm.lead:0
 msgid "at"
-msgstr ""
+msgstr "в"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
diff --git a/addons/crm/i18n/th.po b/addons/crm/i18n/th.po
index 082ed1efa6d..99c347c9ed3 100644
--- a/addons/crm/i18n/th.po
+++ b/addons/crm/i18n/th.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:04+0000\n"
-"PO-Revision-Date: 2011-01-16 16:48+0000\n"
-"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
+"PO-Revision-Date: 2013-07-24 09:15+0000\n"
+"Last-Translator: Supakorn S <lanpartystudio@gmail.com>\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-03-16 05:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-25 05:13+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "เป้าหมาย"
 
 #. module: crm
 #: help:sale.config.settings,fetchmail_lead:0
 msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
-msgstr ""
+msgstr "อนุญาตให้ปรับแต่งเมลเซิฟเวอร์ขาเข้า และสร้างเป้าหมายจากเมลที่เข้ามา"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:881
+#: code:addons/crm/crm_lead.py:898
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
@@ -38,7 +38,7 @@ msgstr ""
 #: selection:crm.lead.report,type:0
 #, python-format
 msgid "Lead"
-msgstr ""
+msgstr "ผู้นำ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -55,22 +55,27 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"คำเตือน มีเป้าหมายที่ไม่ได้ประมวลผลที่เก่ากว่า 5 วัน\n"
+"ชื่อ:\n"
+"ID:\n"
+"รายละเอียด:\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr ""
+msgstr "การกระทำ"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "ตั้งทีมในแผนกขาย"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "เลือกโอกาส"
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
@@ -96,12 +101,12 @@ msgstr "ชื่อขั้นตอน"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "พนักงานขาย"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "วิเคราะห์เป้าหมาย"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -113,12 +118,12 @@ msgstr "วัน"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "ชื่อบริษัท"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "หลักสูตรอบรม"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -136,7 +141,7 @@ msgstr ""
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "ถ้าการตรวจสอบข้อความใหม่ให้ระบุความสนใจของคุณ"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -167,7 +172,7 @@ msgstr "แคมเปญ"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "ค้นหาโอกาส"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
@@ -184,8 +189,8 @@ msgid ""
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
-#: code:addons/crm/crm_lead.py:744
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
@@ -228,12 +233,12 @@ msgstr ""
 #: view:crm.lead:0
 #: field:crm.lead,state_id:0
 msgid "State"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "ประชุม"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -253,14 +258,14 @@ msgstr "คำตอบไม่รวม :"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "รวมโอกาส"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr "การวิเคราะห์ Lead"
+msgstr "การวิเคราะห์เป้าหมาย"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:1010
@@ -294,10 +299,10 @@ msgid "Prospect Partner"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:982
+#: code:addons/crm/crm_lead.py:1002
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "ไม่มีชื่อเรื่อง"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
@@ -330,7 +335,7 @@ msgstr ""
 #: field:crm.phonecall,partner_id:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr "ชื่อผู้ติดต่อ"
+msgstr "รายชื่อ"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
@@ -357,7 +362,7 @@ msgstr ""
 #. module: crm
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "เป้าหมายและโอกาส"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.relate_partner_opportunities
@@ -381,7 +386,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "ไม่สำเร็จ"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -389,7 +394,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "ข้อความที่ยังไม่ได้อ่าน"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -403,7 +408,7 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "เชื่อมโยงกับลูกค้าที่มีอยู่"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -413,7 +418,7 @@ msgstr "วันที่ปรับปรุง"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "หัวหน้าทีม"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -435,10 +440,10 @@ msgstr "ประเภท"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "โอกาส"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
+#: code:addons/crm/crm_lead.py:640
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
@@ -479,12 +484,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 msgid "Create Opportunity"
-msgstr ""
+msgstr "สร้างโอกาส"
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -504,7 +509,7 @@ msgstr ""
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "เปลี่ยนแปลงสถานะ"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -521,12 +526,12 @@ msgstr "ไม่ได้ทำงานอยู่"
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "รายได้ตามแผน"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "เป้าหมายรายได้"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -560,7 +565,7 @@ msgstr "สรุป"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "รวม"
 
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
@@ -592,7 +597,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
@@ -609,7 +614,7 @@ msgstr ""
 #: view:crm.lead:0
 #: selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "กำลังดำเนินการ"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -640,7 +645,7 @@ msgstr ""
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr ""
+msgstr "เวลาทำงาน"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -651,7 +656,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "วิเคราะห์การใช้โทรศัพท์"
 
 #. module: crm
 #: view:crm.lead:0
@@ -667,17 +672,17 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "สกุลเงิน"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "รายได้ที่น่าจะเป็น"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "เดือนที่สร้าง"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -687,7 +692,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "คาดว่า"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
@@ -697,15 +702,15 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "การสร้างเป้าหมาย"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "แดชบอร์ดสถิติ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/crm_lead.py:878
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -716,37 +721,37 @@ msgstr ""
 #: field:res.partner,opportunity_count:0
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "โอกาส"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "โทรทัศน์"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "แปลงเป็นโอกาส"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "ตั้งค่าระบบงานขาย"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Stop Process"
-msgstr ""
+msgstr "หยุดการทำงาน"
 
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "ชื่อแทน"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "ค้นหาการโทรศัพท์"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -757,15 +762,15 @@ msgstr ""
 #. module: crm
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "ชนิดเหตุการณ์"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "พิเศษ"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:584
+#: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
 msgstr ""
@@ -773,7 +778,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "แปลงเป็นโอกาส"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -782,18 +787,18 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "หรือ"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "อ้างอิงที่ 2"
 
 #. module: crm
 #: help:crm.case.stage,section_ids:0
@@ -801,22 +806,24 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"เชื่อมโยงระหว่างสถานะและทีมขาย "
+"เมื่อตั้งแล้วจะจำกัดสถานะปัจจุบันสำหรับทีมขายที่เลือก"
 
 #. module: crm
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "ความต้องการ"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "รหัสไปรษณีย์"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "การโทรศัพท์ที่ไม่ได้กำหนดใด ๆ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -829,17 +836,17 @@ msgstr ""
 #: model:process.node,name:crm.process_node_opportunities0
 #: view:res.partner:0
 msgid "Opportunities"
-msgstr ""
+msgstr "โอกาส"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr ""
+msgstr "ประเภทบริษัทคู่ค้า"
 
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "อัตราการสำเสร็จ"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -849,12 +856,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "ขาออก"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "เราทำได้สำเร็จ"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
@@ -864,24 +871,24 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "เราไม่สามารถทำได้"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "โอกาสที่ยังเป็นฉบับร่าง"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "มีนาคม"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "ส่งอีเมล"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
@@ -892,18 +899,18 @@ msgstr "คำเตือน !"
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "วันที่จะเปิด"
 
 #. module: crm
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "มือถือ"
 
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "อ้างอิง"
 
 #. module: crm
 #: view:crm.lead:0
@@ -923,17 +930,17 @@ msgstr ""
 #: view:res.partner:0
 #: field:res.partner,meeting_ids:0
 msgid "Meetings"
-msgstr ""
+msgstr "การประชุม"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0
 #: field:crm.lead,title_action:0
 #: field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "การกระทำต่อไป"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:763
+#: code:addons/crm/crm_lead.py:780
 #, python-format
 msgid "<b>Partner</b> set to <em>%s</em>."
 msgstr ""
@@ -943,22 +950,22 @@ msgstr ""
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "ฉบับร่าง"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "การจำแนกคู่ค้า"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "แสดงโอกาสเท่านั้น"
 
 #. module: crm
 #: field:crm.lead,name:0
 msgid "Subject"
-msgstr ""
+msgstr "ชื่อเรื่อง"
 
 #. module: crm
 #: view:crm.lead:0
@@ -968,7 +975,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "แสดงทีมขาย"
 
 #. module: crm
 #: help:sale.config.settings,module_crm_claim:0
@@ -981,7 +988,7 @@ msgstr ""
 #: model:crm.case.stage,name:crm.stage_lead6
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "ชนะ"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
@@ -991,7 +998,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "ฝ่ายขาย"
 
 #. module: crm
 #: field:crm.case.stage,type:0
@@ -999,7 +1006,7 @@ msgstr ""
 #: field:crm.lead.report,type:0
 #: view:crm.opportunity2phonecall:0
 msgid "Type"
-msgstr ""
+msgstr "ประเภท"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1012,7 +1019,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "ต่ำสุด"
 
 #. module: crm
 #: field:crm.lead,create_date:0
@@ -1020,18 +1027,18 @@ msgstr ""
 #: field:crm.phonecall,create_date:0
 #: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:698
+#: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
-msgstr ""
+msgstr "แปลงเป้าหมายเป็นโอกาสแล้ว"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "จำนวนที่สั่งซื้อ"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1045,22 +1052,22 @@ msgstr ""
 #: view:crm.lead.report:0
 #: field:crm.lead.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "สถานะ"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "การโทรที่ได้รับมอบหมาย"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "ผู้ใช้เข้าสู่ระบบ"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "การโทรที่ค้างอยู่"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1070,7 +1077,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "ขั้นตอน"
 
 #. module: crm
 #: help:sale.config.settings,module_crm_helpdesk:0
@@ -1082,12 +1089,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "ลบ"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "โอกาสได้ถูกสร้างแล้ว"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1099,7 +1106,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr ""
+msgstr "กันยายน"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -1127,7 +1134,7 @@ msgstr ""
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "การตั้งค่าในขั้นตอนนี้จะเปลี่ยนความน่าจะเป็นโดยอัตโนมัติเมื่อมีโอกาส"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1137,28 +1144,28 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "รูปแบบการชำระเงิน"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "วันที่เปิด"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "ระยะเวลา (นาที)"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "ช่องทาง"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "วันที่คาดว่าจะปิด"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1166,6 +1173,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"ถ้าเขตข้อมูลที่ใช้งานอยู่จะถูกกำหนดเป็นจริง "
+"จะทำให้คุณสามารถซ่อนทีมขายโดยไม่ลบออก"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
@@ -1173,6 +1182,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
 #: help:crm.case.stage,type:0
@@ -1185,7 +1196,7 @@ msgstr ""
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "เป้าหมายถูกสร้างแล้ว"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1197,29 +1208,31 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr ""
+msgstr "สถานะการทำงาน"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "บันทึกการโทร"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "วันที่จะปิด"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:1057
 #: field:crm.case.section,complete_name:0
+#, python-format
 msgid "unknown"
-msgstr ""
+msgstr "ไม่มีข้อมูล"
 
 #. module: crm
 #: field:crm.case.section,message_is_follower:0
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "เป็นผู้ติดตาม"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1227,28 +1240,28 @@ msgstr ""
 #: field:crm.phonecall,date:0
 #: field:crm.phonecall2phonecall,date:0
 msgid "Date"
-msgstr ""
+msgstr "วันที่"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "การสนับสนุนออนไลน์"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "ตัวกรองเพิ่มเติม"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "การโทรที่ปิดแล้ว"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "ค้นหา"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -1262,12 +1275,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "ฝ่ายขายและการตลาด"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "วันที่โทร"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1293,45 +1306,45 @@ msgid "Lead Description"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:565
+#: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "โอกาสที่รวมแล้ว"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "ให้คำปรึกษา"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "รหัส"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "คุณสมบัติ"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "ทีมลูก"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "การโทรที่เป็นฉบับร่างและเปิด"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "พนักงานขาย"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr ""
+msgstr "อ้างอิง"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -1341,7 +1354,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Cancel"
-msgstr ""
+msgstr "ยกเลิก"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1351,7 +1364,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "ข้อมูล"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1361,36 +1374,36 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+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
 #: field:crm.lead2opportunity.partner.mass,action:0
 #: field:crm.partner.binding,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "ลูกค้าที่เกี่ยวข้อง"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 msgid "Other"
-msgstr ""
+msgstr "อื่น ๆ"
 
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "เป้าหมาย / โอกาส"
 
 #. module: crm
 #: 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 "รวมเป้าหมาย / โอกาส"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -1400,7 +1413,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "ประเภทการโทร"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1410,12 +1423,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "Users"
-msgstr ""
+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
@@ -1431,18 +1444,18 @@ msgstr ""
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "บันทึกการโทร"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr ""
+msgstr "ยอดขาย"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "การโทรศัพท์"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1459,7 +1472,7 @@ msgstr ""
 #: field:crm.payment.mode,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr ""
+msgstr "ชื่อ"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1470,7 +1483,7 @@ msgstr ""
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "วันปิด"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1482,18 +1495,18 @@ msgstr ""
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "ข้อความและประวัติการติดต่อ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "แสดงประเทศ"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "การสร้าง"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1501,7 +1514,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "สูง"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
@@ -1529,7 +1542,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "จัดกลุ่มตาม..."
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -1598,7 +1611,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "บริการ"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1606,7 +1619,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "สูงสุด"
 
 #. module: crm
 #: help:crm.lead.report,creation_year:0
@@ -1617,12 +1630,12 @@ msgstr ""
 #: view:crm.case.section:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "บันทึก"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
 msgid "Value"
-msgstr ""
+msgstr "มูลค่า"
 
 #. module: crm
 #: field:crm.lead,partner_name:0
@@ -1632,12 +1645,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "ตอบกลับไปยัง"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "แสดงผล"
 
 #. module: crm
 #: view:board.board:0
@@ -1655,7 +1668,7 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "ช่อง"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1663,12 +1676,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Held"
-msgstr ""
+msgstr "ถูกพักรอแล้ว"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Extra Info"
-msgstr ""
+msgstr "ข้อมูลเพิ่มเติม"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1678,7 +1691,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "แก้ไข..."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1699,7 +1712,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "ความสำคัญ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -1732,7 +1745,7 @@ msgstr ""
 #: 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
@@ -1748,12 +1761,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "การขายทางโทรศัพท์"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "เป้าหมายที่ได้รับมอบหมาย"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1764,17 +1777,17 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "วันที่ตามแผน"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "รายได้ที่คาดหวัง"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "ที่อ้างถึง"
 
 #. module: crm
 #: help:crm.lead,type:0
@@ -1787,29 +1800,29 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr ""
+msgstr "กรกฎาคม"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "เป้าหมาย / ลูกค้า"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "แผนกบริการ"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "แสดงเฉพาะเป้าหมาย"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "ทีมขาย"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
@@ -1819,7 +1832,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "ทีม"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1835,14 +1848,14 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "ความน่าจะเป็น"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "เดือน"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1850,18 +1863,18 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "เป้าหมาย"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:563
+#: code:addons/crm/crm_lead.py:579
 #, python-format
 msgid "Merged leads"
-msgstr ""
+msgstr "รวมเป้าหมาย"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "ออกแบบ"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -1873,18 +1886,18 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
-msgstr ""
+msgstr "สิ่งที่จะทำ"
 
 #. module: crm
 #: 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
 msgid "User Email"
-msgstr ""
+msgstr "อีเมลของผู้ใช้"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1897,7 +1910,7 @@ msgstr ""
 #: field:crm.opportunity2phonecall,note:0
 #: field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr ""
+msgstr "บันทึก"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1905,7 +1918,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "ต่ำ"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -1915,7 +1928,7 @@ msgstr ""
 #: selection:crm.lead.report,state:0
 #: field:crm.phonecall,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "ปิดแล้ว"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1934,7 +1947,7 @@ msgstr ""
 #: selection:crm.lead.report,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "รอดำเนินการ"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
@@ -1947,18 +1960,17 @@ msgid "Global CC"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
 msgid "Phone Calls"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "ค้นหาตามสถานะ"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0
@@ -1973,7 +1985,7 @@ msgstr ""
 #: field:crm.phonecall,partner_phone:0
 #: field:crm.phonecall2phonecall,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "โทรศัพท์"
 
 #. module: crm
 #: field:crm.case.channel,active:0
@@ -1981,7 +1993,7 @@ msgstr ""
 #: field:crm.lead,active:0
 #: field:crm.phonecall,active:0
 msgid "Active"
-msgstr ""
+msgstr "เปิดใช้งาน"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -1991,7 +2003,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Mail"
-msgstr ""
+msgstr "ส่งเมล์"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2008,7 +2020,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "ซอฟต์แวร์"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2025,51 +2037,51 @@ msgstr "การวิเคราะห์โอกาส"
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "เบ็ดเตล็ด"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "เปิด"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "จังหวัด"
 
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "ทั้งสองอย่าง"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "โทรแล้ว"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "รับผิดชอบ"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
-msgstr ""
+msgstr "ขายตรง"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "ผลิตภัณฑ์"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "ปีที่สร้าง"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -2086,7 +2098,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "ที่อยู่"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2103,7 +2115,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "ค้นหา"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2116,12 +2128,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "การโทรที่ได้ววางแผนไว้"
 
 #. module: crm
 #: field:crm.lead,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: help:crm.lead,type_id:0
@@ -2143,32 +2155,32 @@ msgstr ""
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "ทำงานต่อ"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: 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
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "มอบหมายถึง"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "การกระทำล่าสุด"
 
 #. module: crm
 #: field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "ระยะเวลา"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2207,17 +2219,17 @@ 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
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "เป้าหมาย / โอกาส"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "แฟกซ์"
 
 #. module: crm
 #: field:crm.lead,company_id:0
@@ -2227,12 +2239,12 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "บริษัท"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr ""
+msgstr "กำลังทำงานอยู่"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
@@ -2242,50 +2254,50 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+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
 msgid "Object Name"
-msgstr ""
+msgstr "ชื่อออปเจ็กต์"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "การโทรที่ได้รับมอบหมาย"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "คืนค่าเดิม"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "บริการหลังการขาย"
 
 #. module: crm
 #: field:crm.case.section,message_ids:0
 #: field:crm.lead,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "ข้อความ"
 
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "ช่องทางการติดต่อ (จดหมาย,โดยตรง,โทรศัพท์,...)"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "สรุปการโทร"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2294,12 +2306,12 @@ msgstr ""
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "ยกเลิกแล้ว"
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "ดัชนีสี"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2318,33 +2330,33 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "สถานะที่เกี่ยวข้อง"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 msgid "Call Summary"
-msgstr ""
+msgstr "สรุปการโทร"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr ""
+msgstr "ผู้ปฏิบัติการ"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "แผน/บันทึกการโทร"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "เลือกเป้าหมาย / โอกาส"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "ยืนยันแล้ว"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner_binding
@@ -2359,17 +2371,17 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Confirm"
-msgstr ""
+msgstr "ยืนยัน"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "ข้อความที่ยังไม่ได้อ่าน"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "หัวข้อ"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2381,7 +2393,7 @@ msgstr ""
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "ผู้ติดตาม"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2404,14 +2416,14 @@ msgstr ""
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "สร้างเป้าหมายจากโทรศัพท์ที่เข้ามา"
 
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "อีเมล"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -2420,19 +2432,19 @@ msgstr ""
 #: view:crm.lead.report:0
 #: field:crm.lead.report,channel_id:0
 msgid "Channel"
-msgstr ""
+msgstr "ช่องทาง"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule Call"
-msgstr ""
+msgstr "แผนการโทร"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "ทีมขายของฉัน"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2446,12 +2458,12 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+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
@@ -2479,7 +2491,7 @@ msgstr ""
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "การคุยสาย"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2489,12 +2501,12 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "การโทรของฉัน"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Qualification"
-msgstr ""
+msgstr "คุณสมบัติ"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -2522,13 +2534,13 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr ""
+msgstr "สิงหาคม"
 
 #. module: crm
 #: 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
@@ -2540,12 +2552,12 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr ""
+msgstr "ธันวาคม"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "วันที่โทร"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2566,7 +2578,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "ตารางเวลาการประชุม"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
@@ -2582,24 +2594,24 @@ msgstr ""
 #: field:crm.lead,date_open:0
 #: field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "เปิดแล้ว"
 
 #. module: crm
 #: view:crm.case.section:0
 #: field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "สมาชิกในทีม"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "ตาราง / บันทึกการโทร"
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "ต้นทุนที่วางแผนไว้"
 
 #. module: crm
 #: help:crm.lead,date_deadline:0
@@ -2618,18 +2630,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "บันทึกการใช้โทรศัพท์"
 
 #. module: crm
 #: 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
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "เรื่องโดยทีมขาย"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2637,12 +2649,12 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
 msgid "Meeting"
-msgstr ""
+msgstr "การประชุม"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "หมวดของเรื่อง"
 
 #. module: crm
 #: view:board.board:0
@@ -2655,17 +2667,17 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "ปกติ"
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "ตำบล"
 
 #. 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
@@ -2676,47 +2688,47 @@ msgstr ""
 #: field:crm.lead.report,user_id:0
 #: field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "ผู้ใช้"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "พฤศจิกายน"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "โอกาสโดยขั้นตอน"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr ""
+msgstr "มกราคม"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "สัญญา"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "โฆษณา Twitter"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "เป้าหมายรายได้"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2737,17 +2749,17 @@ msgstr ""
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "วางแผนการโทร"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Categorization"
-msgstr ""
+msgstr "การจัดประเภท"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
-msgstr ""
+msgstr "บันทึกการโทร"
 
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0
@@ -2758,7 +2770,7 @@ msgstr ""
 #: field:crm.meeting,phonecall_id:0
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "Phonecall"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -2768,12 +2780,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "วันที่สร้าง"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "at"
-msgstr ""
+msgstr "ที่"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -2782,19 +2794,19 @@ msgstr ""
 #: selection:crm.lead,state:0
 #: view:crm.lead.report:0
 msgid "New"
-msgstr ""
+msgstr "ใหม่"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "ฟังก์ชั่น"
 
 #. module: crm
 #: field:crm.case.section,note:0
 #: field:crm.phonecall,description:0
 #: field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+msgstr "รายละเอียด"
 
 #. module: crm
 #: field:crm.case.categ,section_id:0
@@ -2813,14 +2825,14 @@ msgstr ""
 #: field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "ทีมขาย"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "พฤษภาคม"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -2842,27 +2854,27 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "บันทึกภายใน"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "โอกาสใหม่"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "บังคับ / เพิ่มเติม"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "ที่อยู่"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred By"
-msgstr ""
+msgstr "อ้างอิงโดย"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2872,35 +2884,35 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "ชั่วโมงทำงาน"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:968
+#: code:addons/crm/crm_lead.py:986
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
 #: field:crm.partner.binding,partner_id:0
 #, python-format
 msgid "Customer"
-msgstr ""
+msgstr "ลูกค้า"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "กุมภาพันธ์"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "วางแผนการประชุม"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead8
 #: view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "ไม่สำเร็จ"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:89
@@ -2914,7 +2926,7 @@ msgstr ""
 #: view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "ประเทศ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2922,7 +2934,7 @@ msgstr ""
 #: view:crm.lead2opportunity.partner.mass:0
 #: view:crm.phonecall:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "แปลงเป็นโอกาส"
 
 #. module: crm
 #: help:crm.phonecall,email_from:0
@@ -2934,17 +2946,17 @@ msgstr "คนเหล่านี้จะได้รับอีเมล์
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "เมษายน"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "ชื่อแคมเปญ"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "ทำประวัติย่อ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
@@ -2954,7 +2966,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 msgid "Negotiation"
-msgstr ""
+msgstr "กำลังเจรจา"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
@@ -2964,40 +2976,40 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "ลำดับ"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "ตัวแปรควบคุม"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Proposition"
-msgstr ""
+msgstr "ข้อเสนอ"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "การโทร"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "ปี"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+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/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index d7182841d8b..aaac89319a8 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/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-12-19 07:22+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2013-08-06 09:41+0000\n"
+"Last-Translator: fanvil <fanvil@hotmail.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-08-07 04:46+0000\n"
+"X-Generator: Launchpad (build 16721)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -29,7 +29,7 @@ msgid ""
 msgstr "允许你设置接收邮件服务器，并从收到的邮件中创建线索"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:881
+#: code:addons/crm/crm_lead.py:898
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
@@ -54,6 +54,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
@@ -64,7 +69,7 @@ msgstr "动作"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "设置团队 到销售部"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -151,7 +156,7 @@ msgstr "规则名称"
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "每次只能转换一个电话呼叫"
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -180,11 +185,11 @@ msgstr "预计结束月份"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保留复杂的摘要(消息数量,……等)。这一摘要直接是是HTML格式，以便插入到看板视图。"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
-#: code:addons/crm/crm_lead.py:744
+#: code:addons/crm/crm_lead.py:640
+#: code:addons/crm/crm_lead.py:761
 #: code:addons/crm/crm_phonecall.py:280
 #, python-format
 msgid "Warning!"
@@ -232,7 +237,7 @@ msgstr "状态"
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "#会议"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
@@ -252,7 +257,7 @@ msgstr "排除的答案:"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "合并商机"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -265,7 +270,7 @@ msgstr "线索分析"
 #: code:addons/crm/crm_lead.py:1010
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s 一个电话</b> 为了 <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -293,7 +298,7 @@ msgid "Prospect Partner"
 msgstr "潜在业务伙伴"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:982
+#: code:addons/crm/crm_lead.py:1002
 #, python-format
 msgid "No Subject"
 msgstr "无主题"
@@ -323,6 +328,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                         "
+"点击创建新客户分组\n"
+"                                                                </p><p>\n"
+"                                                                         "
+"创建指定的分类用于赋值给你的联系人\n"
+"                                                                         "
+"以便更好管理你和他们的联系。分组工具\n"
+"                                                                         "
+"可以根据你预设的条件给联系人分配组。\n"
+"                                                                </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -445,16 +462,16 @@ msgid "#Opportunities"
 msgstr "#商机"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:624
+#: code:addons/crm/crm_lead.py:640
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
-msgstr ""
+msgstr "请从列表视图中选择一个以上元素（线索或机会）。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
-msgstr ""
+msgstr "分配给我锁管理的某个销售队伍，或给我的线索。"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
@@ -473,6 +490,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                        "
+"点击创建新的销售团队\n"
+"                                                                <p></p>\n"
+"                                                                        "
+"使用销售团队，把不同销售员或部门组织成独立的团队。\n"
+"                                                                        "
+"每个团队会使用自己的商机列表工作。\n"
+"                                                               </p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -511,7 +538,7 @@ msgstr "邮件"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "任务阶段已改变"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -556,6 +583,7 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"当一个案子新建时，状态被设为‘待处理’，当案子进行中，状态被设为‘打开’，当电话结束，状态被设为‘挂起’。如果需要电话，状态设为‘未挂起’"
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
@@ -572,7 +600,7 @@ msgstr "合并"
 #. module: crm
 #: model:email.template,subject:crm.email_template_opportunity_mail
 msgid "Opportunity ${object.name | h})"
-msgstr ""
+msgstr "商机${object.name | h})"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -590,6 +618,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"线索：[[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or "
+"'']]的提醒"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -630,6 +660,13 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                         点击创建新类型\n"
+"                                                </p><p>\n"
+"                                                         "
+"创建指定的电话类型，更好地定义系统中记录的电话类型\n"
+"                                                </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -712,7 +749,7 @@ msgid "Statistics Dashboard"
 msgstr "统计控制台"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:861
+#: code:addons/crm/crm_lead.py:878
 #: model:crm.case.stage,name:crm.stage_lead2
 #: selection:crm.case.stage,type:0
 #: view:crm.lead:0
@@ -738,7 +775,7 @@ msgstr "转为商机"
 #. 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
@@ -759,7 +796,7 @@ msgstr "查询电话访问"
 #: view:crm.lead.report:0
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
-msgstr ""
+msgstr "分配给我所管理的某个销售团队的线索/商机。"
 
 #. module: crm
 #: field:calendar.attendee,categ_id:0
@@ -772,7 +809,7 @@ msgid "Exclusive"
 msgstr "唯一的"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:584
+#: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
 msgstr "发自: %s:%s"
@@ -807,7 +844,7 @@ msgstr "参考2"
 msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
-msgstr ""
+msgstr "在阶段和销售团队之间建立链接。设置后将限制此阶段只能用于被选中的销售团队。"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -866,7 +903,7 @@ msgstr "标记为已赢得"
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "来自USA的线索"
 
 #. module: crm
 #: view:crm.lead:0
@@ -917,7 +954,7 @@ msgstr "参考"
 msgid ""
 "Opportunities that are assigned to either me or one of the sale teams I "
 "manage"
-msgstr ""
+msgstr "分配给我或者我管理的某个销售团队的商机。"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
@@ -940,10 +977,10 @@ msgid "Next Action"
 msgstr "下一动作"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:763
+#: code:addons/crm/crm_lead.py:780
 #, 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
@@ -983,6 +1020,8 @@ msgid ""
 "Allows you to track your customers/suppliers claims and grievances.\n"
 "                    This installs the module crm_claim."
 msgstr ""
+"允许你记录客户/供应商的索赔和抱怨。\n"
+"                                                      将安装crm_claim模块"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -1030,10 +1069,10 @@ msgid "Creation Date"
 msgstr "创建日期"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:698
+#: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
-msgstr ""
+msgstr "线索 <b>已转换成商机</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1094,7 +1133,7 @@ msgstr "删除"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "商机已创建"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1123,6 +1162,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                               点击创建新的商机\n"
+"                                               </p><p>\n"
+"                                               OpenERP帮你记录你的销售管道\n"
+"                                               跟踪潜在销售并更好地预测未来收益\n"
+"                                              </p><p>\n"
+"                                              你可以对商机安排会议或电话，\n"
+"                                              将他们转化成报价单，附上相关\n"
+"                                              文档，跟踪所有的讨论等等。\n"
+"                                              </p>\n"
+"        "
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1186,13 +1236,13 @@ msgstr "如果你勾选了这里，这个阶段会作为每个销售团队的默
 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 ""
+msgstr "此域用于区分用于线索的阶段和用于商机的阶段，或者指示同时可用于两个类型。"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "线索已创建"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1217,7 +1267,9 @@ msgid "Days to Close"
 msgstr "结束日期"
 
 #. module: crm
+#: code:addons/crm/crm_lead.py:1057
 #: field:crm.case.section,complete_name:0
+#, python-format
 msgid "unknown"
 msgstr "未知"
 
@@ -1264,7 +1316,7 @@ msgid ""
 "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 ""
+msgstr "当一个创建时，状态设为‘草稿’。如果此案在进行中，被设为‘打开‘。当案子结束，状态被设为’结束‘。如果需要被审阅，状态被设为’等待‘"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
@@ -1287,7 +1339,7 @@ msgstr "发送邮件的时候，默认的邮件地址来自销售团队。"
 msgid ""
 "Phone Calls Assigned to the current user or with a team having the current "
 "user as team leader"
-msgstr ""
+msgstr "被分配给当前用户或者当前用户领导的销售团队的电话沟通任务。"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1300,7 +1352,7 @@ msgid "Lead Description"
 msgstr "销售线索描述"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:565
+#: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
 msgstr "合并商机"
@@ -1373,7 +1425,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
@@ -1422,7 +1474,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
@@ -1495,7 +1547,7 @@ msgstr "信息和通信历史记录"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "显示国家"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1567,7 +1619,7 @@ msgid ""
 "The status of your document will automatically change 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 ""
+msgstr "文档的状态会根据选中的阶段自动改变。如果一个阶段关联了‘关闭’状态，当文档到达这个阶段就自动被关闭。"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -1588,7 +1640,7 @@ msgstr "通话月份"
 #: code:addons/crm/crm_phonecall.py:290
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "合作伙伴已<b>创建</b>"
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
@@ -1602,6 +1654,7 @@ msgid ""
 "the treatment delays or number of leads per state. You can sort out your "
 "leads analysis by different groups to get accurate grained analysis."
 msgstr ""
+"线索分析允许你检查不同的关联CRM的信息，例如延迟或每个状态的线索的数量。你可以使用不同的分组对线索分析进行整理已获得精确细致的分析结果。"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -1822,7 +1875,7 @@ msgstr "销售团队"
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Default to New Sales Team"
-msgstr ""
+msgstr "默认分配给新建销售团队"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1861,10 +1914,10 @@ msgid "Leads"
 msgstr "线索"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:563
+#: code:addons/crm/crm_lead.py:579
 #, python-format
 msgid "Merged leads"
-msgstr ""
+msgstr "合并的线索"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1887,7 +1940,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
@@ -1955,7 +2008,6 @@ msgid "Global CC"
 msgstr "完整抄送"
 
 #. module: crm
-#: view:crm.lead:0
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
@@ -2089,7 +2141,7 @@ msgstr "转换选项"
 msgid ""
 "Follow this salesteam to automatically track the events associated to users "
 "of this team."
-msgstr ""
+msgstr "跟踪此销售团队，自动跟踪此团队中用户关联的事件。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2101,7 +2153,7 @@ msgstr "地址"
 msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
-msgstr ""
+msgstr "此邮件地址关联此团队。收到的新邮件将自动创建线索并分配给此团队。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2193,13 +2245,24 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                        点击安排一个销售电话\n"
+"                                               </p><p>\n"
+"                                                        "
+"OpenERP允许你容易地定义销售团队要打的\n"
+"                                                        电话并根据跟踪处理。           "
+"                                             \n"
+"                                               </p><p>  \n"
+"                                                        你可以使用导入功能来导入新列表\n"
+"                                                </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.stage,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 ""
+msgstr "此阶段无记录可显示时，在状态栏或看板视图等处不可见。"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2245,7 +2308,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
@@ -2255,7 +2318,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
@@ -2321,7 +2384,7 @@ msgstr "在这报表中，你能分析你的销售团队在电话访问上的业
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Fold by Default"
-msgstr ""
+msgstr "默认折叠"
 
 #. module: crm
 #: field:crm.case.stage,state:0
@@ -2357,7 +2420,7 @@ msgstr "已确认"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner_binding
 msgid "Handle partner binding or generation in CRM wizards."
-msgstr ""
+msgstr "在CRM向导中处理合作伙伴的绑定或生成。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
@@ -2408,11 +2471,23 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                       点击创建一个未验证的线索。\n"
+"                                              </p><p>\n"
+"                                                       如果你在创建一个商机或者客户前\n"
+"                                                       需要验证，使用线索。可以是一张收到的\n"
+"                                                       名片，网站上收到的一个联系方式，或者\n"
+"                                                       你导入系统的一个文件数据。\n"
+"                                               </p><p>\n"
+"                                                        一旦被确定，线索可以被装换成商机\n"
+"                                                        以及/或者你的地址簿中的新客户。\n"
+"                                               </p>\n"
+"        "
 
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "从收到的邮件创建线索"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2480,6 +2555,19 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                        点击创建电话总结\n"
+"                                               </p><p>\n"
+"                                                        OpenERP "
+"允许你快速记录打入的电话，用来\n"
+"                                                        "
+"跟踪与用户沟通的历史，或通知另一个销售团队。\n"
+"                                               </p><p>\n"
+"                                                        "
+"为了跟踪处理一个电话，你可以触发请求另一次电话，\n"
+"                                                        一次会议或者一个商机。\n"
+"                                                </p>\n"
+"        "
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -2526,6 +2614,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                       "
+"点击新建一个销售标签\n"
+"                                                             </p><p>\n"
+"                                                                       "
+"创建指定的适合公司活动的标签\n"
+"                                                                       "
+"用于更好地分析你的线索和商机。\n"
+"                                                                       "
+"标签分类可以反映你的商品结构或者\n"
+"                                                                       "
+"不同的销售类型。\n"
+"                                                            </p>\n"
+"            "
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -2538,7 +2640,7 @@ msgstr "8月"
 #: 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
@@ -2634,7 +2736,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
@@ -2773,7 +2875,7 @@ msgstr "电话访问"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
-msgstr ""
+msgstr "分配给某个我所管理的销售团队的电话。"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2783,7 +2885,7 @@ msgstr "发现日期"
 #. module: crm
 #: view:crm.lead:0
 msgid "at"
-msgstr ""
+msgstr "在"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -2848,6 +2950,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                       "
+"点击定义一个新渠道\n"
+"                                                               </p><p>\n"
+"                                                                        "
+"使用渠道来记录你的线索和商机的来源。\n"
+"                                                                        "
+"主要用于市场工作相关的销售分析报告。\n"
+"                                                               </p><p>\n"
+"                                                                        "
+"渠道例子：公司网站，电话，市场活动，经销商等\n"
+"                                                               <p>\n"
+"            "
 
 #. module: crm
 #: view:crm.lead:0
@@ -2885,7 +3000,7 @@ msgid "Working Hours"
 msgstr "工作时间"
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:968
+#: code:addons/crm/crm_lead.py:986
 #: view:crm.lead:0
 #: field:crm.lead2opportunity.partner,partner_id:0
 #: field:crm.lead2opportunity.partner.mass,partner_id:0
@@ -3007,7 +3122,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
@@ -3021,6 +3136,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                        "
+"点击设置你的线索/商机管道的新阶段。\n"
+"                                                                </p><p>\n"
+"                                                                        "
+"阶段允许销售人员记录特定的线索或商机\n"
+"                                                                        "
+"在销售循环中的位置。\n"
+"                                                                 </p>\n"
+"            "
 
 #~ msgid "My Draft "
 #~ msgstr "我的草稿 "
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index d12facd66a0..ac1e10a84c6 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -19,17 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from openerp import tools
-from .. import crm
-
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
+from openerp.addons.crm import crm
 
 MONTHS = [
     ('01', 'January'),
@@ -66,11 +58,12 @@ class crm_lead_report(osv.osv):
 
         # other date fields
         'create_date': fields.datetime('Create Date', readonly=True),
-        'opening_date': fields.date('Opening Date', readonly=True),
+        'opening_date': fields.date('Assignation Date', readonly=True),
         'date_closed': fields.date('Close Date', readonly=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', readonly=True),
 
         # durations
-        'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
+        'delay_open': fields.float('Delay to Assign',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
         'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
 
@@ -79,7 +72,6 @@ class crm_lead_report(osv.osv):
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
         'channel_id':fields.many2one('crm.case.channel', 'Channel', readonly=True),
         'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
@@ -94,10 +86,7 @@ class crm_lead_report(osv.osv):
             ('opportunity','Opportunity'),
         ],'Type', help="Type is used to separate Leads and Opportunities"),
     }
-    
-    
-    
-    
+
     def init(self, cr):
 
         """
@@ -109,7 +98,6 @@ class crm_lead_report(osv.osv):
             CREATE OR REPLACE VIEW crm_lead_report AS (
                 SELECT
                     id,
-
                     to_char(c.date_deadline, 'YYYY') as deadline_year,
                     to_char(c.date_deadline, 'MM') as deadline_month,
                     to_char(c.date_deadline, 'YYYY-MM-DD') as deadline_day,
@@ -121,7 +109,8 @@ class crm_lead_report(osv.osv):
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
 
-                    c.state,
+                    date_trunc('day',c.date_last_stage_update) as date_last_stage_update,
+
                     c.user_id,
                     c.probability,
                     c.stage_id,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 09853c6379e..95cf1d4b7b0 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -13,7 +13,7 @@
                 <field name="creation_month" invisible="1"/>
                 <field name="creation_day" invisible="1"/>
                 <field name="deadline_month" invisible="1"/>
-                <field name="state"  invisible="1"/>
+                <field name="date_last_stage_update" invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="channel_id" invisible="1"/>
@@ -69,10 +69,12 @@
                     <filter icon="terp-personal" name="lead" string="Lead" domain="[('type','=', 'lead')]" help="Show only lead"/>
                     <filter icon="terp-personal+" string="Opportunity" name="opportunity" domain="[('type','=','opportunity')]" help="Show only opportunity"/>
                     <separator/>
-                    <filter icon="terp-check" string="New" domain="[('state','=','draft')]" help="Leads/Opportunities which are in New state"/>
-                    <filter icon="terp-camera_test" string="Open" domain="[('state','=','open')]" help="Leads/Opportunities which are in open state"/>
-                    <filter icon="gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Leads/Opportunities which are in pending state"/>
-                    <filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]" help="Leads/Opportunities which are in done state"/>
+                    <filter string="New" name="new"
+                            domain="[('probability', '=', 0), ('stage_id.sequence', '=', 1)]"/>
+                    <filter string="Won" name="won"
+                            domain="[('probability', '=', 100), ('stage_id.on_change', '=', 1)]"/>
+                    <filter string="Lost" name="lost"
+                            domain="[('probability', '=', 0), ('stage_id.sequence', '!=', 1)]"/>
                     <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" groups="base.group_multi_salesteams"/>
@@ -120,6 +122,7 @@
                         <separator orientation="vertical" />
                         <filter string="Exp. Closing"  icon="terp-go-month"
                             domain="[]" context="{'group_by':'deadline_month'}"/>
+                        <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" />
                     </group>
                 </search>
             </field>
@@ -131,7 +134,7 @@
             <field name="name">crm.lead.report.tree</field>
             <field name="model">crm.lead.report</field>
             <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " create="false" string="Opportunities Analysis">
+            <tree create="false" string="Opportunities Analysis">
                 <field name="creation_year" invisible="1"/>
                 <field name="creation_month" invisible="1"/>
                 <field name="creation_day" invisible="1"/>
@@ -141,7 +144,6 @@
                 <field name="user_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
-                <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="priority"  invisible="1"/>
                 <field name="type_id" invisible="1"/>
@@ -150,8 +152,9 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
                 <field name="planned_revenue" sum="Planned Revenues"/>
-                <field name="delay_open" sum='Delay to open'/>
+                <field name="delay_open" sum='Delay to Assign'/>
                 <field name="delay_close" sum='Delay to close'/>
+                <field name="date_last_stage_update"/>
                 <field name="delay_expected"/>
                 <field name="probability" widget="progressbar"/>
                 <field name="probable_revenue"/>
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 77195097965..fba095f1174 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -19,16 +19,16 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
 from openerp import tools
-from .. import crm
+from openerp.addons.crm import crm
+from openerp.osv import fields, osv
 
 AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Todo'),
+    ('draft', 'Draft'),
+    ('open', 'Todo'),
     ('cancel', 'Cancelled'),
     ('done', 'Held'),
-    ('pending','Pending')
+    ('pending', 'Pending')
 ]
 
 
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index aa2162d163a..52ecd2d13b3 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -23,7 +23,7 @@
                     <field name="nbr" string="#Phone calls" sum="#Phone calls"/>
                     <field name="duration" avg="Duration"/>
                     <field name="delay_close" avg="Avg Closing Delay"/>
-                    <field name="delay_open" sum='Delay to open'/>
+                    <field name="delay_open" sum='Delay to Assign'/>
               </tree>
             </field>
         </record>
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index f25b1303c02..9cf2dc2088f 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -41,7 +41,7 @@ class res_partner(osv.osv):
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
-            'Leads and Opportunities', domain=[('state','in', ('draft','open','pending'))]),
+            'Leads and Opportunities', domain=[('probability' 'not in', ['0', '100'])]),
         'meeting_ids': fields.many2many('crm.meeting', 'crm_meeting_partner_rel','partner_id', 'meeting_id',
             'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
@@ -56,7 +56,7 @@ class res_partner(osv.osv):
 
         default.update({'opportunity_ids': [], 'meeting_ids' : [], 'phonecall_ids' : []})
 
-        super(res_partner, self).copy(cr, uid, record_id, default, context)
+        return super(res_partner, self).copy(cr, uid, record_id, default, context)
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
         search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
@@ -87,7 +87,6 @@ class res_partner(osv.osv):
                 'probability' : probability,
                 'partner_id' : partner_id,
                 'categ_ids' : categ_ids and categ_ids[0:1] or [],
-                'state' :'draft',
                 'type': 'opportunity'
             }, context=context)
             opportunity_ids[partner_id] = opportunity_id
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index dd6c50dbaba..8b941a395dd 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -2,19 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Add section_id (Sales Team) to res.partner -->
-        <record id="view_partners_form_crm1" model="ir.ui.view">
-                <field name="name">view.res.partner.form.crm.inherited1</field>
-                <field name="model">res.partner</field>
-                <field name="inherit_id" ref="base.view_partner_form"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <field name="user_id" position="after">
-                        <field name="section_id" completion="1" groups="base.group_multi_salesteams"/>
-                    </field>
-                </field>
-        </record>
-
         <!-- open meetings related to given partner -->
         <record id="crm_meeting_partner" model="ir.actions.act_window">
             <field name="name">Meetings</field>
@@ -91,24 +78,31 @@
             </field>
         </record>
 
-
-        <record model="ir.ui.view" id="res_partner_view_buttons">
-            <field name="name">res.partner.view.buttons</field>
+        <!-- Add section_id (SalesTeam) and contextual button on partner form view -->
+        <record id="view_partners_form_crm1" model="ir.ui.view">
+            <field name="name">view.res.partner.form.crm.inherited1</field>
             <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="10"/>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='buttons']" position="inside">
-                    <button type="action"
-                        string="Meetings"
-                        name="%(base_calendar.action_crm_meeting)d"
-                        context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
-                    <button type="action" string="Calls" 
-                        name="%(crm.crm_case_categ_phone_incoming0)d" 
-                        context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
-                    <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
-                        name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
-                </xpath>
+                <data>
+                    <field name="user_id" position="after">
+                        <field name="section_id" completion="1" groups="base.group_multi_salesteams"/>
+                    </field>
+                    <xpath expr="//div[@name='buttons']" position="inside">
+                        <button class="oe_inline" type="action" string="Opportunities"
+                            attrs="{'invisible': [('customer', '=', False)]}"
+                            name="%(crm.crm_case_category_act_oppor11)d"
+                            context="{'search_default_partner_id': active_id}"/>
+                        <button class="oe_inline" type="action"
+                            string="Meetings"
+                            name="%(base_calendar.action_crm_meeting)d"
+                            context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
+                        <button class="oe_inline" type="action" string="Calls" 
+                            name="%(crm.crm_case_categ_phone_incoming0)d" 
+                            context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
+                    </xpath>
+                </data>
             </field>
         </record>
 
diff --git a/addons/crm/html/Stephan-Keller.jpg b/addons/crm/static/description/Stephan-Keller.jpg
similarity index 100%
rename from addons/crm/html/Stephan-Keller.jpg
rename to addons/crm/static/description/Stephan-Keller.jpg
diff --git a/addons/crm/html/claudia-sebastiani.jpg b/addons/crm/static/description/claudia-sebastiani.jpg
similarity index 100%
rename from addons/crm/html/claudia-sebastiani.jpg
rename to addons/crm/static/description/claudia-sebastiani.jpg
diff --git a/addons/crm/html/crm_game.png b/addons/crm/static/description/crm_game.png
similarity index 100%
rename from addons/crm/html/crm_game.png
rename to addons/crm/static/description/crm_game.png
diff --git a/addons/crm/html/crm_game_01.png b/addons/crm/static/description/crm_game_01.png
similarity index 100%
rename from addons/crm/html/crm_game_01.png
rename to addons/crm/static/description/crm_game_01.png
diff --git a/addons/crm/html/crm_game_02.png b/addons/crm/static/description/crm_game_02.png
similarity index 100%
rename from addons/crm/html/crm_game_02.png
rename to addons/crm/static/description/crm_game_02.png
diff --git a/addons/crm/html/crm_game_03.png b/addons/crm/static/description/crm_game_03.png
similarity index 100%
rename from addons/crm/html/crm_game_03.png
rename to addons/crm/static/description/crm_game_03.png
diff --git a/addons/crm/html/crm_linkedin.png b/addons/crm/static/description/crm_linkedin.png
similarity index 100%
rename from addons/crm/html/crm_linkedin.png
rename to addons/crm/static/description/crm_linkedin.png
diff --git a/addons/crm/html/crm_sc_01.jpg b/addons/crm/static/description/crm_sc_01.jpg
similarity index 100%
rename from addons/crm/html/crm_sc_01.jpg
rename to addons/crm/static/description/crm_sc_01.jpg
diff --git a/addons/crm/html/crm_sc_01.png b/addons/crm/static/description/crm_sc_01.png
similarity index 100%
rename from addons/crm/html/crm_sc_01.png
rename to addons/crm/static/description/crm_sc_01.png
diff --git a/addons/crm/html/crm_sc_02.png b/addons/crm/static/description/crm_sc_02.png
similarity index 100%
rename from addons/crm/html/crm_sc_02.png
rename to addons/crm/static/description/crm_sc_02.png
diff --git a/addons/crm/html/crm_sc_04a.png b/addons/crm/static/description/crm_sc_04a.png
similarity index 100%
rename from addons/crm/html/crm_sc_04a.png
rename to addons/crm/static/description/crm_sc_04a.png
diff --git a/addons/crm/html/crm_sc_04b.png b/addons/crm/static/description/crm_sc_04b.png
similarity index 100%
rename from addons/crm/html/crm_sc_04b.png
rename to addons/crm/static/description/crm_sc_04b.png
diff --git a/addons/crm/html/crm_sc_04c.png b/addons/crm/static/description/crm_sc_04c.png
similarity index 100%
rename from addons/crm/html/crm_sc_04c.png
rename to addons/crm/static/description/crm_sc_04c.png
diff --git a/addons/crm/html/crm_sc_04d.png b/addons/crm/static/description/crm_sc_04d.png
similarity index 100%
rename from addons/crm/html/crm_sc_04d.png
rename to addons/crm/static/description/crm_sc_04d.png
diff --git a/addons/crm/html/crm_sc_05.png b/addons/crm/static/description/crm_sc_05.png
similarity index 100%
rename from addons/crm/html/crm_sc_05.png
rename to addons/crm/static/description/crm_sc_05.png
diff --git a/addons/crm/html/crm_sc_06.png b/addons/crm/static/description/crm_sc_06.png
similarity index 100%
rename from addons/crm/html/crm_sc_06.png
rename to addons/crm/static/description/crm_sc_06.png
diff --git a/addons/crm/html/crm_sc_08.png b/addons/crm/static/description/crm_sc_08.png
similarity index 100%
rename from addons/crm/html/crm_sc_08.png
rename to addons/crm/static/description/crm_sc_08.png
diff --git a/addons/crm/html/crm_sc_agenda.png b/addons/crm/static/description/crm_sc_agenda.png
similarity index 100%
rename from addons/crm/html/crm_sc_agenda.png
rename to addons/crm/static/description/crm_sc_agenda.png
diff --git a/addons/crm/html/crm_sc_marketing.png b/addons/crm/static/description/crm_sc_marketing.png
similarity index 100%
rename from addons/crm/html/crm_sc_marketing.png
rename to addons/crm/static/description/crm_sc_marketing.png
diff --git a/addons/crm/static/src/img/icon.png b/addons/crm/static/description/icon.png
similarity index 100%
rename from addons/crm/static/src/img/icon.png
rename to addons/crm/static/description/icon.png
diff --git a/addons/crm/html/index.html b/addons/crm/static/description/index.html
similarity index 98%
rename from addons/crm/html/index.html
rename to addons/crm/static/description/index.html
index 5ae542f5c91..70f52d0ca87 100644
--- a/addons/crm/html/index.html
+++ b/addons/crm/static/description/index.html
@@ -17,7 +17,7 @@
 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>
+                <a href="http://www.openerp.com/start?app=crm" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/crm/test/crm_lead_cancel.yml b/addons/crm/test/crm_lead_cancel.yml
index 8749675bf23..127fe4d6726 100644
--- a/addons/crm/test/crm_lead_cancel.yml
+++ b/addons/crm/test/crm_lead_cancel.yml
@@ -1,40 +1,14 @@
 -
-  I set a new sale team (with Marketing at parent) and I cancel unqualified lead .
+  I set a new sale team (with Marketing at parent) .
 -
   !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.
+  I check unqualified lead .
 -
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_1'))
-    assert lead.stage_id.id == ref('crm.stage_lead7'), "Stage should be 'Dead' and is %s." % (lead.stage_id.name)
-    assert lead.state == 'cancel', "Opportunity is not in 'cancel' state."
-    assert lead.probability == 0.0, 'Opportunity is probably wrong and should be 0.0.'
--
-  I reset cancelled lead into unqualified lead.
--
-  !python {model: crm.lead}: |
-    self.case_reset(cr, uid, [ref("crm_case_1")])
--
-  I check unqualified lead after reset.
--
-  !assert {model: crm.lead, id: crm.crm_case_1, string: Lead is in draft state}:
-    - state == "draft"
--
-  I re-open the lead
--
-  !python {model: crm.lead}: |
-    self.case_open(cr, uid, [ref("crm_case_1")])
--
- I check stage and state of the re-opened lead
--
-  !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm.crm_case_1'))
-    assert lead.stage_id.id == ref('crm.stage_lead2'), "Opportunity stage should be 'Qualification'."
-    assert lead.state == 'open', "Opportunity should be in 'open' state."
+  !assert {model: crm.lead, id: crm.crm_case_1, string: Lead is in new stage}:
+    - stage_id.sequence == 1
 -
   I escalate the lead to parent team.
 -
diff --git a/addons/crm/test/crm_lead_find_stage.yml b/addons/crm/test/crm_lead_find_stage.yml
new file mode 100644
index 00000000000..b8a11a4af9e
--- /dev/null
+++ b/addons/crm/test/crm_lead_find_stage.yml
@@ -0,0 +1,43 @@
+-
+  I create a new lead.
+-
+  !record {model: crm.lead, id: test_crm_lead_new}:
+    type: 'lead'
+    name: 'Test lead new'
+    partner_id: base.res_partner_1
+    description: This is the description of the test new lead.
+    section_id: crm.section_sales_department
+-
+  I check default stage of lead.
+-
+  !python {model: crm.lead}: |
+    stage = self.pool.get('crm.case.stage').search_read(cr,uid,[('sequence','=',1)],['id'],context)[0]
+    lead = self.browse(cr, uid, ref('test_crm_lead_new'))
+    stage_id = self.stage_find(cr, uid , [lead], lead.section_id.id or False,[], context)
+    assert stage_id == stage['id'], "Default stage of lead is incorrect!"
+-
+  I change type from lead to opportunity.
+-
+  !python {model: crm.lead}: |
+    self.convert_opportunity(cr, uid ,[ref("test_crm_lead_new")], ref("base.res_partner_2"))
+-
+  Now I check default stage after change type.
+-
+  !python {model: crm.lead}: |
+    stage = self.pool.get('crm.case.stage').search_read(cr,uid,[('sequence','=',1)],['id'],context)[0]
+    opp = self.browse(cr, uid, ref('test_crm_lead_new'))
+    stage_id = self.stage_find(cr, uid , [opp], opp.section_id.id or False,[], context)
+    assert stage_id == stage['id'], "Default stage of opportunity is incorrect!"
+-
+  Now I change the stage of opportunity to won.
+-
+  !python {model: crm.lead}: |
+    self.case_mark_won(cr, uid, [ref("test_crm_lead_new")])
+-
+  I check statge of opp should won, after change stage.
+-
+  !python {model: crm.lead}: |
+    opp = self.browse(cr, uid, ref('test_crm_lead_new'))
+    stage_id = self.stage_find(cr, uid , [opp], opp.section_id.id or False,[('probability','=',100.0)], context)
+    assert stage_id == opp.stage_id.id, "Stage of opportunity is incorrect!"
+
diff --git a/addons/crm/test/crm_lead_merge.yml b/addons/crm/test/crm_lead_merge.yml
index b14f9272df9..fb166e0486f 100644
--- a/addons/crm/test/crm_lead_merge.yml
+++ b/addons/crm/test/crm_lead_merge.yml
@@ -2,29 +2,29 @@
 -
   During a mixed merge (involving leads and opps), data should be handled a certain way following their type (m2o, m2m, text, ...)  Start by creating two leads and an opp.
 -
-  !record {model: crm.lead, id: test_crm_lead_01}:
-    type: 'lead'
-    name: 'Test lead 1'
-    partner_id: base.res_partner_1
-    stage_id: stage_lead1
-    description: This is the description of the test lead 1.
--
-  !record {model: crm.lead, id: test_crm_lead_02}:
-    type: 'lead'
-    name: 'Test lead 2'
-    partner_id: base.res_partner_3
-    stage_id: stage_lead1
-    description: This is the description of the test lead 2.
--
-  !record {model: crm.lead, id: test_crm_opp_01}:
+  !record {model: crm.lead, id: test_crm_opp_1}:
     type: 'opportunity'
     name: 'Test opportunity 1'
     partner_id: base.res_partner_5
     stage_id: stage_lead1
     description: This is the description of the test opp 1.
+-
+  !record {model: crm.lead, id: test_crm_lead_first}:
+    type: 'lead'
+    name: 'Test lead first'
+    partner_id: base.res_partner_1
+    stage_id: stage_lead1
+    description: This is the description of the test lead first.
+-
+  !record {model: crm.lead, id: test_crm_lead_second}:
+    type: 'lead'
+    name: 'Test lead second'
+    partner_id: base.res_partner_1
+    stage_id: stage_lead1
+    description: This is the description of the test lead second.
 -
   !python {model: crm.lead}: |
-    lead_ids = [ref('test_crm_lead_01'), ref('test_crm_lead_02'), ref('test_crm_opp_01')]
+    lead_ids = [ref('test_crm_opp_1'), ref('test_crm_lead_first'), ref('test_crm_lead_second')]
     context.update({'active_model': 'crm.lead', 'active_ids': lead_ids, 'active_id': lead_ids[0]})
 -
   I create a merge wizard and merge the leads and opp together in the first item of the list.
@@ -38,18 +38,19 @@
 -
   !python {model: crm.lead}: |
     merge_id = self.search(cr, uid, [('name', '=', 'Test opportunity 1'), ('partner_id','=', ref("base.res_partner_5"))])
+    
     assert merge_id, 'Fail to create merge opportunity wizard'
     merge_result = self.browse(cr, uid, merge_id)[0]
-    assert merge_result.description == 'This is the description of the test opp 1.\n\nThis is the description of the test lead 1.\n\nThis is the description of the test lead 2.', 'Description mismatch: when merging leads/opps with different text values, these values should get concatenated and separated with line returns'
+    assert merge_result.description == 'This is the description of the test opp 1.\n\nThis is the description of the test lead first.\n\nThis is the description of the test lead second.', 'Description mismatch: when merging leads/opps with different text values, these values should get concatenated and separated with line returns'
     assert merge_result.type == 'opportunity', 'Type mismatch: when at least one opp in involved in the merge, the result should be a new opp (instead of %s)' % merge_result.type
 -
   The other (tailing) leads/opps shouldn't exist anymore.
 -
   !python {model: crm.lead}: |
-    tailing_lead = self.search(cr, uid, [('id', '=', ref('test_crm_lead_01'))])
-    assert not tailing_lead, 'This tailing lead (id %s) should not exist anymore' % ref('test_crm_lead_02')
+    tailing_lead = self.search(cr, uid, [('id', '=', ref('test_crm_lead_first'))])
+    assert not tailing_lead, 'This tailing lead (id %s) should not exist anymore' % ref('test_crm_lead_second')
 
-    tailing_opp = self.search(cr, uid, [('id', '=', ref('test_crm_lead_02'))])
+    tailing_opp = self.search(cr, uid, [('id', '=', ref('test_crm_lead_second'))])
     assert not tailing_opp, 'This tailing opp (id %s) should not exist anymore' % ref('test_crm_opp_01')
 -
   I want to test leads merge.  Start by creating two leads (with the same partner).
@@ -122,4 +123,4 @@
     assert merge_result.partner_id.id == ref("base.res_partner_5"), 'Partner mismatch'
     assert merge_result.type == 'opportunity', 'Type mismatch: when opps get merged together, the result should be a new opp (instead of %s)' % merge_result.type
     tailing_opp = self.search(cr, uid, [('id', '=', ref('test_crm_opp_03'))])
-    assert not tailing_opp, 'This tailing opp (id %s) should not exist anymore' % ref('test_crm_opp_03')
\ No newline at end of file
+    assert not tailing_opp, 'This tailing opp (id %s) should not exist anymore' % ref('test_crm_opp_03')
diff --git a/addons/crm/test/crm_lead_onchange.yml b/addons/crm/test/crm_lead_onchange.yml
index 9154ffdf513..d4843ec57e4 100644
--- a/addons/crm/test/crm_lead_onchange.yml
+++ b/addons/crm/test/crm_lead_onchange.yml
@@ -6,23 +6,17 @@
     partner_id: base.res_partner_2
     type: opportunity
     stage_id: crm.stage_lead1
-    state: draft
 -
   I create a lead record to call a mailing opt-out onchange method.
 -
   !record {model: crm.lead, id: crm_case_18}:
     name: 'Need 20 Days of Consultancy'
     type: opportunity
-    state: draft
+    stage_id: crm.stage_lead1
     opt_out: True
 -
   I create a phonecall record to call a partner onchange method.
 -
   !record {model: crm.phonecall, id: crm_phonecall_5}:
     name: 'Bad time'
-    partner_id: base.res_partner_5
--
-  I set the next stage to "New" for the lead.
--
-  !python {model: crm.lead}: |
-    self.stage_next(cr, uid, [ref("crm_case_4")], context={'stage_type': 'lead'})
+    partner_id: base.res_partner_5
\ No newline at end of file
diff --git a/addons/crm/test/lead2opportunity2win.yml b/addons/crm/test/lead2opportunity2win.yml
index 94e7149ef77..a2499cf4aa9 100644
--- a/addons/crm/test/lead2opportunity2win.yml
+++ b/addons/crm/test/lead2opportunity2win.yml
@@ -1,25 +1,25 @@
 -
   In order to test the conversion of a lead into a opportunity,
 -
-  I open a lead.
+  I set lead to open stage.
 -
    !python {model: crm.lead}: |
-     self.case_open(cr, uid, [ref("crm_case_4")])
+     self.write(cr, uid, [ref("crm_case_3")],{'stage_id':ref("stage_lead1")})
 -
-  I check if the lead state is "Open".
+  I check if the lead stage is "Open".
 -
-  !assert {model: crm.lead, id: crm.crm_case_4, string: Lead state is Open}:
-     - state == "open"
+  !assert {model: crm.lead, id: crm.crm_case_3, string: Lead stage is Open}:
+     - stage_id.sequence == 1
 -
   I convert lead into opportunity for exiting customer.
 -
   !python {model: crm.lead}: |
-    self.convert_opportunity(cr, uid ,[ref("crm_case_4")], ref("base.res_partner_2"))
+    self.convert_opportunity(cr, uid ,[ref("crm_case_3")], ref("base.res_partner_2"))
 -
   I check details of converted opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_4'))
+    lead = self.browse(cr, uid, ref('crm_case_3'))
     assert lead.type == 'opportunity', 'Lead is not converted to opportunity!'
     assert lead.partner_id.id == ref("base.res_partner_2"), 'Partner mismatch!'
     assert lead.stage_id.id == ref("stage_lead1"), 'Stage of opportunity is incorrect!'
@@ -28,7 +28,7 @@
 -
   !python {model: crm.opportunity2phonecall}: |
     import time
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_4')]})
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_3')]})
     call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'name': "Bonjour M. Jean, Comment allez-vous? J'ai bien reçu votre demande, pourrions-nous en parler quelques minutes?"}, context=context)
     self.action_schedule(cr, uid, [call_id], context=context)
@@ -36,46 +36,46 @@
   I check that phonecall is scheduled for that opportunity.
 -
   !python {model: crm.phonecall}: |
-    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_4'))])
+    ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_3'))])
     assert len(ids), 'Phonecall is not scheduled'
 -
   Now I schedule meeting with customer.
 -
   !python {model: crm.lead}: |
-    self.action_makeMeeting(cr, uid, [ref('crm_case_4')])
+    self.action_makeMeeting(cr, uid, [ref('crm_case_3')])
 -
   After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.lead}: |
-    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
+    self.message_post(cr, uid, [ref('crm_case_3')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -
   !python {model: crm.lead}: |
-    self.case_mark_won(cr, uid, [ref("crm_case_4")])
+    self.case_mark_won(cr, uid, [ref("crm_case_3")])
 -
   I check details of the opportunity after having won the opportunity.
 -
   !python {model: crm.lead}: |
-    lead = self.browse(cr, uid, ref('crm_case_4'))
+    lead = self.browse(cr, uid, ref('crm_case_3'))
     assert lead.stage_id.id == ref('crm.stage_lead6'), "Opportunity stage should be 'Won'."
-    assert lead.state == 'done', "Opportunity is not in 'done' state!"
+    assert lead.stage_id.probability == 100.0, "Opportunity is not 'done'"
     assert lead.probability == 100.0, "Revenue probability should be 100.0!"
 -
   I convert mass lead into opportunity customer.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_11")})
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_13"), ref("crm_case_2")], 'active_id': ref("crm_case_13")})
     id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('base.user_root')])], 'section_id': ref('crm.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
   Now I check first lead converted on opportunity.
 -
   !python {model: crm.lead}: |
-    opp = self.browse(cr, uid, ref('crm_case_11'))
-    assert opp.name == "Need estimated cost for new project", "Opportunity name not correct"
+    opp = self.browse(cr, uid, ref('crm_case_13'))
+    assert opp.name == "Plan to buy 60 keyboards and mouses", "Opportunity name not correct"
     assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
-    expected_partner = "Thomas Passot"
+    expected_partner = "Will McEncroe"
     assert opp.partner_id.name == expected_partner, 'Partner mismatch! %s vs %s' % (opp.partner_id.name, expected_partner)
     assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -
@@ -96,15 +96,15 @@
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_2'))
-    assert lead.stage_id.id == ref('crm.stage_lead8'), "Opportunity stage should be 'Lost'."
-    assert lead.state == 'cancel', "Lost opportunity is not in 'cancel' state!"
+    assert lead.stage_id.id == ref('crm.stage_lead7'), "Opportunity stage should be 'Lost'."
+    assert lead.stage_id.sequence != 1 and lead.stage_id.probability == 0.0, "Lost opportunity is not in 'cancel' state!"
     assert lead.probability == 0.0, "Revenue probability should be 0.0!"
 -
   I confirm review needs meeting.
 -
   !python {model: crm.meeting}: |
     context.update({'active_model': 'crm.meeting'})
-    self.case_open(cr, uid, [ref('base_calendar.crm_meeting_4')])
+    self.write(cr, uid, [ref('base_calendar.crm_meeting_4')], {'state': 'open'})
 -
   I invite a user for meeting.
 -
diff --git a/addons/crm/test/phonecalls.yml b/addons/crm/test/phonecalls.yml
index 51a933f3223..b1ea184f59b 100644
--- a/addons/crm/test/phonecalls.yml
+++ b/addons/crm/test/phonecalls.yml
@@ -10,43 +10,3 @@
 -
   !python {model: crm.phonecall}: |
     self.action_make_meeting(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I set the phone call to not held.
--
-  !python {model: crm.phonecall}: |
-    self.case_pending(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Not Held' state.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call held.}:
-    - state == "pending"
--
-  I cancel the phone call.
--
-  !python {model: crm.phonecall}: |
-    self.case_cancel(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Cancelled' state.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not cancelled.}:
-    - state == "cancel"
--
-  I reset the phone call.
--
-  !python {model: crm.phonecall}: |
-    self.case_reset(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is reset.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not reset.}:
-    - state == "open"
--
-  I set phone call to held (done).
--
-  !python {model: crm.phonecall}: |
-    self.case_close(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Held' state.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not held.}:
-    - state == "done"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index e67b7c0c7be..d954e0486cc 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -21,7 +21,6 @@
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
-from openerp import tools
 import re
 
 class crm_lead2opportunity_partner(osv.osv_memory):
@@ -35,6 +34,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                 ('merge', 'Merge with existing opportunities')
             ], 'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities'),
+        'user_id': fields.many2one('res.users', 'Salesperson', select=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True),
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -58,11 +59,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
             if partner_id:
                 # Search for opportunities that have the same partner and that arent done or cancelled
-                ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('state', '!=', 'done')])
+                ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id),  ('probability', '<', '100')])
                 for id in ids:
                     tomerge.add(id)
             if email:
-                ids = lead_obj.search(cr, uid, [('email_from', 'ilike', email[0]), ('state', '!=', 'done')])
+                ids = lead_obj.search(cr, uid, [('email_from', 'ilike', email[0]),  ('probability', '<', '100')])
                 for id in ids:
                     tomerge.add(id)
 
@@ -74,9 +75,27 @@ class crm_lead2opportunity_partner(osv.osv_memory):
                 res.update({'name' : len(tomerge) >= 2 and 'merge' or 'convert'})
             if 'opportunity_ids' in fields and len(tomerge) >= 2:
                 res.update({'opportunity_ids': list(tomerge)})
-
+            if lead.user_id:
+                res.update({'user_id': lead.user_id.id})
+            if lead.section_id:
+                res.update({'section_id': lead.section_id.id})
         return res
 
+    def on_change_user(self, cr, uid, ids, user_id, section_id, context=None):
+        """ When changing the user, also set a section_id or restrict section id
+            to the ones user_id is member of. """
+        if user_id:
+            if section_id:
+                user_in_section = self.pool.get('crm.case.section').search(cr, uid, [('id', '=', section_id), '|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context, count=True)
+            else:
+                user_in_section = False
+            if not user_in_section:
+                section_id = False
+                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 view_init(self, cr, uid, fields, context=None):
         """
         Check some preconditions before the wizard executes.
@@ -85,8 +104,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             context = {}
         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."))
+            if lead.probability == 100:
+                raise osv.except_osv(_("Warning!"), _("Closed/Dead leads cannot be converted into opportunities."))
         return False
 
     def _convert_opportunity(self, cr, uid, ids, vals, context=None):
@@ -118,15 +137,15 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         w = self.browse(cr, uid, ids, context=context)[0]
         opp_ids = [o.id for o in w.opportunity_ids]
         if w.name == 'merge':
-            lead_id = self.pool.get('crm.lead').merge_opportunity(cr, uid, opp_ids, context=context)
+            lead_id = self.pool.get('crm.lead').merge_opportunity(cr, uid, opp_ids, w.user_id.id, w.section_id.id, context=context)
             lead_ids = [lead_id]
             lead = self.pool.get('crm.lead').read(cr, uid, lead_id, ['type'], context=context)
             if lead['type'] == "lead":
                 context.update({'active_ids': lead_ids})
-                self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
+                self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context)
         else:
             lead_ids = context.get('active_ids', [])
-            self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
+            self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids, 'user_ids': [w.user_id.id], 'section_id': w.section_id.id}, context=context)
 
         return self.pool.get('crm.lead').redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 4093df910d0..4f6522c27de 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -10,6 +10,10 @@
                     <group name="name">
                         <field name="name" class="oe_inline"/>
                     </group>
+                    <group string="Assign opportunities to">
+                        <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, section_id, context)"/>
+                        <field name="section_id" class="oe_inline"/>
+                    </group>
                     <group string="Opportunities">
                         <field name="opportunity_ids" attrs="{'invisible': [('name', '!=', 'merge')]}" nolabel="1">
                             <tree>
@@ -56,6 +60,10 @@
                             attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
                             class="oe_inline"/>
                     </group>
+                    <group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
+                        <field name="section_id" groups="base.group_multi_salesteams"/>
+                        <field name="user_ids" widget="many2many_tags"/>
+                    </group>
                     <group string="Select Opportunities" attrs="{'invisible': [('name', '!=', 'merge')]}">
                         <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
                             <tree>
@@ -72,12 +80,6 @@
                             </tree>
                         </field>
                     </group>
-
-                    <group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
-                        <field name="section_id" groups="base.group_multi_salesteams"/>
-                        <field name="user_ids" widget="many2many_tags"/>
-                    </group>
-
                     <footer>
                         <button name="mass_convert" string="Convert to Opportunities" type="object" class="oe_highlight"/>
                         or
@@ -102,7 +104,9 @@
             res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
-            view_id="view_crm_lead2opportunity_partner_mass"/>
+            view_id="view_crm_lead2opportunity_partner_mass"
+            groups="base.group_sale_salesman"
+        />
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 8b78c039007..289266bfad3 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -34,6 +34,8 @@ class crm_merge_opportunity(osv.osv_memory):
     _description = 'Merge opportunities'
     _columns = {
         'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'),
+        'user_id': fields.many2one('res.users', 'Salesperson', select=True),
+        'section_id': fields.many2one('crm.case.section', 'Sales Team', select=True),
     }
 
     def action_merge(self, cr, uid, ids, context=None):
@@ -47,7 +49,7 @@ class crm_merge_opportunity(osv.osv_memory):
         #TODO: why is this passed through the context ?
         context['lead_ids'] = [opportunity2merge_ids[0].id]
 
-        merge_id = lead_obj.merge_opportunity(cr, uid, [x.id for x in opportunity2merge_ids], context=context)
+        merge_id = lead_obj.merge_opportunity(cr, uid, [x.id for x in opportunity2merge_ids], wizard.user_id.id, wizard.section_id.id, context=context)
 
         # The newly created lead might be a lead or an opp: redirect toward the right view
         merge_result = lead_obj.browse(cr, uid, merge_id, context=context)
@@ -60,8 +62,7 @@ class crm_merge_opportunity(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         """
         Use active_ids from the context to fetch the leads/opps to merge.
-        In order to get merged, these leads/opps can't be in 'Done' or
-        'Cancel' state.
+        In order to get merged, these leads/opps can't be in 'Dead' or 'Closed'
         """
         if context is None:
             context = {}
@@ -72,11 +73,26 @@ class crm_merge_opportunity(osv.osv_memory):
             opp_ids = []
             opps = self.pool.get('crm.lead').browse(cr, uid, record_ids, context=context)
             for opp in opps:
-                if opp.state not in ('done', 'cancel'):
+                if opp.probability < 100:
                     opp_ids.append(opp.id)
             if 'opportunity_ids' in fields:
                 res.update({'opportunity_ids': opp_ids})
 
         return res
 
+    def on_change_user(self, cr, uid, ids, user_id, section_id, context=None):
+        """ When changing the user, also set a section_id or restrict section id
+            to the ones user_id is member of. """
+        if user_id:
+            if section_id:
+                user_in_section = self.pool.get('crm.case.section').search(cr, uid, [('id', '=', section_id), '|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], context=context, count=True)
+            else:
+                user_in_section = False
+            if not user_in_section:
+                section_id = False
+                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}}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 919d83cb9a7..d43993b8389 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -8,20 +8,25 @@
             <field name="model">crm.merge.opportunity</field>
             <field name="arch" type="xml">
                 <form string="Merge Leads/Opportunities" version="7.0">
-                    <separator string="Select Leads/Opportunities"/>
-                    <field name="opportunity_ids">
-                        <tree>
-                            <field name="create_date"/>
-                            <field name="name"/>
-                            <field name="type"/>
-                            <field name="contact_name"/>
-                            <field name="email_from"/>
-                            <field name="phone"/>
-                            <field name="stage_id"/>
-                            <field name="user_id"/>
-                            <field name="section_id" groups="base.group_multi_salesteams"/>
-                        </tree>
-                    </field>
+                    <group string="Assign opportunities to">
+                        <field name="user_id" class="oe_inline" on_change="on_change_user(user_id, context)"/>
+                        <field name="section_id" class="oe_inline"/>
+                    </group>
+                    <group string="Select Leads/Opportunities">
+                        <field name="opportunity_ids" nolabel="1">
+                            <tree>
+                                <field name="create_date"/>
+                                <field name="name"/>
+                                <field name="type"/>
+                                <field name="contact_name"/>
+                                <field name="email_from"/>
+                                <field name="phone"/>
+                                <field name="stage_id"/>
+                                <field name="user_id"/>
+                                <field name="section_id" groups="base.group_multi_salesteams"/>
+                            </tree>
+                        </field>
+                    </group>
                     <footer>
                         <button name="action_merge" type="object" string="Merge" class="oe_highlight"/>
                         or
@@ -45,7 +50,9 @@
             multi="True"
             key2="client_action_multi" name="Merge leads/opportunities"
             res_model="crm.merge.opportunity" src_model="crm.lead"
-            view_mode="form" target="new" view_type="form"/>
+            view_mode="form" target="new" view_type="form"
+            groups="base.group_sale_salesman"
+            />
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 61257265f1b..eaec2e4fc2b 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -42,14 +42,20 @@ automatically new claims based on incoming emails.
         'security/ir.model.access.csv',
         'report/crm_claim_report_view.xml',
         'crm_claim_data.xml',
+        'res_partner_view.xml',
     ],
     'demo': ['crm_claim_demo.xml'],
-    'test': ['test/process/claim.yml',
-             'test/ui/claim_demo.yml'
+    'test': [
+        'test/process/claim.yml',
+        'test/ui/claim_demo.yml'
     ],
     'installable': True,
     'auto_install': False,
-    'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'],
+    'images': [
+        'images/claim_categories.jpeg',
+        'images/claim_stages.jpeg',
+        'images/claims.jpeg'
+    ],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 774571b0314..c655ce2c12b 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -19,20 +19,12 @@
 #
 ##############################################################################
 
-from openerp.addons.base_status.base_stage import base_stage
-import binascii
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
-import time
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-CRM_CLAIM_PENDING_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
 class crm_claim_stage(osv.osv):
     """ Model for claim stages. This models the main stages of a claim
@@ -50,9 +42,6 @@ class crm_claim_stage(osv.osv):
         'sequence': fields.integer('Sequence', help="Used to order stages. Lower is better."),
         'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
-        'state': fields.selection(crm.AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it will be automatically have the 'closed' status."),
-        'case_refused': fields.boolean('Refused stage',
-                        help='Refused stages are specific stages for done.'),
         'case_default': fields.boolean('Common to All Teams',
                         help="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."),
         'fold': fields.boolean('Hide in Views when Empty',
@@ -61,12 +50,10 @@ class crm_claim_stage(osv.osv):
 
     _defaults = {
         'sequence': lambda *args: 1,
-        'state': 'draft',
         'fold': False,
-        'case_refused': False,
     }
 
-class crm_claim(base_stage, osv.osv):
+class crm_claim(osv.osv):
     """ Crm claim
     """
     _name = "crm.claim"
@@ -74,6 +61,15 @@ class crm_claim(base_stage, osv.osv):
     _order = "priority,date desc"
     _inherit = ['mail.thread']
 
+    def _get_default_section_id(self, cr, uid, context=None):
+        """ Gives default section by checking if present in the context """
+        return self.pool.get('crm.lead')._resolve_section_id_from_context(cr, uid, context=context) or False
+
+    def _get_default_stage_id(self, cr, uid, context=None):
+        """ Gives default stage_id """
+        section_id = self._get_default_section_id(cr, uid, context=context)
+        return self.stage_find(cr, uid, [], section_id, [('sequence', '=', '1')], context=context)
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
@@ -107,25 +103,16 @@ class crm_claim(base_stage, osv.osv):
         'stage_id': fields.many2one ('crm.claim.stage', 'Stage', track_visibility='onchange',
                 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,
-                help='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\'.'),
     }
 
     _defaults = {
-        'user_id':  lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'partner_id':  lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
-        'date': fields.datetime.now,
+        'date': fields.datetime.now(),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
         'active': lambda *a: 1,
-        'stage_id':lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
+        'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
     }
 
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
@@ -158,27 +145,24 @@ class crm_claim(base_stage, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_refuse(self, cr, uid, ids, context=None):
-        """ Mark the case as refused: state=done and case_refused=True """
-        for lead in self.browse(cr, uid, ids):
-            stage_id = self.stage_find(cr, uid, [lead], lead.section_id.id or False, ['&', ('state', '=', 'done'), ('case_refused', '=', True)], context=context)
-            if stage_id:
-                self.case_set(cr, uid, [lead.id], values_to_update={}, new_stage_id=stage_id, context=context)
-        return True
-
-    def onchange_partner_id(self, cr, uid, ids, part, email=False):
+    def onchange_partner_id(self, cr, uid, ids, partner_id, email=False, context=None):
         """This function returns value of partner address based on partner
-           :param part: Partner's id
            :param email: ignored
         """
-        if not part:
-            return {'value': {'email_from': False,
-                              'partner_phone': False
-                            }
-                   }
-        address = self.pool.get('res.partner').browse(cr, uid, part)
+        if not partner_id:
+            return {'value': {'email_from': False, 'partner_phone': False}}
+        address = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         return {'value': {'email_from': address.email, 'partner_phone': address.phone}}
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('section_id') and not context.get('default_section_id'):
+            context['default_section_id'] = vals.get('section_id')
+
+        # context: no_log, because subtype already handle this
+        return super(crm_claim, self).create(cr, uid, vals, context=context)
+
     # -------------------------------------------------------
     # Mail gateway
     # -------------------------------------------------------
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index ed0558f72e9..d897fe2bcb3 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -44,28 +44,23 @@
         
         <record model="crm.claim.stage" id="stage_claim1">
             <field name="name">New</field>
-            <field name="state">draft</field>
-            <field name="sequence">26</field>
+            <field name="sequence">1</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim5">
             <field name="name">In Progress</field>
-            <field name="state">open</field>
             <field name="sequence">27</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim2">
             <field name="name">Settled</field>
-            <field name="state">done</field>
             <field name="sequence">28</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim3">
             <field name="name">Rejected</field>
-            <field name="state">cancel</field>
             <field name="sequence">29</field>
             <field name="case_default" eval="True"/>
-            <field name="case_refused" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
         
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 5abfcabbc71..59ec2acac2f 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -15,7 +15,11 @@
             <field name="view_id" ref="crm_case_claims_tree_view"/>
             <field name="context">{"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
-            <field name="help">Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Record and track your customers' claims. Claims may be linked to a sales order or a lot.You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on).Claims may automatically be linked to an email address using the mail gateway module.
+                </p>
+            </field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim0">
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index e295bfdd250..5b7e924c205 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -38,7 +38,6 @@
                 <tree string="Claim Stages">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -51,8 +50,6 @@
                     <field name="name"/>
                     <field name="case_default"/>
                     <field name="sequence"/>
-                    <field name="state"/>
-                    <field name="case_refused"/>
                     <field name="fold"/>
                 </form>
             </field>
@@ -80,7 +77,7 @@
             <field name="name">CRM - Claims Tree</field>
             <field name="model">crm.claim</field>
             <field name="arch" type="xml">
-                <tree string="Claims" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Claims">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -91,7 +88,6 @@
                     <field name="categ_id" string="Type"/>
                     <field name="date_deadline" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
-                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -102,10 +98,6 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <button name="case_close" string="Settle" type="object" class="oe_highlight"
-                            states="draft,open,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Reject" type="object" groups="base.group_user"
-                            states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Claims">
@@ -118,7 +110,6 @@
                         <field name="priority"/>
                         <field name="section_id" groups="base.group_multi_salesteams"/>
                         <field name="date_deadline"/>
-                        <field name="state" groups="base.group_no_one"/>
                     </group>
                     <group colspan="4" col="4">
                         <notebook>
@@ -196,9 +187,6 @@
             <field name="arch" type="xml">
                 <search string="Search Claims">
                     <field name="name" string="Claims"/>
-                    <filter icon="terp-check" string="New" name="current" domain="[('state','=','draft')]" help="New Claims"/>
-                    <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="In Progress Claims"/>
-                    <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" filter_domain="[('partner_id','child_of',self)]"/>
@@ -208,7 +196,6 @@
                         <filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
                         <filter string="Claim Date" icon="terp-go-month" domain="[]" help="Claim Date" context="{'group_by':'date'}"/>
                         <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Closure" icon="terp-go-month" domain="[]" help="Date Closed" context="{'group_by':'date_closed'}"  groups="base.group_no_one"/>
@@ -216,35 +203,5 @@
                 </search>
             </field>
         </record>
-
-        <record id="view_claim_partner_info_form1" model="ir.ui.view">
-            <field name="name">res.partner.claim.info.form</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_claim" string="Claims">
-                        <field name="claims_ids" colspan="4" nolabel="1">
-                            <tree string="Partners Claim" editable="bottom">
-                                <field name="name"/>
-                            </tree>
-                        </field>
-                    </group>
-                </xpath>
-            </field>
-        </record>
-
-        <act_window
-            context="{'search_default_partner_id': [active_id], 'default_partner_id': active_id}"
-            id="act_claim_partner"
-            name="Claims"
-            view_mode="tree,form"
-            res_model="crm.claim"
-            src_model="res.partner"/>
-
      </data>
 </openerp>
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index 2ed87505d9c..d389f690fb4 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -22,14 +22,6 @@
 from openerp.osv import fields,osv
 from openerp import tools
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
-
 AVAILABLE_PRIORITIES = [
     ('5', 'Lowest'),
     ('4', 'Low'),
@@ -51,7 +43,6 @@ class crm_claim_report(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
         'nbr': fields.integer('# of Cases', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -92,7 +83,6 @@ class crm_claim_report(osv.osv):
                     to_char(c.date, 'YYYY-MM-DD') as day,
                     to_char(c.date_closed, 'YYYY-MM-DD') as date_closed,
                     to_char(c.date_deadline, 'YYYY-MM-DD') as date_deadline,
-                    c.state,
                     c.user_id,
                     c.stage_id,
                     c.section_id,
@@ -109,7 +99,7 @@ class crm_claim_report(osv.osv):
                 from
                     crm_claim c
                 group by to_char(c.date, 'YYYY'), to_char(c.date, 'MM'),to_char(c.date, 'YYYY-MM-DD'),\
-                        c.state, c.user_id,c.section_id, c.stage_id,\
+                        c.user_id,c.section_id, c.stage_id,\
                         c.categ_id,c.partner_id,c.company_id,c.create_date,
                         c.priority,c.type_action,c.date_deadline,c.date_closed,c.id
             )""")
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index bae02ef8c0c..2d0787ca527 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -21,7 +21,6 @@
                     <field name="email" sum="# Mails"/>
                     <field name="delay_close" avg="Avg Closing Delay"/>
                     <field name="delay_expected"/>
-                    <field name="state" invisible="1"/>
                     <field name="stage_id" invisible="1"/>
                     <field name="categ_id" invisible="1"/>
                     <field name="priority" invisible="1"/>
@@ -37,7 +36,6 @@
             <field name="model">crm.claim.report</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Claims" type="bar">
-                    <field name="state"/>
                     <field name="nbr" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -51,10 +49,6 @@
             <field name="model">crm.claim.report</field>
             <field name="arch" type="xml">
                 <search string="Search">
-                    <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
-                    <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)" 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"/>
@@ -73,8 +67,6 @@
                         <field name="create_date" />
                         <field name="date_closed" />
                         <field name="date_deadline" />
-                        <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
-                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]"/>
                     </group>
                     <group  expand="1" string="Group By...">
                         <filter string="Salesperson" name="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
@@ -84,7 +76,6 @@
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_action'}" help="Action Type"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Date of claim"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Month of claim"/>
diff --git a/addons/crm_claim/res_partner_view.xml b/addons/crm_claim/res_partner_view.xml
new file mode 100644
index 00000000000..4a5db879311
--- /dev/null
+++ b/addons/crm_claim/res_partner_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <!--  Partners inherited form -->
+        <record id="view_claim_res_partner_info_form" model="ir.ui.view">
+            <field name="name">res.partner.claim.info.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="priority" eval="50"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button class="oe_inline" type="action"
+                        name="%(crm_case_categ_claim0)d"
+                        string="Claims"
+                        context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
+                        groups="base.group_sale_salesman" />
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/crm_claim/test/process/claim.yml b/addons/crm_claim/test/process/claim.yml
index a843372956e..f6c6f6d315c 100644
--- a/addons/crm_claim/test/process/claim.yml
+++ b/addons/crm_claim/test/process/claim.yml
@@ -21,25 +21,9 @@
 -
   !python {model: crm.claim}: |
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    self.case_open(cr, uid, claim_ids)
 -
-  I check Claim Details after open. 
+  I check Claim Details after open.
 -
   !python {model: crm.claim}: |
     claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "open", "Claim is not in Open state"
-    assert claim.stage_id.id == ref("crm.stage_lead2"), "Claim is not in Qualification stage"
--
-  After complete all service from our side, I close this claim.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    self.case_close(cr, uid, claim_ids)
--
-  I check Claim details after closed.
--
-  !python {model: crm.claim}: |
-    claim_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
-    claim = self.browse(cr, uid, claim_ids[0])
-    assert claim.state == "done", "Claim is not in close state"
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 2d0383962b1..03e6a243851 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -19,21 +19,14 @@
 #
 ##############################################################################
 
-from openerp.addons.base_status.base_state import base_state
-from openerp.addons.base_status.base_stage import base_stage
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
 from openerp import tools
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-CRM_HELPDESK_STATES = (
-    crm.AVAILABLE_STATES[2][0], # Cancelled
-    crm.AVAILABLE_STATES[3][0], # Done
-    crm.AVAILABLE_STATES[4][0], # Pending
-)
 
-class crm_helpdesk(base_state, base_stage, osv.osv):
+class crm_helpdesk(osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
@@ -71,7 +64,12 @@ class crm_helpdesk(base_state, base_stage, osv.osv):
                             domain="['|',('section_id','=',False),('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"),
             'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
-            'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True,
+            'state': fields.selection(
+                [('draft', 'New'),
+                 ('open', 'In Progress'),
+                 ('pending', 'Pending'),
+                 ('done', 'Closed'),
+                 ('cancel', 'Cancelled')], 'Status', size=16, readonly=True, track_visibility='onchange',
                                   help='The status is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the status is set to \'Open\'.\
                                   \nWhen the case is over, the status is set to \'Done\'.\
@@ -80,15 +78,45 @@ class crm_helpdesk(base_state, base_stage, osv.osv):
 
     _defaults = {
         'active': lambda *a: 1,
-        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
-        'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'state': lambda *a: 'draft',
         'date': lambda *a: fields.datetime.now(),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
     }
 
+    def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):
+        values = {}
+        if partner_id:
+            partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+            values = {
+                'email_from': partner.email,
+            }
+        return {'value': values}
+
+    def write(self, cr, uid, ids, values, context=None):
+        """ Override to add case management: open/close dates """
+        if values.get('state'):
+            if values.get('state') in ['draft', 'open'] and not values.get('date_open'):
+                values['date_open'] = fields.datetime.now()
+            elif values.get('state') == 'close' and not values.get('date_closed'):
+                values['date_closed'] = fields.datetime.now()
+        return super(crm_helpdesk, self).write(cr, uid, ids, values, context=context)
+
+    def case_escalate(self, cr, uid, ids, context=None):
+        """ Escalates case to parent level """
+        data = {'active': True}
+        for case in self.browse(cr, uid, ids, context=context):
+            if case.section_id and case.section_id.parent_id:
+                parent_id = case.section_id.parent_id
+                data['section_id'] = parent_id.id
+                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.'))
+            self.write(cr, uid, [case.id], data, context=context)
+        return True
+
     # -------------------------------------------------------
     # Mail gateway
     # -------------------------------------------------------
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index f97fe654166..fe98c2e6e9e 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -29,21 +29,10 @@
             <field name="arch" type="xml">
                 <form string="Helpdesk Support" version="7.0">
                 <header>
-                    <button name="case_open" string="Open" type="object" class="oe_highlight"
-                            states="draft,pending"/>
-                    <button name="case_close" string="Close Case" type="object" states="draft,pending"/>
-                    <button name="case_close" string="Close Case" type="object" states="open" class="oe_highlight"/>
-                    <button name="case_pending" string="Pending" type="object"
-                            states="draft"/>
-                    <button name="case_pending" string="Pending" type="object" 
-                            states="open"/>
-                    <button name="case_reset" string="Reset to Draft" type="object" 
-                            states="cancel,done"/>
                     <button name="case_escalate" string="Escalate" type="object" 
                             states="open,draft,pending"/>
-                    <button name="case_cancel" string="Cancel Case" type="object"
-                            states="draft,open,pending"/>
-                    <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    <field name="state" nolabel="1" widget="statusbar" clickable="True"
+                            statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet string="Helpdesk Support">
                     <group col="4" class="oe_header">
@@ -58,8 +47,7 @@
                             <group>
                                 <group string="Communication">
                                     <field name="partner_id"
-                                        on_change="onchange_partner_id(partner_id, email_from)"
-                                        />
+                                        on_change="on_change_partner_id(partner_id)"/>
                                     <field name="email_from"/>
                                 </group>
                                 <group string="Categorization">
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
index 4a80e7f9385..13843f911c9 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-08 05:52+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_partner_assign/__init__.py b/addons/crm_partner_assign/__init__.py
index bb4a3bb53be..6b1315cef07 100644
--- a/addons/crm_partner_assign/__init__.py
+++ b/addons/crm_partner_assign/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import crm_partner_assign
+import crm_lead
 import wizard
 import report
 
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index b9b21ca7a6a..e0f1d78558a 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -37,17 +37,23 @@ The most appropriate partner can be assigned.
 You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
-    'depends': ['crm', 'account'],
-    'demo': ['res_partner_demo.xml'],
+    'depends': ['crm', 'account', 'portal'],
+    'demo': ['res_partner_demo.xml', 'crm_lead_demo.xml'],
     'data': [
         'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
+        'wizard/crm_channel_interested_view.xml',
         'crm_lead_view.xml',
         'crm_partner_assign_data.xml',
+        'crm_portal_view.xml',
+        'portal_data.xml',
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
     ],
+    'js': [
+        'static/src/js/next.js',
+    ],
     'test': ['test/partner_assign.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/crm_partner_assign/crm_lead.py b/addons/crm_partner_assign/crm_lead.py
new file mode 100644
index 00000000000..37f4b9aedff
--- /dev/null
+++ b/addons/crm_partner_assign/crm_lead.py
@@ -0,0 +1,44 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from openerp.osv import osv
+from openerp.tools.translate import _
+
+
+class crm_lead(osv.osv):
+    _inherit = 'crm.lead'
+
+    def get_interested_action(self, cr, uid, interested, context=None):
+        try:
+            model, action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'crm_lead_channel_interested_act')
+        except ValueError:
+            raise osv.except_osv(_('Error!'), _("The CRM Channel Interested Action is missing"))
+        action = self.pool[model].read(cr, uid, action_id, context=context)
+        action_context = eval(action['context'])
+        action_context['interested'] = interested
+        action['context'] = str(action_context)
+        return action
+
+    def case_interested(self, cr, uid, ids, context=None):
+        return self.get_interested_action(cr, uid, True, context=context)
+
+    def case_disinterested(self, cr, uid, ids, context=None):
+        return self.get_interested_action(cr, uid, False, context=context)
diff --git a/addons/crm_partner_assign/crm_lead_demo.xml b/addons/crm_partner_assign/crm_lead_demo.xml
new file mode 100644
index 00000000000..6631131d054
--- /dev/null
+++ b/addons/crm_partner_assign/crm_lead_demo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+      <data noupdate="1">
+
+            <!--  Demo Leads -->
+            <record id="crm_case_partner_assign_1" model="crm.lead">
+                  <field name="type">lead</field>
+                  <field name="name">Specifications and price of your phones</field>
+                  <field name="contact_name">Steve Martinez</field>
+                  <field name="partner_name"></field>
+                  <field name="partner_id" ref=""/>
+                  <field name="function">Reseller</field>
+                  <field name="country_id" ref="base.uk"/>
+                  <field name="city">Edinburgh</field>
+                  <field name="type_id" ref="crm.type_lead8"/>
+                  <field name="categ_ids" eval="[(6, 0, [ref('crm.categ_oppor1')])]"/>
+                  <field name="channel_id" ref="crm.crm_case_channel_email"/>
+                  <field name="priority">2</field>
+                  <field name="section_id" ref="crm.crm_case_section_2"/>
+                  <field name="user_id" ref=""/>
+                  <field name="stage_id" ref="crm.stage_lead1"/>
+                  <field name="description">Hi,
+
+            Please, can you give me more details about your phones, including their specifications and their prices.
+
+            Regards,
+            Steve</field>
+                  <field eval="1" name="active"/>
+                  <field name="partner_assigned_id" ref="portal.partner_demo_portal"/>
+            </record>
+      </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index 0d2837d6ca5..3b253b1c3d4 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -8,27 +8,33 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//notebook/page[@string='Lead']" position="after">
-                        <page string="Assignation">
+                        <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
-                                <group string="Partner Assignation">
-                                    <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                                    <label for="date_assign"/>
+                                <group string="Partner Assignation" col="3" colspan="1">
+                                    <label for="partner_latitude" string="Geolocation" />
+                                    <div class="oe_title">
+                                        <h3>
+                                            <span class="oe_grey">( </span>
+                                            <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                            <field name="partner_longitude"  class="oe_inline" readonly="1" nolabel="1"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                            <span class="oe_grey">) </span>
+                                        </h3>
+                                    </div>
+                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
+                                        class="oe_inline"/>
+                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
                                     <div>
-                                        <field name="date_assign"/>
-                                        <button string="Forward"
+                                        <button string="Send Email"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
-                                            icon="terp-mail-forward" type="action"
-                                            context="{'default_composition_mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
+                                            type="action"
+                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
-                                <group string="Geo Assignation">
-                                    <field name="partner_latitude"/>
-                                    <field name="partner_longitude"/>
-                                    <span/>
-                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                        icon="gtk-apply"/>
-                                </group>
                             </group>
                         </page>
                     </xpath>
@@ -43,6 +49,7 @@
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
+                    <field name="date_assign" invisible="1"/>
                  </field>
             </field>
         </record>
@@ -54,42 +61,50 @@
             <field name="arch" type="xml">
                 <filter string="Team" position="after">
                     <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
-                </filter>
+                    <filter string="Assigned Month"  icon="terp-go-month"
+                            domain="[]" context="{'group_by':'date_assign'}"/>
 
+                </filter>
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
-         </record>
+        </record>
 
-         <record id="view_crm_lead_geo_assign_form" model="ir.ui.view">
+        <record id="view_crm_lead_geo_assign_form" model="ir.ui.view">
             <field name="name">crm.lead.lead.geo_assign.inherit</field>
             <field name="model">crm.lead</field>
             <field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//notebook/page[@string='Extra Info']" position="after">
-                        <page string="Assignation">
+                        <page string="Assigned Partner" groups="base.group_sale_manager">
                             <group name="partner_assign_group">
-                                <group string="Partner Assignation">
-                                    <field name="partner_assigned_id" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
-                                    <label for="date_assign"/>
+                                <group string="Partner Assignation" col="3">
+                                    <label for="partner_latitude" string="Geolocation" />
                                     <div>
-                                        <field name="date_assign"/>
-                                        <button string="Forward"
+                                        <h3>
+                                            <span class="oe_grey">( </span>
+                                            <field name="partner_latitude" nolabel="1" readonly="1" class="oe_inline"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&lt;=',0)]}">N </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_latitude','&gt;=',0)]}">S </span>
+                                            <field name="partner_longitude"  class="oe_inline" readonly="1" nolabel="1"/>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&lt;=',0)]}">E </span>
+                                            <span class="oe_grey oe_inline" attrs="{'invisible':[('partner_longitude','&gt;=',0)]}">W </span>
+                                            <span class="oe_grey">) </span>
+                                        </h3>
+                                    </div>
+                                    <button string="Automatic Assignation" name="action_assign_partner" type="object" colspan="1"
+                                        class="oe_inline" />
+                                    <field name="partner_assigned_id" class="oe_inline" on_change="onchange_assign_id(partner_assigned_id)" domain="[('grade_id','&lt;&gt;',False)]"/>
+                                    <div>
+                                        <button string="Send Email"
                                             attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                             name="%(crm_lead_forward_to_partner_act)d"
-                                            icon="terp-mail-forward" type="action"
-                                            context="{'default_composition_mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
+                                            type="action"
+                                            context="{'default_composition_mode': 'forward','hide_forward_type': 1 , 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
-                                <group string="Geo Assignation">
-                                    <field name="partner_latitude"/>
-                                    <field name="partner_longitude"/>
-                                    <span/>
-                                    <button string="Geo Assign" name="action_assign_partner" type="object" colspan="1"
-                                        icon="gtk-apply"/>
-                                </group>
                             </group>
                         </page>
                     </xpath>
@@ -104,7 +119,7 @@
             <field name="arch" type="xml">
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
-                 </field>
+                </field>
             </field>
         </record>
 
@@ -116,12 +131,11 @@
                 <filter string="Team" position="after">
                     <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
-
                 <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
-         </record>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/crm_partner_assign.py b/addons/crm_partner_assign/crm_partner_assign.py
index b13a75a2591..daf3d844fe6 100644
--- a/addons/crm_partner_assign/crm_partner_assign.py
+++ b/addons/crm_partner_assign/crm_partner_assign.py
@@ -66,10 +66,13 @@ class res_partner_grade(osv.osv):
     _columns = {
         'sequence': fields.integer('Sequence'),
         'active': fields.boolean('Active'),
-        'name': fields.char('Grade Name', size=32)
+        'name': fields.char('Grade Name', size=32),
+        'partner_weight': fields.integer('Grade Weight',
+            help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
     }
     _defaults = {
-        'active': lambda *args: 1
+        'active': lambda *args: 1,
+        'partner_weight':1
     }
 
 class res_partner_activation(osv.osv):
@@ -88,11 +91,11 @@ class res_partner(osv.osv):
         'partner_latitude': fields.float('Geo Latitude'),
         'partner_longitude': fields.float('Geo Longitude'),
         'date_localization': fields.date('Geo Localization Date'),
-        'partner_weight': fields.integer('Weight',
+        'partner_weight': fields.integer('Grade Weight',
             help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
         'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\
             'Assigned Opportunities'),
-        'grade_id': fields.many2one('res.partner.grade', 'Partner Level'),
+        'grade_id': fields.many2one('res.partner.grade', 'Grade'),
         'activation' : fields.many2one('res.partner.activation', 'Activation', select=1),
         'date_partnership' : fields.date('Partnership Date'),
         'date_review' : fields.date('Latest Partner Review'),
@@ -101,6 +104,13 @@ class res_partner(osv.osv):
     _defaults = {
         'partner_weight': lambda *args: 0
     }
+    
+    def onchange_grade_id(self, cr, uid, ids, grade_id, context=None):
+        res = {'value' :{'partner_weight':0}}
+        if grade_id:
+            partner_grade = self.pool.get('res.partner.grade').browse(cr, uid, grade_id)
+            res['value']['partner_weight'] = partner_grade.partner_weight
+        return res
     def geo_localize(self, cr, uid, ids, context=None):
         # Don't pass context to browse()! We need country names in english below
         for partner in self.browse(cr, uid, ids):
@@ -124,7 +134,7 @@ class crm_lead(osv.osv):
     _columns = {
         'partner_latitude': fields.float('Geo Latitude'),
         'partner_longitude': fields.float('Geo Longitude'),
-        'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True),
+        'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner',track_visibility='onchange' , help="Partner this case has been forwarded/assigned to.", select=True),
         'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
     }
     def _merge_data(self, cr, uid, ids, oldest, fields, context=None):
@@ -134,6 +144,7 @@ class crm_lead(osv.osv):
     def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context=None):
         """This function updates the "assignation date" automatically, when manually assign a partner in the geo assign tab
         """
+
         if not partner_assigned_id:
             return {'value':{'date_assign': False}}
         else:
@@ -261,4 +272,3 @@ class crm_lead(osv.osv):
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm_partner_assign/crm_partner_assign_data.xml b/addons/crm_partner_assign/crm_partner_assign_data.xml
index dab50192641..b4347b1621b 100644
--- a/addons/crm_partner_assign/crm_partner_assign_data.xml
+++ b/addons/crm_partner_assign/crm_partner_assign_data.xml
@@ -1,44 +1,59 @@
-<?xml version="1.0" encoding='UTF-8'?>
+<?xml version="1.0" ?>
 <openerp>
     <data>
-        <record id="crm_partner_assign_email_template" model="email.template">
-            <field name="name">Lead forward</field>
-            <field name="email_from"></field>
-            <field name="subject">Fwd: Lead: ${object.name}</field>
-            <field name="email_to"></field>
-            <field name="lang"></field>
-            <field name="model_id" ref="crm.model_crm_lead"/>
+        <record model="crm.case.stage" id="stage_portal_lead_assigned">
+            <field name="name">Assigned</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="12" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record model="crm.case.stage" id="stage_portal_lead_recycle">
+            <field name="name">To Recycle</field>
+            <field eval="1" name="case_default"/>
+            <field eval="0" name="probability"/>
+            <field eval="11" name="sequence"/>
+            <field name="type">lead</field>
+        </record>
+        <record id="email_template_lead_forward_mail" model="email.template">
+            <field name="name">Lead Mass Mail</field>
+            <field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
             <field name="auto_delete" eval="True"/>
+            <field name="email_to">${ctx['partner_id'].email}</field>
+            <field name="email_from">${user.email or ''}</field>
+            <field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
             <field name="body_html"><![CDATA[
-Hello ${object.partner_assigned_id.name},
-<p>
-Here is a lead that might interest you.
-</p>
-<p>
-Please keep me informed about your actions about it so that I can keep an
-accurate follow-up of it and help you in the sale cycle.
-</p>
-<p>
-Your account manager,<br/>
-${object.user_id.name},<br/>
-${object.user_id.email}
-</p>
+            
+<p>Hello,</p>
 
-<p>
-${ctx["mail_body"].replace('\n','<br>') | safe}
-</p>
 
-% if ctx["history_mode"] in ('whole'):
-    % for message in object.message_ids:
-        ---- Original Message (${message.date or ''}) ----<br/>
-        ${message.body | safe}
-    % endfor
+<p>We have been contacted by those prospects that are in your region. Thus, the following leads have been assigned to ${ctx['partner_id'].name}:</p>
+
+<ol>
+% for lead in ctx['partner_leads']:
+     <li><a href="${lead.lead_link}">${lead.lead_id.name or 'Subject Undefined'}</a>, ${lead.lead_id.contact_name or 'Contact Name Undefined'}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or 'Country Undefined' }, ${lead.lead_id.email_from or 'Email Undefined'}, ${lead.lead_id.phone or ''} </li></br>
+% endfor
+</ol>
+
+% if ctx.get('partner_in_portal'):
+<p>Please connect to your <a href="${object.get_portal_url()}">Partner Portal</a> to get details. On each lead are two buttons on the top left corner that you should press after having contacted the lead: "I'm interested" & "I'm not interested".</p>
+% else:
+<p>
+    You do not have yet a portal access to our database. Please contact 
+    ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and 'your account manager %s (%s)' % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or 'us'}.
+</p>
 % endif
-% if ctx['history_mode'] == 'latest':
-    ---- Original Message (${object.message_ids[0].date or ''}) ----<br/>
-    ${object.message_ids[0].body | safe}
+<p>The lead will be sent to another partner if you do not contact the lead before 20 days.</p>
+
+<p>Thanks,</p>
+
+<pre>
+${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature or ''}
+</pre>
+% if not ctx['partner_id'].user_id:
+PS: It looks like you do not have an account manager assigned to you, please contact us.
 % endif
             ]]></field>
         </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/crm_partner_assign/crm_portal_view.xml b/addons/crm_partner_assign/crm_portal_view.xml
new file mode 100644
index 00000000000..ab4cf8868db
--- /dev/null
+++ b/addons/crm_partner_assign/crm_portal_view.xml
@@ -0,0 +1,207 @@
+<openerp>
+    <data>
+    <!-- lead views-->
+        <record model="ir.ui.view" id="crm_lead_portal_tree">
+            <field name="name">partner lead</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+            <tree string="Leads" colors="red:stage_id[1]=='Disinterested';black:stage_id[1]=='Interested'">
+              <field name="date_deadline" invisible="1"/>
+              <field name="create_date"/>
+              <field name="name" string="Subject"/>
+              <field name="contact_name"/>
+              <field name="country_id" invisible="context.get('invisible_country', True)" />
+              <field name="email_from"/>
+              <field name="phone"/>
+              <field name="stage_id" invisible="1"/>
+              <field name="type_id" invisible="1"/>
+              <field name="referred" invisible="1"/>
+              <field name="channel_id" invisible="1"/>
+              <field name="section_id" invisible="context.get('invisible_section', True)" />
+
+              <button string="I'm interested" name="case_interested" icon="gtk-index" type="object"/>
+              <button string="I'm not interested" name="case_disinterested" icon="gtk-close" type="object"/>
+            </tree>
+            </field>
+        </record>
+        <record model= "ir.ui.view" id="crm_lead_portal_form">
+            <field name="name">crm_portal_form</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+              <form string="Leads" version="7.0">
+                <header>
+                  <button string="I'm interested" name="case_interested" icon="gtk-index" type="object"/>
+                  <button string="I'm not interested" name="case_disinterested" icon="gtk-close" type="object"/>
+                </header>
+                <sheet>
+                  <group>
+                    <group>
+                      <field name="partner_name" string="Partner Name" readonly="1"/>
+                      <field name="title" widget="selection" readonly="1"/>
+                      <field name="contact_name" readonly="1"/>
+                      <field name="function" readonly="1"/>
+                      <field name="email_from" readonly="1"/>
+                      <field name="phone" readonly="1"/>
+                      <field name="fax" readonly="1"/>
+                      <field name="mobile" readonly="1"/>
+                    </group>
+                    <group>
+                      <field name="street" readonly="1"/>
+                      <field name="street2" readonly="1"/>
+                      <field name="zip" readonly="1"/>
+                      <field name="city" readonly="1"/>
+                      <field name="country_id" readonly="1"/>
+                      <field name="state_id" readonly="1"/>
+                    </group>
+                    <label for="description" colspan="2"/>
+                    <field name="description" nolabel="1" colspan="2"/>
+                  </group>
+                </sheet>
+              </form>
+            </field>
+        </record>
+        <!-- opportunity views-->
+        <record model="ir.ui.view" id="crm_opportunity_portal_tree">
+            <field name="name">partner lead</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+               <tree string="Leads">
+                   <field name="date_deadline" invisible="1"/>
+                   <field name="create_date" groups="base.group_no_one"/>
+                   <field name="name" string="Opportunity"/>
+                   <field name="partner_id" string="Customer"/>
+                   <field name="country_id" invisible="context.get('invisible_country', True)" />
+                   <field name="date_action"/>
+                   <field name="title_action" />
+                   <field name="channel_id" invisible="1"/>
+                   <field name="type_id" invisible="1"/>
+                   <field name="planned_revenue" sum="Expected Revenues"/>
+                   <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
+                   <field name="section_id" invisible="context.get('invisible_section', True)" />
+                   <field name="priority" invisible="1"/>
+               </tree>
+            </field>
+        </record>
+        <record model= "ir.ui.view" id="crm_opportunity_portal_form">
+            <field name="name">crm_portal_form</field>
+            <field name="model">crm.lead</field>
+            <field name="priority" eval="32"/>
+            <field name="arch" type="xml">
+              <form string="Leads" version="7.0">
+                <sheet>
+                <group>
+                    <field name="name"  required="1" string="Opportunity"/>
+                    <field name="planned_revenue" readonly="1"/>
+                    <field name="probability" readonly="1"/>
+                    <field name="date_deadline"/>
+                    <newline/>
+                    <field name="date_action" readonly="1"/>
+                    <field name="title_action" readonly="1"/>
+                    <field name="priority" string="Priority" readonly="1"/>
+                    <newline/>
+                    <field name="type" invisible="1" readonly="1"/>
+                </group>
+                <notebook colspan="4">
+                <page string="Opportunity">
+                    <group col="2">
+                      <separator string="Contact" colspan="2"/>
+                      <group col="2">
+                          <field name="partner_id" select="1"
+                            on_change="onchange_partner_id(partner_id, email_from)" string="Customer"
+                            colspan="2" readonly="1"/>
+                          <field name="partner_name" string="Customer Name" readonly="1"/>
+                          <field domain="[('domain', '=', 'contact')]" name="title" widget="selection" readonly="1"/>
+                          <field name="function" readonly="1"/>
+                          <field name="street" readonly="1"/>
+                          <field name="street2" readonly="1"/>
+                      </group>
+                      <group col="2">
+                         <field name="zip" readonly="1"/>
+                         <field name="city" readonly="1"/>
+                         <field name="country_id" readonly="1"/>
+                         <field name="state_id" readonly="1"/>
+                         <field name="phone" readonly="1"/>
+                      </group>
+                    </group>
+                    <group col="2">
+                      <group col="2">
+                         <separator string="Communication" colspan="2"/>
+                         <field name="email_from" readonly="1"/>
+                         <field name="phone" readonly="1"/>
+                         <field name="fax" readonly="1"/>
+                         <field name="mobile" readonly="1"/>
+                      </group>
+                      <group col="2">
+                         <separator string="Categorization" colspan="2"/>
+                        <field name="type_id" widget="selection" readonly="1"/>
+                        <field name="channel_id" widget="selection" readonly="1"/>
+                      </group>
+                    </group>
+                    <separator string="Details" />
+                    <field name="description" nolabel="1" colspan="4"/>
+                </page>
+                </notebook>
+              </sheet>
+              </form>
+            </field>
+        </record>
+
+
+    <!-- leads -->
+
+       <record id="action_portal_leads" model="ir.actions.act_window">
+          <field name="name">Leads</field>
+          <field name="res_model">crm.lead</field>
+          <field name="view_mode">tree,form</field>
+          <field name="view_id" ref="crm_lead_portal_tree"/>
+          <field name="domain">[('type','like','lead')]</field>
+      </record>
+
+      <record id="action_portal_lead_tree" model="ir.actions.act_window.view">
+          <field name="sequence" eval="0"/>
+          <field name="view_mode">tree</field>
+          <field name="view_id" ref="crm_lead_portal_tree"/>
+          <field name="act_window_id" ref="action_portal_leads"/>
+      </record>
+      
+      <record id="action_portal_lead_form" model="ir.actions.act_window.view">
+          <field name="sequence" eval="1"/>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="crm_lead_portal_form"/>
+          <field name="act_window_id" ref="action_portal_leads"/>
+      </record>
+      
+    <!-- opportunities -->
+      
+      <record id="action_portal_opportunities" model="ir.actions.act_window">
+          <field name="name">Opportunities</field>
+          <field name="res_model">crm.lead</field>
+          <field name="view_mode">tree,form</field>
+          <field name="view_id" ref="crm_opportunity_portal_tree"/>
+          <field name="domain">[('type','like','opportunity')]</field>
+      </record>
+
+      <record id="action_portal_opportunities_tree" model="ir.actions.act_window.view">
+          <field name="sequence" eval="0"/>
+          <field name="view_mode">tree</field>
+          <field name="view_id" ref="crm_opportunity_portal_tree"/>
+          <field name="act_window_id" ref="action_portal_opportunities"/>
+      </record>
+      
+      <record id="action_portal_opportunities_form" model="ir.actions.act_window.view">
+          <field name="sequence" eval="1"/>
+          <field name="view_mode">form</field>
+          <field name="view_id" ref="crm_opportunity_portal_form"/>
+          <field name="act_window_id" ref="action_portal_opportunities"/>
+      </record>
+
+      <!--menus-->
+      <menuitem name="Leads &amp; Opportunities" id="portal_leads" parent="portal.portal_menu" sequence="25"/>
+      <menuitem action="action_portal_leads" sequence="0" id="openerp_portal_menu_sales_leads_current" parent="portal_leads"/>
+      <menuitem action="action_portal_opportunities" sequence="1" id="openerp_portal_menu_sales_leads_current1" parent="portal_leads"/>
+
+    </data>
+</openerp>
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index 53a2929be4e..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: 2013-05-30 14:10+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-05-31 05:38+0000\n"
-"X-Generator: Launchpad (build 16660)\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
@@ -670,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
@@ -706,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
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index af764d72747..d69d52029fc 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/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:50+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-07-23 06:22+0000\n"
+"Last-Translator: fanvil <fanvil@hotmail.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:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-24 05:31+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -37,7 +37,7 @@ msgstr "计划收入"
 msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
-msgstr ""
+msgstr "消息类型：Email 用于 邮件消息， 通知用户系统消息，评论用于其他消息，例如用户回复。"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
@@ -53,7 +53,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 +68,7 @@ msgstr "geolocalization定位"
 #. 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
@@ -80,7 +80,7 @@ msgstr "正文"
 msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
-msgstr ""
+msgstr "发送者的Email地址。当收取的email没有对应的合作伙伴时，此字段被设置"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -111,7 +111,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 +123,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,7 +170,7 @@ msgstr "指派的geolocalization"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email撰写向导"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
@@ -192,7 +192,7 @@ msgstr "为线索指定一个业务伙伴的概率（0表示没指派）"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Activation"
-msgstr ""
+msgstr "激活合作伙伴"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
@@ -203,7 +203,7 @@ msgstr "系统通知"
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
-msgstr ""
+msgstr "转发的线索"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
@@ -284,7 +284,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
@@ -309,7 +309,7 @@ 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
@@ -344,7 +344,7 @@ msgstr "7月"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
-msgstr ""
+msgstr "回顾排程"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -356,12 +356,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
@@ -416,12 +416,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
@@ -449,7 +449,7 @@ msgstr "12月"
 #. 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
@@ -465,13 +465,13 @@ 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
 #: field:res.partner,date_review:0
 msgid "Latest Partner Review"
-msgstr ""
+msgstr "最新合作伙伴评论"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subject:0
@@ -481,17 +481,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
@@ -501,13 +501,13 @@ msgstr "#商机"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
-msgstr ""
+msgstr "当前用户用 星号 提醒关联到这条消息"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
 #: field:res.partner,date_partnership:0
 msgid "Partnership Date"
-msgstr ""
+msgstr "合作关系日期"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -661,7 +661,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
@@ -682,7 +682,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
@@ -696,7 +696,7 @@ msgstr "序列"
 msgid ""
 "Cannot contact geolocation servers. Please make sure that your internet "
 "connection is up and running (%s)."
-msgstr ""
+msgstr "无法连接地理信息服务器。请确保你的互联网链接畅通(%s)。"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -722,7 +722,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
@@ -737,12 +737,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
@@ -773,7 +773,7 @@ msgstr "可能收入"
 #: field:res.partner,activation:0
 #: view:res.partner.activation:0
 msgid "Activation"
-msgstr ""
+msgstr "激活"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -784,12 +784,12 @@ msgstr "指定的业务伙伴"
 #. module: crm_partner_assign
 #: field:res.partner,grade_id:0
 msgid "Partner Level"
-msgstr ""
+msgstr "合作伙伴级别"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
-msgstr ""
+msgstr "当前用户有关联到这条消息的未读的提醒"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
@@ -815,7 +815,7 @@ msgstr "名称"
 #: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
 #: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
 msgid "Partner Activations"
-msgstr ""
+msgstr "合作伙伴激活"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -872,7 +872,7 @@ msgstr "客户关系管理 线索报表"
 #. 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
diff --git a/addons/crm_partner_assign/portal_data.xml b/addons/crm_partner_assign/portal_data.xml
new file mode 100644
index 00000000000..0d4a5b30abd
--- /dev/null
+++ b/addons/crm_partner_assign/portal_data.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Partner and address -->
+        <record id="res_partner_access" model="ir.model.access">
+            <field name="name">openerp.portal.res.partner</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="group_id" ref="portal.group_portal"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_write" eval="0"/>
+            <field name="perm_unlink" eval="0"/>
+        </record>
+        <record id="res_partner_rule" model="ir.rule">
+            <field name="name">openerp.portal.res.partner</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="groups" eval="[(6,0,[ref('portal.group_portal')])]"/>
+            <field name="domain_force">[('id','child_of',user.commercial_partner_id.id)]</field>
+        </record>
+        <record id="res_partner_grade_access" model="ir.model.access">
+            <field name="name">openerp.portal.res.partner.grade</field>
+            <field name="model_id" ref="crm_partner_assign.model_res_partner_grade"/>
+            <field name="group_id" ref="portal.group_portal"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_write" eval="0"/>
+            <field name="perm_unlink" eval="0"/>
+        </record>
+
+        <!-- CRM Lead portal -->
+        <record id="assigned_lead_portal_rule_1" model="ir.rule">
+            <field name="name">openerp.portal.crm.lead</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="groups" eval="[(6,0,[ref('portal.group_portal')])]"/>
+            <field name="domain_force">[('partner_assigned_id','child_of',user.commercial_partner_id.id)]</field>
+        </record>
+        <record id="lead_portal_access" model="ir.model.access">
+            <field name="name">openerp.portal.crm.lead</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="group_id" ref="portal.group_portal"/>
+            <field name="perm_read" eval="1"/>
+            <field name="perm_create" eval="0"/>
+            <field name="perm_write" eval="1"/>
+            <field name="perm_unlink" eval="0"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py
index 676a8536b74..c7a6b76ee44 100644
--- a/addons/crm_partner_assign/report/crm_lead_report.py
+++ b/addons/crm_partner_assign/report/crm_lead_report.py
@@ -23,13 +23,6 @@ from openerp.osv import fields,osv
 from openerp import tools
 from openerp.addons.crm import crm
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
 
 class crm_lead_report_assign(osv.osv):
     """ CRM Lead Report """
@@ -43,7 +36,6 @@ class crm_lead_report_assign(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'country_id':fields.many2one('res.country', 'Country', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sales Team', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -54,7 +46,7 @@ class crm_lead_report_assign(osv.osv):
         'date_assign': fields.date('Partner Date', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'delay_open': fields.float('Delay to Open',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
+        'delay_open': fields.float('Delay to Assign',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to open the case"),
         'delay_close': fields.float('Delay to Close',digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
         'probability': fields.float('Avg Probability',digits=(16,2),readonly=True, group_operator="avg"),
@@ -91,7 +83,6 @@ class crm_lead_report_assign(osv.osv):
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.date_closed, 'YYYY-mm-dd') as date_closed,
-                    c.state,
                     c.date_assign,
                     c.user_id,
                     c.probability,
@@ -110,7 +101,7 @@ class crm_lead_report_assign(osv.osv):
                     c.planned_revenue*(c.probability/100) as probable_revenue, 
                     1 as nbr,
                     date_trunc('day',c.create_date) as create_date,
-                    extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
+                    extract('epoch' from (c.write_date-c.create_date))/(3600*24) as  delay_close,
                     extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open
                 FROM
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 fbc46302fd7..7984c2cc3b1 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -8,8 +8,6 @@
             <field name="model">crm.lead.report.assign</field>
             <field name="arch" type="xml">
                 <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}" groups="base.group_multi_salesteams"/>
                     <field name="grade_id"/>
                     <field name="user_id"/>
@@ -36,7 +34,6 @@
                                 domain="[]" context="{'group_by':'grade_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'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" />
                         <filter string="Assign Date" icon="terp-go-today" domain="[]" name="group_partner_date" context="{'group_by':'date_assign'}"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}"/>
@@ -54,7 +51,6 @@
             <field name="model">crm.lead.report.assign</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Lead Assign" type="bar">
-                    <field name="state"/>
                     <field name="nbr" operator="+"/>
                     <field group="True" name="user_id"/>
                 </graph>
@@ -76,14 +72,13 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
                 <field name="day" invisible="1"/>
-                <field name="state"  invisible="1"/>
                 <field name="stage_id"  invisible="1"/>
                 <field name="priority"  invisible="1"/>
                 <field name="type" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
                 <field name="planned_revenue" sum="Planned Revenues"/>
-                <field name="delay_open" sum='Delay to open'/>
+                <field name="delay_open" sum='Delay to Assign'/>
                 <field name="delay_close" sum='Delay to close'/>
                 <field name="delay_expected"/>
                 <field name="probability" widget="progressbar"/>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index 9e70835a3f1..6823c262f02 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-    <!--Partner Activation -->
+        <!--Partner Activation -->
 
         <record model="ir.ui.view" id="res_partner_activation_form">
             <field name="name">openerp_custom.res.partner.activation.form</field>
@@ -134,37 +134,23 @@
                     <newline/>
 
                     <field name="opportunity_assigned_ids" colspan="4" nolabel="1">
-                         <tree string="Assigned Opportunities"  colors="blue:state=='pending';gray:state=='cancel'">
+                         <tree string="Assigned Opportunities">
                              <field name="create_date"/>
                              <field name="name"/>
                              <field name="type"/>
                              <field name="stage_id"/>
-                             <button name="stage_previous" string="Previous"
-                                    states="open,pending" type="object" icon="gtk-go-back" />
-                             <button name="stage_next" string="Next"
-                                    states="open,pending" type="object"
-                                    icon="gtk-go-forward" />
                              <field name="section_id"
                                     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" />
-                             <button name="case_open" string="Open"
-                                    states="draft,pending" type="object"
-                                    icon="gtk-go-forward" />
-                             <button name="case_close" string="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')]}" />
+                                    type="object" 
+                                    attrs="{'invisible':[('type','=','opportunity'),('probability', '=', 100)]}" />
                              <button name="case_escalate" string="Escalate"
-                                    states="open,draft,pending" type="object"
-                                    icon="gtk-go-up" />
+                                    type="object"
+                                    icon="gtk-go-up" 
+                                    attrs="{'invisible':[('probability', '=', 100)]}" />
                          </tree>
                     </field>
                 </page>
@@ -172,6 +158,5 @@
         </field>
     </record>
 
-
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
index 69b74ef6b3d..81d74bf43e3 100644
--- a/addons/crm_partner_assign/security/ir.model.access.csv
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -5,3 +5,4 @@ access_crm_partner_report,crm.partner.report.assign.all,model_crm_partner_report
 access_res_partner_grade,res.partner.grade,model_res_partner_grade,base.group_sale_salesman,1,1,1,0
 access_res_partner_grade_manager,res.partner.grade.manager,model_res_partner_grade,base.group_sale_manager,1,1,1,1
 "access_partner_activation_manager","res.partner.activation.manager","model_res_partner_activation","base.group_partner_manager",1,1,1,1
+partner_access_crm_lead,crm.lead,model_crm_lead,portal.group_portal,1,1,0,0
\ No newline at end of file
diff --git a/addons/crm_partner_assign/static/src/js/next.js b/addons/crm_partner_assign/static/src/js/next.js
new file mode 100644
index 00000000000..c40f104d6c6
--- /dev/null
+++ b/addons/crm_partner_assign/static/src/js/next.js
@@ -0,0 +1,13 @@
+openerp.crm_partner_assign = function (instance) {
+	instance.crm_partner_assign = instance.crm_partner_assign || {};
+	instance.crm_partner_assign.next_or_list = function(parent) {
+		var form = parent.inner_widget.views.form.controller;
+		form.dataset.remove_ids([form.dataset.ids[form.dataset.index]]);
+		form.reload();
+		if (!form.dataset.ids.length){
+			parent.inner_widget.switch_mode('list');
+		}
+		parent.do_action({ type: 'ir.actions.act_window_close' });
+	};
+	instance.web.client_actions.add("next_or_list", "instance.crm_partner_assign.next_or_list");
+}
\ No newline at end of file
diff --git a/addons/crm_partner_assign/wizard/__init__.py b/addons/crm_partner_assign/wizard/__init__.py
index 9224173145b..ab6c7b7f06a 100644
--- a/addons/crm_partner_assign/wizard/__init__.py
+++ b/addons/crm_partner_assign/wizard/__init__.py
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import crm_forward_to_partner
+import crm_channel_interested
\ No newline at end of file
diff --git a/addons/crm_partner_assign/wizard/crm_channel_interested.py b/addons/crm_partner_assign/wizard/crm_channel_interested.py
new file mode 100644
index 00000000000..57db36cb51f
--- /dev/null
+++ b/addons/crm_partner_assign/wizard/crm_channel_interested.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU 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 fields, osv
+from openerp.tools.translate import _
+from openerp import SUPERUSER_ID
+
+
+class crm_lead_forward_to_partner(osv.TransientModel):
+    """ Forward info history to partners. """
+    _name = 'crm.lead.channel.interested'
+    _columns = {
+        'interested': fields.boolean('Interested by this lead'),
+        'contacted': fields.boolean('Did you contact the lead?', help="The lead has been contacted"),
+        'comment': fields.text('Comment', help="What are the elements that have led to this decision?", required=True),
+    }
+    _defaults = {
+        'interested': lambda self, cr, uid, c: c.get('interested', True),
+        'contacted': False,
+    }
+
+    def action_confirm(self, cr, uid, ids, context=None):
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        if wizard.interested and not wizard.contacted:
+            raise osv.except_osv(_('Error!'), _("You must contact the lead before saying that you are interested"))
+        lead_obj = self.pool.get('crm.lead')
+        lead_obj.check_access_rights(cr, uid, 'write')
+        if wizard.interested:
+            message = _('<p>I am interested by this lead.</p>')
+            values = {}
+        else:
+            stage = 'stage_portal_lead_recycle'
+            message = _('<p>I am not interested by this lead. I %scontacted the lead.</p>') % (not wizard.contacted and 'have not ' or '')
+            values = {'partner_assigned_id': False}
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            partner_ids = self.pool.get('res.partner').search(cr, SUPERUSER_ID, [('id', 'child_of', user.partner_id.commercial_partner_id.id)], context=context)
+            lead_obj.message_unsubscribe(cr, SUPERUSER_ID, context.get('active_ids'), partner_ids, context=None)
+            try:
+                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', stage)[1]
+            except ValueError:
+                stage_id = False
+            if stage_id:
+                values.update({'stage_id': stage_id})
+        if wizard.comment:
+            message += '<p>%s</p>' % wizard.comment
+        lead_obj.message_post(cr, uid, context.get('active_ids'), body=message, context=context)
+        if values:
+            lead_obj.write(cr, SUPERUSER_ID, context.get('active_ids'), values)
+        if wizard.interested:
+            for lead in lead_obj.browse(cr, uid, context.get('active_ids'), context=context):
+                lead_obj.convert_opportunity(cr, SUPERUSER_ID, [lead.id], lead.partner_id and lead.partner_id.id or None, context=None)
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'next_or_list',
+            'params': {
+            },
+        }
diff --git a/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml b/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml
new file mode 100644
index 00000000000..400e02cd48a
--- /dev/null
+++ b/addons/crm_partner_assign/wizard/crm_channel_interested_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+    	<record model="ir.ui.view" id="crm_lead_channel_interested_form">
+    		<field name="name">crm_lead_channel_interested</field>
+            <field name="model">crm.lead.channel.interested</field>
+            <field name="arch" type="xml">
+            	<form string="Send Mail" version="7.0">
+            		<group col="1">
+                        <field name="interested" nolabel="1" invisible="1"/>
+                        <div>
+                            <div invisible="context.get('interested', True)">
+                            	<label for="comment" string="Why aren't you interested by this lead?" />	
+                            </div>
+                            <div invisible="not context.get('interested', True)">
+                            	<label for="comment" string="What is the next action? When? What is the expected revenue?" />
+                            </div>
+                        </div>
+                        <field name="comment" nolabel="1"/>
+                        <div class="oe_inline">
+                            <field name="contacted" nolabel="1" string="Do you have contacted the customer?"/>
+                            <label for="contacted" />
+                        </div>
+                        <p class="oe_grey" invisible="not context.get('interested', True)">
+                            Once the lead is processed, it will be in your "Opportunities" menu.
+                        </p>
+                    </group>
+                    <footer>
+                        <button name="action_confirm" string="Confirm" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
+            	</form>
+            </field>
+    	</record>
+    	<record model="ir.actions.act_window" id="crm_lead_channel_interested_act">
+            <field name="name">Lead Feedback</field>
+            <field name="res_model">crm.lead.channel.interested</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="crm_lead_channel_interested_form"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
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 724102a84b1..80fa2f28b04 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -27,107 +27,182 @@ from openerp.tools.translate import _
 class crm_lead_forward_to_partner(osv.TransientModel):
     """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
-    _inherit = "mail.compose.message"
 
-    def _get_composition_mode_selection(self, cr, uid, context=None):
-        composition_mode = super(crm_lead_forward_to_partner, self)._get_composition_mode_selection(cr, uid, context=context)
-        composition_mode.append(('forward', 'Forward'))
-        return composition_mode
-
-    _columns = {
-        'partner_ids': fields.many2many('res.partner',
-            'lead_forward_to_partner_res_partner_rel',
-            'wizard_id', 'partner_id', 'Additional contacts'),
-        'attachment_ids': fields.many2many('ir.attachment',
-            'lead_forward_to_partner_attachment_rel',
-            'wizard_id', 'attachment_id', 'Attachments'),
-        'history_mode': fields.selection([('info', 'Internal notes'),
-            ('latest', 'Latest email'), ('whole', 'Whole Story')],
-            'Send history', required=True),
-    }
-
-    _defaults = {
-        'history_mode': 'info',
-    }
+    def _convert_to_assignation_line(self, cr, uid, lead, partner, context=None):
+        lead_location = []
+        partner_location = []
+        if lead.country_id:
+            lead_location.append(lead.country_id.name)
+        if lead.city:
+            lead_location.append(lead.city)
+        if partner:
+            if partner.country_id:
+                partner_location.append(partner.country_id.name)
+            if partner.city:
+                partner_location.append(partner.city)
+        return {'lead_id': lead.id,
+                'lead_location': ", ".join(lead_location),
+                'partner_assigned_id': partner and partner.id or False,
+                'partner_location': ", ".join(partner_location),
+                'lead_link': self.get_lead_portal_url(cr, uid, lead.id, lead.type, context=context),
+                }
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
-        # set as comment, perform overrided document-like action that calls get_record_data
-        old_mode = context.get('default_composition_mode', 'forward')
-        context['default_composition_mode'] = 'comment'
+        lead_obj = self.pool.get('crm.lead')
+        email_template_obj = self.pool.get('email.template')
+        try:
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
+        except ValueError:
+            template_id = False
         res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
-        # back to forward mode
-        context['default_composition_mode'] = old_mode
-        res['composition_mode'] = context['default_composition_mode']
+        active_ids = context.get('active_ids')
+        default_composition_mode = context.get('default_composition_mode')
+        res['assignation_lines'] = []
+        if template_id:
+            res['body'] = email_template_obj.get_email_template(cr, uid, template_id).body_html
+        if active_ids:
+            lead_ids = lead_obj.browse(cr, uid, active_ids, context=context)
+            if default_composition_mode == 'mass_mail':
+                partner_assigned_ids = lead_obj.search_geo_partner(cr, uid, active_ids, context=context)
+            else:
+                partner_assigned_ids = dict((lead.id, lead.partner_assigned_id and lead.partner_assigned_id.id or False) for lead in lead_ids)
+                res['partner_id'] = lead_ids[0].partner_assigned_id.id
+            for lead in lead_ids:
+                partner_id = partner_assigned_ids.get(lead.id) or False
+                partner = False
+                if partner_id:
+                    partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+                res['assignation_lines'].append(self._convert_to_assignation_line(cr, uid, lead, partner))
         return res
 
-    def get_record_data(self, cr, uid, model, res_id, context=None):
-        """ Override of mail.compose.message, to add default values coming
-            form the related lead.
-        """
-        if context is None:
-            context = {}
-        res = super(crm_lead_forward_to_partner, self).get_record_data(cr, uid, model, res_id, context=context)
-        if model not in ('crm.lead') or not res_id:
-            return res
-        template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'crm_partner_assign_email_template')[1]
-        context['history_mode'] = context.get('history_mode','whole')
-        mail_body_fields = ['partner_id', 'partner_name', 'title', 'function', 'street', 'street2', 'zip', 'city', 'country_id', 'state_id', 'email_from', 'phone', 'fax', 'mobile', 'description']
-        lead = self.pool.get('crm.lead').browse(cr, uid, res_id, context=context)
-        context['mail_body'] = self.pool.get('crm.lead')._mail_body(cr, uid, lead, mail_body_fields, context=context)
-        template = self.generate_email_for_composer(cr, uid, template_id, res_id, context)
-        res['subject'] = template['subject']
-        res['body'] = template['body']
-        return res
-
-    def on_change_history_mode(self, cr, uid, ids, history_mode, model, res_id, context=None):
-        """ Update body when changing history_mode """
-        if context is None:
-            context = {}
-        if model and model == 'crm.lead' and res_id:
-            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}}
-
-    def create(self, cr, uid, values, context=None):
-        """ TDE-HACK: remove 'type' from context, because when viewing an
-            opportunity form view, a default_type is set and propagated
-            to the wizard, that has a not matching type field. """
-        default_type = context.pop('default_type', None)
-        new_id = super(crm_lead_forward_to_partner, self).create(cr, uid, values, context=context)
-        if default_type:
-            context['default_type'] = default_type
-        return new_id
-
     def action_forward(self, cr, uid, ids, context=None):
-        """ Forward the lead to a partner """
-        if context is None:
+        lead_obj = self.pool.get('crm.lead')
+        record = self.browse(cr, uid, ids[0], context=context)
+        email_template_obj = self.pool.get('email.template')
+        try:
+            template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'email_template_lead_forward_mail')[1]
+        except ValueError:
+            raise osv.except_osv(_('Email Template Error'),
+                                 _('The Forward Email Template is not in the database'))
+        try:
+            portal_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')[1]
+        except ValueError:
+            raise osv.except_osv(_('Portal Group Error'),
+                                 _('The Portal group cannot be found'))
+
+        local_context = context.copy()
+        if not (record.forward_type == 'single'):
+            no_email = set()
+            for lead in record.assignation_lines:
+                if lead.partner_assigned_id and not lead.partner_assigned_id.email:
+                    no_email.add(lead.partner_assigned_id.name)
+            if no_email:
+                raise osv.except_osv(_('Email Error'),
+                                    ('Set an email address for the partner(s): %s' % ", ".join(no_email)))
+        if record.forward_type == 'single' and not record.partner_id.email:
+            raise osv.except_osv(_('Email Error'),
+                                ('Set an email address for the partner %s' % record.partner_id.name))
+
+        partners_leads = {}
+        for lead in record.assignation_lines:
+            partner = record.forward_type == 'single' and record.partner_id or lead.partner_assigned_id
+            lead_details = {
+                'lead_link': lead.lead_link,
+                'lead_id': lead.lead_id,
+            }
+            if partner:
+                partner_leads = partners_leads.get(partner.id)
+                if partner_leads:
+                    partner_leads['leads'].append(lead_details)
+                else:
+                    partners_leads[partner.id] = {'partner': partner, 'leads': [lead_details]}
+        stage_id = False
+        if record.assignation_lines and record.assignation_lines[0].lead_id.type == 'lead':
+            try:
+                stage_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', 'stage_portal_lead_assigned')[1]
+            except ValueError:
+                pass
+
+        for partner_id, partner_leads in partners_leads.items():
+            in_portal = False
+            for contact in (partner.child_ids or [partner]):
+                if contact.user_ids:
+                    in_portal = portal_id in [g.id for g in contact.user_ids[0].groups_id]
+
+            local_context['partner_id'] = partner_leads['partner']
+            local_context['partner_leads'] = partner_leads['leads']
+            local_context['partner_in_portal'] = in_portal
+            email_template_obj.send_mail(cr, uid, template_id, ids[0], context=local_context)
+            lead_ids = [lead['lead_id'].id for lead in partner_leads['leads']]
+            values = {'partner_assigned_id': partner_id, 'user_id': partner_leads['partner'].user_id.id}
+            if stage_id:
+                values['stage_id'] = stage_id
+            lead_obj.write(cr, uid, lead_ids, values)
+            self.pool.get('crm.lead').message_subscribe(cr, uid, lead_ids, [partner_id], context=context)
+        return True
+
+    def get_lead_portal_url(self, cr, uid, lead_id, type, context=None):
+        action = type == 'opportunity' and 'action_portal_opportunities' or 'action_portal_leads'
+        try:
+            action_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'crm_partner_assign', action)[1]
+        except ValueError:
+            action_id = False
+        portal_link = "%s/?db=%s#id=%s&action=%s&view_type=form" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname, lead_id, action_id)
+        return portal_link
+
+    def get_portal_url(self, cr, uid, ids, context=None):
+        portal_link = "%s/?db=%s" % (self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'), cr.dbname)
+        return portal_link
+
+    _columns = {
+        'forward_type': fields.selection([('single', 'a single partner: manual selection of partner'), ('assigned', "several partners: automatic assignation, using GPS coordinates and partner's grades"), ], 'Forward selected leads to'),
+        'partner_id': fields.many2one('res.partner', 'Forward Leads To'),
+        'assignation_lines': fields.one2many('crm.lead.assignation', 'forward_id', 'Partner Assignation'),
+        'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
+    }
+
+    _defaults = {
+        'forward_type': lambda self, cr, uid, c: c.get('forward_type') or 'single',
+    }
+
+
+class crm_lead_assignation (osv.TransientModel):
+    _name = 'crm.lead.assignation'
+    _columns = {
+        'forward_id': fields.many2one('crm.lead.forward.to.partner', 'Partner Assignation'),
+        'lead_id': fields.many2one('crm.lead', 'Lead'),
+        'lead_location': fields.char('Lead Location', size=128),
+        'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner'),
+        'partner_location': fields.char('Partner Location', size=128),
+        'lead_link': fields.char('Lead  Single Links', size=128),
+    }
+
+    def on_change_lead_id(self, cr, uid, ids, lead_id, context=None):
+        if not context:
             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]
+        if not lead_id:
+            return {'value': {'lead_location': False}}
+        lead = self.pool.get('crm.lead').browse(cr, uid, lead_id, context=context)
+        lead_location = []
+        if lead.country_id:
+            lead_location.append(lead.country_id.name)
+        if lead.city:
+            lead_location.append(lead.city)
+        return {'value': {'lead_location': ", ".join(lead_location)}}
 
-        lead = self.pool[wizard.model]
-        lead_ids = wizard.res_id and [wizard.res_id] or []
+    def on_change_partner_assigned_id(self, cr, uid, ids, partner_assigned_id, context=None):
+        if not context:
+            context = {}
+        if not partner_assigned_id:
+            return {'value': {'lead_location': False}}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_assigned_id, context=context)
+        partner_location = []
+        if partner.country_id:
+            partner_location.append(partner.country_id.name)
+        if partner.city:
+            partner_location.append(partner.city)
+        return {'value': {'partner_location': ", ".join(partner_location)}}
 
-        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)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index 0fda8c8beaa..26ad08f1528 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="crm_lead_forward_to_partner_form">
             <field name="name">crm_lead_forward_to_partner</field>
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
-                    <field name="model" colspan="2" nolabel="1" invisible="1"/>
-                    <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
-                    <separator string="Forward to Partner" colspan="4"/>
-                    <group col="4">
-                        <field name="history_mode" colspan="4"
-                            on_change="on_change_history_mode(history_mode, model, res_id)"/>
-                        <field name="subject" colspan="4"/>
-                        <field name="partner_ids" colspan="4" widget="many2many_tags_email"/>
-                        <notebook colspan="4">
-                            <page string="Body">
-                                <field name="body"/>
-                            </page>
-                            <page string="Attachments">
-                                <field name="attachment_ids"/>
-                            </page>
-                        </notebook>
+                    <group>
+                        <field name="forward_type" widget="radio" invisible="context.get('hide_forward_type',False)"/>
                     </group>
+                    <group>
+                        <group>
+                            <field name="partner_id" attrs="{'invisible': [('forward_type', 'in', ['assigned',False])], 'required': [('forward_type', '=', 'single')]}"  />
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                    <field name="assignation_lines" attrs="{'invisible': [('forward_type', 'in', ['single',False])]}">
+                        <tree create="false" editable="bottom">
+                            <field name="lead_id" readonly="1" on_change="on_change_lead_id(lead_id)"/>
+                            <field name="lead_location" readonly="1"/>
+                            <field name="partner_assigned_id" on_change="on_change_partner_assigned_id(partner_assigned_id)"/>
+                            <field name="partner_location" readonly="1"/>
+                        </tree>
+                    </field>
+                    <notebook colspan="4" groups="base.group_no_one">
+                        <page string="Email Template">
+                            <field name="body" readonly="1"/>
+                        </page>
+                    </notebook>
                     <footer>
-                        <button name="action_forward" string="Send" type="object"
-                            class="oe_highlight"/>
+                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" special="cancel"
-                            class="oe_link"/>
+                        <button string="Cancel" special="cancel" class="oe_link"/>
                     </footer>
                 </form>
             </field>
@@ -45,14 +47,11 @@
             <field name="target">new</field>
         </record>
 
-        <act_window id="action_crm_send_mass_forward"
-            multi="True"
-            key2="client_action_multi" name="Mass forward to partner"
-            res_model="crm.lead.forward.to.partner" src_model="crm.lead"
-            view_mode="form" target="new" view_type="form"
-            context="{'default_composition_mode' : 'mass_mail'}"
-            view_id="crm_lead_forward_to_partner_form"
-        />
+        <act_window id="action_crm_send_mass_forward" multi="True"
+            key2="client_action_multi" name="Forward to Partner" res_model="crm.lead.forward.to.partner"
+            src_model="crm.lead" view_mode="form" target="new" view_type="form"
+            groups="base.group_sale_manager"
+            context="{'default_composition_mode' : 'mass_mail'}" view_id="crm_lead_forward_to_partner_form" />
 
     </data>
 </openerp>
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index 851c2abfba4..96d00e76932 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -16,12 +16,8 @@
                             <field name="user_id"/>
 
                             <field string="Timebox" name="timebox_id"/>
-                            <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/>
-                            <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/>
-
-                            <field name="state"/>
-                            <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
-                            <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
+                            <button name="prev_timebox" type="object" string="Previous"/>
+                            <button name="next_timebox" type="object" string="Next"/>
                         </tree>
                     </field>
                 </page>
diff --git a/addons/crm_todo/i18n/da.po b/addons/crm_todo/i18n/da.po
new file mode 100644
index 00000000000..1214801638f
--- /dev/null
+++ b/addons/crm_todo/i18n/da.po
@@ -0,0 +1,85 @@
+# Danish 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-19 17:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16673)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Lead"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr ""
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr ""
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr ""
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr ""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr ""
diff --git a/addons/decimal_precision/i18n/ko.po b/addons/decimal_precision/i18n/ko.po
new file mode 100644
index 00000000000..0b3df57f440
--- /dev/null
+++ b/addons/decimal_precision/i18n/ko.po
@@ -0,0 +1,49 @@
+# 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-06-28 09:31+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-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "자리수"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy"
+msgstr "소숫점 정확성"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "사용량"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr ""
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "소수점 정확성"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index 477315dfc9b..226b5e493ab 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -25,11 +25,9 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'property_delivery_carrier': fields.property(
-          'delivery.carrier',
           type='many2one',
           relation='delivery.carrier',
           string="Delivery Method",
-          view_load=True,
           help="This delivery method will be used when invoicing from picking."),
     }
 
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 86a518ebca9..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)
 
diff --git a/addons/document/document.py b/addons/document/document.py
index 54f12e204fe..91af97246b8 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -68,11 +68,14 @@ class document_file(osv.osv):
     ]
 
     def check(self, cr, uid, ids, mode, context=None, values=None):
-        """Check access wrt. res_model, relax the rule of ir.attachment parent
-        With 'document' installed, everybody will have access to attachments of
-        any resources they can *read*.
-        """
-        return super(document_file, self).check(cr, uid, ids, mode='read', context=context, values=values)
+        """Overwrite check to verify access on directory to validate specifications of doc/access_permissions.rst"""
+        super(document_file, self).check(cr, uid, ids, mode, context=context, values=values)
+        if ids:
+            self.pool.get('ir.model.access').check(cr, uid, 'document.directory', mode)
+
+            # use SQL to avoid recursive loop on read
+            cr.execute('SELECT DISTINCT parent_id from ir_attachment WHERE id in %s AND parent_id is not NULL', (tuple(ids),))
+            self.pool.get('document.directory').check_access_rule(cr, uid, [parent_id for (parent_id,) in cr.fetchall()], mode, context=context)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         # Grab ids, bypassing 'count'
diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index f74cfe02a21..7f885018001 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -66,7 +66,7 @@ class document_page(osv.osv):
         'create_date': fields.datetime("Created on", select=True, readonly=True),
         'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
         'write_date': fields.datetime("Modification Date", select=True, readonly=True),
-        'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
+        'write_uid': fields.many2one('res.users', "Last Contributor", select=True, readonly=True),
     }
     _defaults = {
         'type':'content',
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 4d0b5596e75..9d02b47d265 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -88,7 +88,11 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wiki_tree"/>
             <field name="search_view_id" ref="view_wiki_filter"/>
-            <field name="help">Create web pages</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new web page.
+              </p>
+            </field>
         </record>
         <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="10"/>
         <record id="action_category" model="ir.actions.act_window">
diff --git a/addons/edi/i18n/is.po b/addons/edi/i18n/is.po
new file mode 100644
index 00000000000..c3b37f49f46
--- /dev/null
+++ b/addons/edi/i18n/is.po
@@ -0,0 +1,87 @@
+# Icelandic 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-07-10 12:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@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-07-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: edi
+#. openerp-web
+#: code:addons/edi/static/src/js/edi.js:67
+#, python-format
+msgid "Reason:"
+msgstr "Ástæða:"
+
+#. 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 "Gjaldmiðill"
+
+#. 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 "Viðskipta aðili"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_edi
+msgid "EDI Subsystem"
+msgstr ""
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index bfd59dae15a..1b9e0c4df08 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -126,7 +126,7 @@ 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')
diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py
index d1cf5b28431..3f091fd8645 100644
--- a/addons/email_template/__init__.py
+++ b/addons/email_template/__init__.py
@@ -22,5 +22,6 @@
 import email_template
 import wizard
 import res_partner
+import ir_actions
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 1dc3baaf63c..b7977660134 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -59,6 +59,7 @@ campaigns on any OpenERP document.
         'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
         'res_partner_view.xml',
+        'ir_actions_view.xml',
         'wizard/mail_compose_message_view.xml',
         'security/ir.model.access.csv'
     ],
diff --git a/addons/email_template/doc/changelog.rst b/addons/email_template/doc/changelog.rst
new file mode 100644
index 00000000000..77e342c920a
--- /dev/null
+++ b/addons/email_template/doc/changelog.rst
@@ -0,0 +1,12 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+ - ``mail.compose.message``: added support of ``mail_server_id`` from template
+ - Server action update
+
+  - added `email` server action type, now entirely based on email templates.
\ No newline at end of file
diff --git a/addons/email_template/doc/index.rst b/addons/email_template/doc/index.rst
new file mode 100644
index 00000000000..58cf9413601
--- /dev/null
+++ b/addons/email_template/doc/index.rst
@@ -0,0 +1,13 @@
+Email Template module documentation
+===================================
+
+Email Template documentation topics
+'''''''''''''''''''''''''''''''''''
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 2a7990e301b..2e3405ed079 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -24,8 +24,8 @@ import base64
 import logging
 
 import openerp
+from openerp import SUPERUSER_ID
 from openerp.osv import osv, fields
-from openerp.osv import fields
 from openerp import tools
 from openerp.tools.translate import _
 from urllib import urlencode, quote as quote
@@ -191,7 +191,6 @@ class email_template(osv.osv):
     }
 
     def create_action(self, cr, uid, ids, context=None):
-        vals = {}
         action_obj = self.pool.get('ir.actions.act_window')
         data_obj = self.pool.get('ir.model.data')
         for template in self.browse(cr, uid, ids, context=context):
@@ -199,7 +198,7 @@ class email_template(osv.osv):
             model_data_id = data_obj._get_id(cr, uid, 'mail', 'email_compose_message_wizard_form')
             res_id = data_obj.browse(cr, uid, model_data_id, context=context).res_id
             button_name = _('Send Mail (%s)') % template.name
-            vals['ref_ir_act_window'] = action_obj.create(cr, uid, {
+            act_id = action_obj.create(cr, SUPERUSER_ID, {
                  'name': button_name,
                  'type': 'ir.actions.act_window',
                  'res_model': 'mail.compose.message',
@@ -211,27 +210,29 @@ class email_template(osv.osv):
                  'target': 'new',
                  'auto_refresh':1
             }, context)
-            vals['ref_ir_value'] = self.pool.get('ir.values').create(cr, uid, {
+            ir_values_id = self.pool.get('ir.values').create(cr, SUPERUSER_ID, {
                  'name': button_name,
                  'model': src_obj,
                  'key2': 'client_action_multi',
-                 'value': "ir.actions.act_window," + str(vals['ref_ir_act_window']),
+                 'value': "ir.actions.act_window,%s" % act_id,
                  'object': True,
              }, context)
-        self.write(cr, uid, ids, {
-                    'ref_ir_act_window': vals.get('ref_ir_act_window',False),
-                    'ref_ir_value': vals.get('ref_ir_value',False),
-                }, context)
+
+            template.write({
+                'ref_ir_act_window': act_id,
+                'ref_ir_value': ir_values_id,
+            })
+
         return True
 
     def unlink_action(self, cr, uid, ids, context=None):
         for template in self.browse(cr, uid, ids, context=context):
             try:
                 if template.ref_ir_act_window:
-                    self.pool.get('ir.actions.act_window').unlink(cr, uid, template.ref_ir_act_window.id, context)
+                    self.pool.get('ir.actions.act_window').unlink(cr, SUPERUSER_ID, template.ref_ir_act_window.id, context)
                 if template.ref_ir_value:
                     ir_values_obj = self.pool.get('ir.values')
-                    ir_values_obj.unlink(cr, uid, template.ref_ir_value.id, context)
+                    ir_values_obj.unlink(cr, SUPERUSER_ID, template.ref_ir_value.id, context)
             except Exception:
                 raise osv.except_osv(_("Warning"), _("Deletion of the action record failed."))
         return True
diff --git a/addons/email_template/ir_actions.py b/addons/email_template/ir_actions.py
new file mode 100644
index 00000000000..bd860785da4
--- /dev/null
+++ b/addons/email_template/ir_actions.py
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2013 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 fields, osv
+
+
+class actions_server(osv.Model):
+    """ Add email option in server actions. """
+    _name = 'ir.actions.server'
+    _inherit = ['ir.actions.server']
+
+    def _get_states(self, cr, uid, context=None):
+        res = super(actions_server, self)._get_states(cr, uid, context=context)
+        res.insert(0, ('email', 'Send Email'))
+        return res
+
+    _columns = {
+        'email_from': fields.char('From',
+                                  help="Sender address; define the template to see its value. If not set, the default "
+                                  "value will be the author's email alias if configured, or email address."),
+        'email_to': fields.char('To (Emails)',
+                                help="Comma-separated recipient addresses; define the template to see its value"),
+        'partner_to': fields.char('To (Partners)',
+                                  help="Comma-separated ids of recipient partners; define the template to see its value"),
+        'subject': fields.char('Subject',
+                               help="Email subject; define the template to see its value"),
+        'body_html': fields.text('Body',
+                                 help="Rich-text/HTML version of the message; define the template to see its value"),
+        'template_id': fields.many2one('email.template', 'Email Template', ondelete='set null',
+                                       help="Define the email template to use for the email to send.")
+    }
+
+    def on_change_template_id(self, cr, uid, ids, template_id, context=None):
+        """ Render the raw template in the server action fields. """
+        if template_id:
+            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))
+            if not values.get('email_from'):
+                return {'warning': {'title': 'Incomplete template', 'message': 'Your template should define email_from'}, 'value': values}
+        else:
+            values = self.default_get(cr, uid, ['subject', 'body_html', 'email_from', 'email_to', 'partner_to'], context=context)
+
+        return {'value': values}
+
+    def create(self, cr, uid, values, context=None):
+        if values.get('template_id'):
+            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, values.get('template_id'), fields, context)
+            values.update(dict((field, template_values[field]) for field in fields if template_values.get(field)))
+        return super(actions_server, self).create(cr, uid, values, context=context)
+
+    def write(self, cr, uid, ids, values, context=None):
+        if values.get('template_id'):
+            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, values.get('template_id'), fields, context)
+            values.update(dict((field, template_values[field]) for field in fields if template_values.get(field)))
+        return super(actions_server, self).write(cr, uid, ids, values, context=context)
+
+    def run_action_email(self, cr, uid, action, eval_context=None, context=None):
+        if not action.template_id or not context.get('active_id'):
+            return False
+        self.pool['email.template'].send_mail(cr, uid, action.template_id.id, context.get('active_id'),
+                                              force_send=False, raise_exception=False, context=context)
+        return False
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/ir_actions_view.xml b/addons/email_template/ir_actions_view.xml
new file mode 100644
index 00000000000..fae9c364312
--- /dev/null
+++ b/addons/email_template/ir_actions_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_server_action_form_template">
+            <field name="name">ir.actions.server.form</field>
+            <field name="model">ir.actions.server</field>
+            <field name="inherit_id" ref="base.view_server_action_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//page[@name='code']" position="after">
+                    <page string="Email" autofocus="autofocus"
+                            attrs="{'invisible': [('state', '!=', 'email')]}">
+                        <p attrs="{'invisible': [('model_id', '!=', False)]}">
+                            Please set the Base Model before setting the action details.
+                        </p>
+                        <group attrs="{'invisible': [('model_id', '=', False)]}">
+                            <field name="template_id"
+                                    on_change='on_change_template_id(template_id)'
+                                    domain="[('model_id', '=', model_id)]"
+                                    attrs="{'required': [('state', '=', 'email')]}"/>
+                            <p colspan="2" attrs="{'invisible': [('template_id', '!=', False)]}">
+                                Choose a template to display its values.
+                            </p>
+                            <p colspan="2" attrs="{'invisible': [('template_id', '=', False)]}">
+                                The values displayed hereunder are informative. When sending the email, the values
+                                will be taken from the email template.
+                            </p>
+                        </group>
+                        <group attrs="{'invisible': ['|', ('model_id', '=', False), ('template_id', '=', False)]}">
+                            <label for="email_from"/>
+                            <div>
+                                <field name="email_from" nolabel="1'" readonly="1"
+                                        attrs="{'required': [('state', '=', 'email')]}"/>
+                                <p attrs="{'invisible': [('email_from', '!=', False)]}">
+                                    Your template does not defined any email_from. Please update your template.
+                                </p>
+                            </div>
+                            <field name="email_to" readonly="1"/>
+                            <field name="partner_to" readonly="1"/>
+                            <field name="subject" readonly="1" attrs="{'required': [('state', '=', 'email')]}"/>
+                            <field name="body_html" readonly="1" attrs="{'required': [('state', '=', 'email')]}"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/email_template/tests/__init__.py b/addons/email_template/tests/__init__.py
index d63c5634cc3..9418985b06c 100644
--- a/addons/email_template/tests/__init__.py
+++ b/addons/email_template/tests/__init__.py
@@ -18,10 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from . import test_mail
+from . import test_mail, test_ir_actions
 
 checks = [
     test_mail,
+    test_ir_actions,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/email_template/tests/test_ir_actions.py b/addons/email_template/tests/test_ir_actions.py
new file mode 100644
index 00000000000..d323ee36c1f
--- /dev/null
+++ b/addons/email_template/tests/test_ir_actions.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    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.addons.base.tests.test_ir_actions import TestServerActionsBase
+
+
+class TestServerActionsEmail(TestServerActionsBase):
+
+    def test_00_state_email(self):
+        """ Test ir.actions.server email type """
+        cr, uid = self.cr, self.uid
+
+        # create email_template
+        template_id = self.registry('email.template').create(cr, uid, {
+            'name': 'TestTemplate',
+            'email_from': 'myself@example.com',
+            'email_to': 'brigitte@example.com',
+            'partner_to': '[%s]' % self.test_partner_id,
+            'model_id': self.res_partner_model_id,
+            'subject': 'About ${object.name}',
+            'body_html': '<p>Dear ${object.name}, your parent is ${object.parent_id and object.parent_id.name or "False"}</p>',
+        })
+
+        self.ir_actions_server.write(cr, uid, self.act_id, {
+            'state': 'email',
+            'template_id': template_id,
+        })
+        run_res = self.ir_actions_server.run(cr, uid, [self.act_id], context=self.context)
+        self.assertFalse(run_res, 'ir_actions_server: email server action correctly finished should return False')
+
+        # check an email is waiting for sending
+        mail_ids = self.registry('mail.mail').search(cr, uid, [('subject', '=', 'About TestingPartner')])
+        self.assertEqual(len(mail_ids), 1, 'ir_actions_server: TODO')
+        # check email content
+        mail = self.registry('mail.mail').browse(cr, uid, mail_ids[0])
+        self.assertEqual(mail.body, '<p>Dear TestingPartner, your parent is False</p>',
+                         'ir_actions_server: TODO')
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 7f44828ce15..0aab765efbf 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -22,6 +22,7 @@
 from openerp import tools
 from openerp.osv import osv, fields
 
+
 def _reopen(self, res_id, model):
     return {'type': 'ir.actions.act_window',
             'view_mode': 'form',
@@ -34,7 +35,8 @@ def _reopen(self, res_id, model):
             'context': {
                 'default_model': model,
             },
-    }
+            }
+
 
 class mail_compose_message(osv.TransientModel):
     _inherit = 'mail.compose.message'
@@ -54,24 +56,28 @@ class mail_compose_message(osv.TransientModel):
             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. """
+        if context is None:
+            context = {}
+        wizard_context = dict(context)
         for wizard in self.browse(cr, uid, ids, context=context):
+            if wizard.template_id:
+                wizard_context['mail_notify_user_signature'] = False  # template user_signature is added when generating body_html
             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:
+                if attachment in wizard.template_id.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)
+        return super(mail_compose_message, self).send_mail(cr, uid, ids, context=wizard_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', 'attachment_ids']
+            fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc', 'reply_to', 'attachment_ids', 'mail_server_id']
             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:
@@ -91,7 +97,7 @@ class mail_compose_message(osv.TransientModel):
                 }
                 values['attachment_ids'].append(ir_attach_obj.create(cr, uid, data_attach, context=context))
         else:
-            values = self.default_get(cr, uid, ['subject', 'body', 'email_from', 'email_to', 'email_cc', 'partner_to', 'reply_to', 'attachment_ids'], context=context)
+            values = self.default_get(cr, uid, ['subject', 'body', 'email_from', 'email_to', 'email_cc', 'partner_to', 'reply_to', 'attachment_ids', 'mail_server_id'], context=context)
 
         if values.get('body_html'):
             values['body'] = values.pop('body_html')
@@ -146,12 +152,13 @@ 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', 'attachment_ids', 'attachments']
+        fields = ['subject', 'body_html', 'email_from', 'email_to', 'partner_to', 'email_cc',  'reply_to', 'attachment_ids', 'attachments', 'mail_server_id']
         values = dict((field, template_values[field]) for field in fields if template_values.get(field))
         values['body'] = values.pop('body_html', '')
 
         # transform email_to, email_cc into partner_ids
-        partner_ids = self._get_or_create_partners_from_values(cr, uid, values, context=context)
+        ctx = dict((k, v) for k, v in (context or {}).items() if not k.startswith('default_'))
+        partner_ids = self._get_or_create_partners_from_values(cr, uid, values, context=ctx)
         # legacy template behavior: void values do not erase existing values and the
         # related key is removed from the values dict
         if partner_ids:
diff --git a/addons/event/event.py b/addons/event/event.py
index eb18afd747c..3c04f5c1baa 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -172,6 +172,12 @@ class event_event(osv.osv):
                         continue
         return res
 
+    def _get_visibility_selection(self, cr, uid, context=None):
+        return [('public', 'All Users'),
+                ('employees', 'Employees Only')]
+    # Lambda indirection method to avoid passing a copy of the overridable method when declaring the field
+    _visibility_selection = lambda self, *args, **kwargs: self._get_visibility_selection(*args, **kwargs)
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
@@ -209,11 +215,14 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
+        'visibility': fields.selection(_visibility_selection, 'Privacy / Visibility',
+            select=True, required=True),
     }
     _defaults = {
         'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
+        'visibility': 'employees',
     }
 
     def subscribe_to_event(self, cr, uid, ids, context=None):
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4f5e33eeafd..a9831720abf 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -76,6 +76,7 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
+                            <field name="visibility"/>
                         </div>
                         <group>
                             <group>
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
index fc4afa56e69..b51e1fbb9d3 100644
--- a/addons/event/res_partner.py
+++ b/addons/event/res_partner.py
@@ -21,15 +21,13 @@
 
 from openerp.osv import fields, osv
 
+
 class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
         'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker."),
-        'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True),
-        'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True),
     }
-    
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index c3e8073a7ae..7e97f80e30d 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -2,9 +2,8 @@
 <openerp>
     <data>
 
-         <!--  Partners inherited form -->
-
-       <record id="view_event_partner_info_form" model="ir.ui.view">
+        <!--  Partners inherited form -->
+        <record id="view_event_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.event.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -12,34 +11,8 @@
                 <field name="supplier" position="after">
                     <field name="speaker"/>
                 </field>
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_event" string="Events">
-                        <field name="event_ids" colspan="4" nolabel="1">
-                            <tree string="Events">
-                                <field name="name" string="Event"/>
-                                <field name="main_speaker_id"/>
-                            </tree>
-                        </field>
-                    </group>
-                    <group name="grp_registration" string="Registrations">
-                        <field name="event_registration_ids" colspan="4" nolabel="1">
-                            <tree string="Events Registration">
-                                <field name="event_begin_date" string="Date"/>
-                                <field name="event_id" />
-                                <field name="nb_register"/>
-                                <field name="state"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                <button name="button_reg_close" string="Close Registration" states="open" type="object" icon="gtk-close"/>
-                                <button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                            </tree>
-                        </field>
-                    </group>
-                </xpath>
             </field>
-       </record>
+        </record>
 
    </data>
 </openerp>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index 83039ca4686..90a232731a7 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -25,25 +25,35 @@
     <data noupdate="1">
 
         <!-- Multi - Company Rules -->
-        <record model="ir.rule" id="event_event_comp_rule">
-            <field name="name">Event multi-company</field>
+        <record model="ir.rule" id="event_event_company_rule">
+            <field name="name">Event: multi-company</field>
             <field name="model_id" ref="model_event_event"/>
             <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="event_registration_comp_rule">
-            <field name="name">Event Registration multi-company</field>
+        <record model="ir.rule" id="event_registration_company_rule">
+            <field name="name">Event/Registration: multi-company</field>
             <field name="model_id" ref="model_event_registration"/>
             <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="report_event_registration_comp_rule">
-            <field name="name">Report Event Registration multi-company</field>
+        <record model="ir.rule" id="report_event_registration_company_rule">
+            <field name="name">Event/Report Registration: multi-company</field>
             <field name="model_id" ref="model_report_event_registration"/>
             <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>
 
     </data>
diff --git a/addons/event/static/src/img/icon.png b/addons/event/static/description/icon.png
similarity index 100%
rename from addons/event/static/src/img/icon.png
rename to addons/event/static/description/icon.png
diff --git a/addons/event_sale/i18n/da.po b/addons/event_sale/i18n/da.po
new file mode 100644
index 00000000000..fb3faa70fc0
--- /dev/null
+++ b/addons/event_sale/i18n/da.po
@@ -0,0 +1,90 @@
+# Danish 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-19 17:36+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16673)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sales order line."
+msgstr ""
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr ""
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr ""
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr ""
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
diff --git a/addons/fetchmail/i18n/ko.po b/addons/fetchmail/i18n/ko.po
new file mode 100644
index 00000000000..a4b6e4e03b9
--- /dev/null
+++ b/addons/fetchmail/i18n/ko.po
@@ -0,0 +1,322 @@
+# 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-06-28 09:25+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-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "확정됨"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr "서버 이름"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr "첨부파일 보관"
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#. module: fetchmail
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr "수신 이메일 게이트웨이 구성"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr "지금 가져오기"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr "수신 메일 서버"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr "서버유형 IMAP."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP 서버"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr "로컬 서버"
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "Status"
+msgstr "상태"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP 서버"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_config_settings
+msgid "fetchmail.config.settings"
+msgstr "fetchmail.config.settings"
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr "마지막으로 가져온 날짜"
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "이메일 개수"
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr "원본 유지"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced Options"
+msgstr "고급 옵션"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr "구성"
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "스크립트"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr "수신 메일 서버"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:163
+#, python-format
+msgid "Connection test failed!"
+msgstr "연결 시험에 실패함!"
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr "사용자명"
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr "메일서버의 호스트이름 또는 IP"
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr "이름"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:163
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s."
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr "시험 & 확정"
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr "서버 동작"
+
+#. module: fetchmail
+#: field:mail.mail,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr "수신메일서버"
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "메시지"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr "수신메일서버 검색"
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr "활성"
+
+#. module: fetchmail
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "발신 이메일"
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "서버 우선 순위"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr "IMAP 서버"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "암호"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr "수신 메일에 실행할 동작"
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr "서버 유형"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr "로그인 정보"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr "서버 정보"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr "SSL이 필요할 경우."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr "고급"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "서버 & 로그인"
+
+#. module: fetchmail
+#: help:fetchmail.server,object_id:0
+msgid ""
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "확정되지 않음"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP 서버"
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "포트"
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index dc2aabb54fc..483f989fcde 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -351,7 +351,7 @@ class fleet_vehicle(osv.Model):
         'fuel_type': fields.selection([('gasoline', 'Gasoline'), ('diesel', 'Diesel'), ('electric', 'Electric'), ('hybrid', 'Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle'),
         'horsepower': fields.integer('Horsepower'),
         'horsepower_tax': fields.float('Horsepower Taxation'),
-        'power': fields.integer('Power (kW)', help='Power in kW of the vehicle'),
+        'power': fields.integer('Power', help='Power in kW of the vehicle'),
         'co2': fields.float('CO2 Emissions', help='CO2 emissions of the vehicle'),
         'image': fields.related('model_id', 'image', type="binary", string="Logo"),
         'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo"),
@@ -392,9 +392,12 @@ class fleet_vehicle(osv.Model):
         }
 
     def create(self, cr, uid, data, context=None):
+        if not context:
+            context = {}
+        context.update({'mail_create_nolog': True})
         vehicle_id = super(fleet_vehicle, self).create(cr, uid, data, context=context)
         vehicle = self.browse(cr, uid, vehicle_id, context=context)
-        self.message_post(cr, uid, [vehicle_id], body=_('Vehicle %s has been added to the fleet!') % (vehicle.license_plate), context=context)
+        self.message_post(cr, uid, [vehicle_id], body=_('%s %s has been added to the fleet!') % (vehicle.model_id.name,vehicle.license_plate), context=context)
         return vehicle_id
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 4d0e6298129..05030cb3488 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -13,7 +13,7 @@
                             <h1>
                                 <field name="modelname" />
                             </h1>
-                            <label for="brand" class="oe_edit_only"/>
+                            <label for="brand_id" class="oe_edit_only"/>
                             <h2>
                                 <field name="brand_id" on_change="on_change_brand(brand_id)"/>
                             </h2>
@@ -242,11 +242,17 @@
                             <group string="Engine Options">
                                 <field name="transmission" />
                                 <field name="fuel_type" />
-                                <field name="co2" />
+                                <label for="co2"/>
+                                <div>
+                                    <field name="co2" class="oe_inline"/> g/km
+                                </div>
                                 <field name="horsepower" />
                                 <field name="horsepower_tax" />
-                                <field name="power" />
-                            </group>  
+                                <label for="power"/>
+                                <div>
+                                    <field name="power" class="oe_inline"/> kW
+                                </div>
+                            </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
@@ -287,6 +293,10 @@
                     <field name="location"/>
                     <field name="state_id" />
                     <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
+                    <group expand="1" string="Group By...">
+                        <filter name="groupby_status" context="{'group_by' : 'state_id'}" string="Status"/>
+                        <filter name="groupby_model" context="{'group_by' : 'model_id'}" string="Model"/>
+                    </group>
                </search>
             </field>
         </record>
@@ -400,7 +410,7 @@
                             <group string="Contract details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
                                 <field name="cost_subtype_id" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
-                                <field name="amount" string="Activation Cost"/>
+                                <field name="amount" string="Activation Cost" help="Cost that is paid only once at the creation of the contract"/>
                                 <label for="cost_generated"/>
                                 <div>
                                     <field name="cost_generated" class="oe_inline" attrs="{'invisible': [('cost_frequency','=','no')]}" />
@@ -440,7 +450,7 @@
                                 </group>
                                 <div class="oe_right"><group><field name="sum_cost" string="Indicative Costs Total"/></group></div>
                             </page>
-                            <page string="Generated Costs">
+                            <page string="Generated Recurring Costs">
                                 <group>
                                     <field name="generated_cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" sum="amount">
                                         <tree version="7.0" editable="bottom" >
@@ -591,6 +601,9 @@
             <field name="view_mode">tree,graph</field>
             <field name="context">{"search_default_groupby_vehicle" : True}</field>
             <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new odometer log. 
+              </p>
               <p>
                 Here you can add various odometer entries for all vehicles.
                 You can also show odometer value for a particular vehicle using
@@ -701,7 +714,7 @@
                             <group string="Services Details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
                                 <field name="cost_subtype_id" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
-                                <field name="amount" string="Price"/>
+                                <field name="amount"/>
                             </group>
                             <group string="Odometer Details">
                                 <label for="odometer"/>
@@ -723,7 +736,7 @@
                             <field name="cost_ids" nolabel="1">
                                 <tree string="Included Services" version="7.0" editable="bottom">
                                     <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
-                                    <field name="amount" sum="Price" string="Cost"/>
+                                    <field name="amount" sum="Price" string="Indicative Cost"/>
                                 </tree>
                             </field>
                         </group>
@@ -764,6 +777,17 @@
             </field>
         </record>
 
+        <record model='ir.ui.view' id='fleet_vehicle_log_services_search'>
+            <field name="name">fleet.vehicle.log.services.search</field>
+            <field name="model">fleet.vehicle.log.services</field>
+            <field name="arch" type="xml">
+                <search string="Services Logs" >
+                    <field name="vehicle_id"/>
+                    <field name="cost_subtype_id"/>
+                </search>
+            </field>
+        </record>
+
         <record model='ir.actions.act_window' id='fleet_vehicle_log_services_act'>
             <field name="name">Vehicles Services Logs</field>
             <field name="res_model">fleet.vehicle.log.services</field>
@@ -786,7 +810,7 @@
             <field name="name">fleet.service.type.tree</field>
             <field name="model">fleet.service.type</field>
             <field name="arch" type="xml">
-                <tree string="Service types" editable="bottom">
+                <tree string="Service types" editable="top">
                     <field name="name" />
                     <field name="category"/>
                 </tree>
diff --git a/addons/fleet/i18n/bg.po b/addons/fleet/i18n/bg.po
new file mode 100644
index 00000000000..503b13d7840
--- /dev/null
+++ b/addons/fleet/i18n/bg.po
@@ -0,0 +1,1912 @@
+# Bulgarian 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-06-19 10:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bulgarian <bg@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-20 05:17+0000\n"
+"X-Generator: Launchpad (build 16673)\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/static/src/img/icon.png b/addons/fleet/static/description/icon.png
similarity index 100%
rename from addons/fleet/static/src/img/icon.png
rename to addons/fleet/static/description/icon.png
diff --git a/addons/google_base_account/__init__.py b/addons/google_base_account/__init__.py
index e1a476431af..44a5aabe277 100644
--- a/addons/google_base_account/__init__.py
+++ b/addons/google_base_account/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import google_base_account
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index b4d996f2807..99678d2785d 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -30,10 +30,9 @@ The module adds google user in res user.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
+    'depends': ['base_setup'],
     'data': [
-        'google_base_account_view.xml',
-        'wizard/google_login_view.xml',
+        'google_base_account_data.xml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index 06e5643344c..50fbf233ce6 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -19,14 +19,48 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
-    
-class res_users(osv.osv):
-    _inherit = "res.users"
-    _columns = {
-        'gmail_user': fields.char('Username', size=64,),
-        'gmail_password': fields.char('Password', size=64),
-    }
+from openerp.osv import osv
+from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
+
+import urllib
+import urllib2
+import simplejson
+
+
+class google_service(osv.osv_memory):
+    _name = 'google.service'
+
+    def generate_refresh_token(self, cr, uid, service, authorization_code, context=None):
+        if authorization_code:
+            ir_config = self.pool['ir.config_parameter']
+            client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service)
+            client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_secret' % service)
+            redirect_uri = ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri')
+
+            #Get the Refresh Token From Google And store it in ir.config_parameter
+            headers = {"Content-type": "application/x-www-form-urlencoded"}
+            data = dict(code=authorization_code, client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri, grant_type="authorization_code")
+            data = urllib.urlencode(data)
+            try:
+                req = urllib2.Request("https://accounts.google.com/o/oauth2/token", data, headers)
+                content = urllib2.urlopen(req).read()
+            except urllib2.HTTPError:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
+
+            content = simplejson.loads(content)
+        return content.get('refresh_token')
+
+    def _get_google_token_uri(self, cr, uid, service, scope, context=None):
+        ir_config = self.pool['ir.config_parameter']
+        params = {
+            'scope': scope,
+            'redirect_uri': ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri'),
+            'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service),
+            'response_type': 'code',
+            'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service),
+        }
+        uri = 'https://accounts.google.com/o/oauth2/auth?%s' % urllib.urlencode(params)
+        return uri
 
 # vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/google_base_account/google_base_account_data.xml b/addons/google_base_account/google_base_account_data.xml
new file mode 100644
index 00000000000..c6748df7dc9
--- /dev/null
+++ b/addons/google_base_account/google_base_account_data.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+    	<record id="config_google_redirect_uri" model="ir.config_parameter">
+            <field name="key">google_redirect_uri</field>
+            <field name="value">urn:ietf:wg:oauth:2.0:oob</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
deleted file mode 100644
index 8613582692f..00000000000
--- a/addons/google_base_account/google_base_account_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record id="view_users_gogole_form" model="ir.ui.view">
-            <field name="name">res.users.google.form1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook" position="inside">
-                    <page string="Synchronization">
-                        <group string="Google Account" colspan="4">
-                            <field name="gmail_user"/>
-                            <field name="gmail_password" password="True"/>
-                        </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
deleted file mode 100644
index 1771d99b51e..00000000000
--- a/addons/google_base_account/wizard/google_login.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from openerp.osv import fields,osv
-from openerp.tools.translate import _
-try:
-    import gdata.contacts.service
-    import gdata.contacts.client
-    import gdata.calendar.service
-except ImportError:
-    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
-
-class google_login(osv.osv_memory):
-    _description ='Google Contact'
-    _name = 'google.login'
-    _columns = {
-        'user': fields.char('Google Username', size=64, required=True),
-        'password': fields.char('Google Password', size=64),
-    }
-
-    def google_login(self, user, password, type='', context=None):
-        if type == 'group':
-            gd_client = gdata.contacts.service.ContactsService()
-        elif type == 'contact':
-            gd_client = gdata.contacts.service.ContactsService()
-        elif type == 'calendar':
-            gd_client = gdata.calendar.service.CalendarService()
-        elif type =='docs_client':
-            gd_client = gdata.docs.client.DocsClient()
-        else:
-            gd_client = gdata.contacts.service.ContactsService()
-        try:
-            gd_client.ClientLogin(user, password, gd_client.source)
-        except Exception:
-            return False
-        return gd_client
-
-
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(google_login, self).default_get(cr, uid, fields, context=context)
-        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
-        if 'user' in fields:
-            res.update({'user': user_obj.gmail_user})
-        if 'password' in fields:
-            res.update({'password': user_obj.gmail_password})
-        return res
-
-    def login(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids)[0]
-        user = data['user']
-        password = data['password']
-        if self.google_login(user, password):
-            res = {
-                   'gmail_user': user,
-                   'gmail_password': password
-            }
-            self.pool.get('res.users').write(cr, uid, uid, res, context=context)
-        else:
-            raise osv.except_osv(_('Error!'), _("Authentication failed. Check the user and password."))
-
-        return self._get_next_action(cr, uid, context=context)
-
-    def _get_next_action(self, cr, uid, context=None):
-        return {'type': 'ir.actions.act_window_close'}
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_base_account/wizard/google_login_view.xml b/addons/google_base_account/wizard/google_login_view.xml
deleted file mode 100644
index ed345ab5a0f..00000000000
--- a/addons/google_base_account/wizard/google_login_view.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_google_login_form">
-            <field name="name">google.login.form</field>
-            <field name="model">google.login</field>
-            <field name="arch" type="xml">
-                <form string="Google login"  version="7.0">
-                    <group>
-                        <field name="user" placeholder="e.g. user@gmail.com"/>
-                        <field name="password" password="True"/>
-                    </group>
-                    <footer>
-                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-        
-        <!-- 
-            Login Action 
-        -->
-        <record model="ir.actions.act_window" id="act_google_login_form">
-          <field name="name">Google Login</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.login</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-          <field name="view_id" ref="view_google_login_form" />
-        </record>
-    </data>
-</openerp>
diff --git a/addons/google_docs/__init__.py b/addons/google_docs/__init__.py
deleted file mode 100644
index dd6285502c0..00000000000
--- a/addons/google_docs/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-import google_docs
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
deleted file mode 100644
index 2fd1976ae3b..00000000000
--- a/addons/google_docs/google_docs.py
+++ /dev/null
@@ -1,193 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2012 OpenERP SA (<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/>.
-#
-##############################################################################
-import logging
-from datetime import datetime
-
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-_logger = logging.getLogger(__name__)
-
-try:
-    import gdata.docs.data
-    import gdata.docs.client
-
-    # API breakage madness in the gdata API - those guys are insane. 
-    try:
-        # gdata 2.0.15+
-        gdata.docs.client.DocsClient.copy_resource
-    except AttributeError:
-        # gdata 2.0.14- : copy_resource() was copy()
-        gdata.docs.client.DocsClient.copy_resource = gdata.docs.client.DocsClient.copy
-
-    try:
-        # gdata 2.0.16+
-        gdata.docs.client.DocsClient.get_resource_by_id
-    except AttributeError:
-        try:
-            # gdata 2.0.15+
-            gdata.docs.client.DocsClient.get_resource_by_self_link
-            def get_resource_by_id_2_0_16(self, resource_id, **kwargs):
-                return self.GetResourceBySelfLink(
-                    gdata.docs.client.RESOURCE_FEED_URI + ('/%s' % resource_id), **kwargs)
-            gdata.docs.client.DocsClient.get_resource_by_id = get_resource_by_id_2_0_16
-        except AttributeError:
-            # gdata 2.0.14- : alias get_resource_by_id()
-            gdata.docs.client.DocsClient.get_resource_by_id = gdata.docs.client.DocsClient.get_doc
-
-    try:
-        import atom.http_interface
-        _logger.info('GData lib version `%s` detected' % atom.http_interface.USER_AGENT)
-    except (ImportError, AttributeError):
-        _logger.debug('GData lib version could not be detected', exc_info=True)
-
-except ImportError:
-    _logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list")
-
-
-class google_docs_ir_attachment(osv.osv):
-    _inherit = 'ir.attachment'
-
-    def _auth(self, cr, uid, context=None):
-        '''
-        Connexion with google base account
-        @return client object for connexion
-        '''
-        #pool the google.login in google_base_account
-        google_pool = self.pool.get('google.login')
-        #get gmail password and login. We use default_get() instead of a create() followed by a read() on the 
-        # google.login object, because it is easier. The keys 'user' and 'password' ahve to be passed in the dict
-        # but the values will be replaced by the user gmail password and login.
-        user_config = google_pool.default_get(cr, uid, {'user' : '' , 'password' : ''}, context=context)
-        #login gmail account
-        client = google_pool.google_login(user_config['user'], user_config['password'], type='docs_client', context=context)
-        if not client:
-            raise osv.except_osv(_('Google Docs Error!'), _("Check your google configuration in Users/Users/Synchronization tab."))
-        _logger.info('Logged into google docs as %s', user_config['user'])
-        return client
-
-    def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
-        '''Create a new google document, empty and with a default type (txt)
-           :param res_model: the object for which the google doc is created
-           :param res_id: the Id of the object for which the google doc is created
-           :return: the ID of the google document object created
-        '''
-        #login with the base account google module
-        client = self._auth(cr, uid, context=context)
-        # create the document in google docs
-        title = "%s %s" % (context.get("name","Untitled Document."), datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT))
-        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL,title=title)
-        #create a new doc in Google Docs 
-        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-        # create an ir.attachment into the db
-        self.create(cr, uid, {
-            'res_model': res_model,
-            'res_id': res_id,
-            'type': 'url',
-            'name': title,
-            'url': gdocs_resource.get_alternate_link().href,
-        }, context=context)
-        return {'resource_id': gdocs_resource.resource_id.text,
-                'title': title,
-                'url': gdocs_resource.get_alternate_link().href}
-
-    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
-        '''
-        copy an existing document in google docs
-           :param res_model: the object for which the google doc is created
-           :param res_id: the Id of the object for which the google doc is created
-           :param name_gdocs: the name of the future ir.attachment that will be created. Based on the google doc template foun.
-           :param gdoc_template_id: the id of the google doc document to copy
-           :return: the ID of the google document object created
-        '''
-        #login with the base account google module
-        client = self._auth(cr, uid)
-        # fetch and copy the original document
-        try:
-            doc = client.get_resource_by_id(gdoc_template_id)
-            #copy the document you choose in the configuration
-            copy_resource = client.copy_resource(doc, name_gdocs)
-        except:
-            raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL."))
-        # create an ir.attachment
-        self.create(cr, uid, {
-            'res_model': res_model,
-            'res_id': res_id,
-            'type': 'url',
-            'name': name_gdocs,
-            'url': copy_resource.get_alternate_link().href
-        }, context=context)
-        return copy_resource.resource_id.text
-
-    def google_doc_get(self, cr, uid, res_model, ids, context=None):
-        '''
-        Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
-        will first seek for a google.docs.config associated with the model `res_model` to find out what's the template
-        of google doc to copy (this is usefull if you want to start with a non-empty document, a type or a name 
-        different than the default values). If no config is associated with the `res_model`, then a blank text document
-        with a default name is created.
-          :param res_model: the object for which the google doc is created
-          :param ids: the list of ids of the objects for which the google doc is created. This list is supposed to have
-            a length of 1 element only (batch processing is not supported in the code, though nothing really prevent it)
-          :return: the google document object created
-        '''
-        if len(ids) != 1:
-            raise osv.except_osv(_('Google Docs Error!'), _("Creating google docs may only be done by one at a time."))
-        res_id = ids[0]
-        pool_ir_attachment = self.pool.get('ir.attachment')
-        pool_gdoc_config = self.pool.get('google.docs.config')
-        name_gdocs = ''
-        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)
-        if google_docs_config:
-            name_gdocs = pool_gdoc_config.browse(cr, uid, google_docs_config, context=context)[0].name_template
-            try:
-                name_gdocs = name_gdocs % model_fields_dic
-            except:
-                raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
-            google_template_id = pool_gdoc_config.browse(cr, uid, google_docs_config[0], context=context).gdocs_resource_id
-            google_document = pool_ir_attachment.copy_gdoc(cr, uid, res_model, res_id, name_gdocs, google_template_id, context=context)
-        else:
-            google_document = pool_ir_attachment.create_empty_google_doc(cr, uid, res_model, res_id, context=context)
-        return google_document
-
-class config(osv.osv):
-    _name = 'google.docs.config'
-    _description = "Google Docs templates config"
-
-    _columns = {
-        'model_id': fields.many2one('ir.model', 'Model', required=True),
-        'gdocs_resource_id': fields.char('Google Resource ID to Use as Template', size=64, help='''
-This is the id of the template document, on google side. You can find it thanks to its URL: 
-*for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`
-*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`
-*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`
-*for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
-...
-''', required=True),
-        'name_template': fields.char('Google Doc Name Pattern', size=64, help='Choose how the new google docs will be named, on google side. Eg. gdoc_%(field_name)s', required=True),
-    }
-
-    _defaults = {
-        'name_template': 'gdoc_%(name)s',
-    }
diff --git a/addons/google_docs/i18n/ar.po b/addons/google_docs/i18n/ar.po
deleted file mode 100644
index bf8df78b926..00000000000
--- a/addons/google_docs/i18n/ar.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Arabic 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-02-25 21:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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/google_docs/i18n/cs.po b/addons/google_docs/i18n/cs.po
deleted file mode 100644
index 38cda3eccca..00000000000
--- a/addons/google_docs/i18n/cs.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Czech 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-03-31 16:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech <cs@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-01 05:06+0000\n"
-"X-Generator: Launchpad (build 16546)\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/google_docs/i18n/de.po b/addons/google_docs/i18n/de.po
deleted file mode 100644
index 017a0860244..00000000000
--- a/addons/google_docs/i18n/de.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-10 11:38+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Fehler im 'Key' !"
-
-#. 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 ""
-"Am Beispiel einer Präsentation (slide show) unter einer URL wie "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, ist die ID die folgende `presentation:123456789`"
-
-#. 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 ""
-"Am Beispiel eines textdokuments (doc) unter einer URL wie "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, ist die "
-"ID die folgende  `document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "Google Resource ID als Vorlage"
-
-#. 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 ""
-"Am Beispiel einer Zeichnung (drawings) unter einer URL wie "
-"'https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, ist die "
-"ID die folgende `drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Google Doc hinzufügen ..."
-
-#. 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 ""
-"Dieses ist die ID Ihrer Textvorlage auf der Google Seite. Sie können diese "
-"dank Ihrer URL finden unter:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Konfiguration Google Docs Vorlage"
-
-#. 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 ""
-"Die google Anmeldedaten für den Benutzer wurden nicht hinterlegt. Bitte "
-"kontaktieren Sie Ihren Administrator."
-
-#. 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 ""
-"Am Beispiel einer Tabelle (spreadsheet) unter einer URL wie "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"ist die ID die folgende `spreadsheet:123456789`"
-
-#. 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 ""
-"Die ID der Resource ist nicht korrekt. Sie können die ID über Ihre google "
-"docs URL finden."
-
-#. 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 "Es kann nur ein google doc zur gleichen Zeit bearbeitet werden"
-
-#. 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 "Google Docs Fehler !"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Prüfen Sie Ihre google Einstellungen unter dem Aktenreiter Benutzer / "
-"Benutzer / Synchronisation."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Google Docs Konfiguration"
-
-#. 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 "Die google Anmeldedaten wurden noch nicht hinterlegt."
-
-#. 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 "Ihr google doc Bezeichnungsmuster konnte hier nicht gefunden werden"
-
-#. 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 ""
-"Wählen Sie aus wie das google doc in google side bezeichnet werden soll, "
-"z.B. gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Google Docs Konfiguration"
-
-#. 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 ""
-"\n"
-"Dies ist die ID der Dokumenten Vorlage unter google sides. Sie können diese "
-"dank seiner URL einfach finden:\n"
-"* für ein Textdokument mit einer url wie "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, ist die "
-"ID `document: 123456789`\n"
-"* für eine Tabellenkalkulation mit einer url wie "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789 # gid = "
-"0`, ist die ID `spreadsheet: 123456789`\n"
-"* für eine Präsentation (slide show) mit einer url wie "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit # slide "
-"= id.p`, ist die ID `presentation: 123456789 `\n"
-"* für eine Zeichnung mit einer url wie "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, ist die "
-"ID `drawings: 123456789`\n"
-
-#. 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 "Google Doc Bezeichnungsmuster"
diff --git a/addons/google_docs/i18n/es.po b/addons/google_docs/i18n/es.po
deleted file mode 100644
index 71bb08ece9a..00000000000
--- a/addons/google_docs/i18n/es.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-12 12:51+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "¡Error de clave!"
-
-#. 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 ""
-"para un documento de presentación (muestra de diapositivas) con una "
-"dirección como "
-"'https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p', el id. es 'presentation:123456789'"
-
-#. 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 ""
-"para un documento de texto con una dirección como "
-"'https://docs.google.com/a/openerp.com/document/d/123456789/edit', el id. es "
-"'document:123456789'"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "Id. del recurso de Google a usar como plantilla"
-
-#. 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 ""
-"para un documento de dibujo con la dirección "
-"'https://docs.google.com/a/openerp.com/drawings/d/123456789/edit', el id. es "
-"'drawings:123456789'"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Añadir documento google..."
-
-#. 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 ""
-"Éste es el id de la plantilla del documento, de la parte de Google. Puede "
-"averiguarlo gracias a su dirección:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Configurar plantillas Google Docs"
-
-#. 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 ""
-"Los credenciales del usuario de Google no están establecidos aún. Contacte "
-"con su administrador para más ayuda."
-
-#. 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 ""
-"para una hoja de cálculo con la dirección "
-"'https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0', "
-"el id. es `spreadsheet:123456789`"
-
-#. 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 ""
-"Su id de recurso no es correcto. Puede encontrar el id en la URL de google "
-"docs."
-
-#. 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 ""
-"Crear un documento google solo puede ser hecho por uno al mismo tiempo."
-
-#. 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 "¡Error Google Dos!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Verifique su configuración google en Usuarios/usuarios/pestaña sincronización"
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Configuración Google Docs"
-
-#. 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 "Configuración de modelos"
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr "Modelo"
-
-#. 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 "Las credenciales de usuario Google aún no se han establecido."
-
-#. 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 ""
-"No se ha encontrado la clave del patrón de nombre del documento de Google en "
-"el objeto."
-
-#. 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 ""
-"Escoja cómo serán nombrados los nuevos documentos de Google, en la parte de "
-"Google. Por ejemplo, gdoc_%(field_name)s."
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Configuración de Google docs"
-
-#. 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 ""
-"\n"
-"Éste es el id. del documento plantilla, en la parte de Google. Puede "
-"averiguarlo gracias a su dirección:\n"
-"* para un documento de texto con una dirección como "
-"'https://docs.google.com/a/openerp.com/document/d/123456789/edit', el id. es "
-"'document:123456789'\n"
-"* para una hoja de cálculo con la dirección "
-"'https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0', "
-"el id. es `spreadsheet:123456789`\n"
-"* para un documento de presentación (muestra de diapositivas) con una "
-"dirección como "
-"'https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p', el id. es 'presentation:123456789'\n"
-"* para un documento de dibujo con la dirección "
-"'https://docs.google.com/a/openerp.com/drawings/d/123456789/edit', el id. es "
-"'drawings:123456789'\n"
-"...\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr "Adjunto"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Patrón de nombre del documento Google"
diff --git a/addons/google_docs/i18n/fr.po b/addons/google_docs/i18n/fr.po
deleted file mode 100644
index cf9ffdaccc8..00000000000
--- a/addons/google_docs/i18n/fr.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-21 13:47+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\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-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Erreur de clé!"
-
-#. 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 ""
-"pour une présentation (diaporama) ayant une url "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, l'ID est `presentation:123456789`"
-
-#. 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 ""
-"pour un document ayant l'url "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, l'ID est "
-"`document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "L'identifiant Google de la ressource à utiliser comme modèle"
-
-#. 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 ""
-"pour un dessin ayant l'url  "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, l'ID est "
-"`drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Ajouter un document Google..."
-
-#. 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 ""
-"Ceci est l'identifiant du modèle de document, du côté de Google. Vous pouvez "
-"le trouver grâce à son url:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Configuration des modèles de documents Google"
-
-#. 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 ""
-"Vous n'avez pas renseigné les identifiants Google sur votre compte "
-"utilisateur. Contactez votre administrateur si vous souhaitez de l'aide."
-
-#. 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 ""
-"pour un document tableur ayant l'url  "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-" l'ID est `spreadsheet:123456789`"
-
-#. 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 ""
-"L'identifiant de la ressource est incorrecte. Vous pouvez le trouver dans "
-"l'url associée document Google."
-
-#. 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 "Vous ne pouvez créer qu'un seul document google à la fois."
-
-#. 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 "Erreur Google Docs!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Vérifiez votre configuration Google dans l'onglet Synchronisation du "
-"formulaire Utilisateurs"
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Configuration Google Documents"
-
-#. 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 "Configuration des Modèles"
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr "Modèles"
-
-#. 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 ""
-"Les paramètres d'authentification Google de l'utilisateur n'ont pas encoré "
-"été configurés"
-
-#. 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 "Le nom du document google associé n'a pas été trouvé dans cet objet."
-
-#. 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 ""
-"Choisissez le nom du nouveau document google sur les serveurs Google. ex: "
-"gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Configuration de Google documents"
-
-#. 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 ""
-"\n"
-"Ceci est l'identifiant du modèle de document, du côté de Google. Vous pouvez "
-"le trouver grâce à son URL: \n"
-" \n"
-"*Pour un document texte dont l'url est "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, l'ID est "
-"`document:123456789`\n"
-"*Pour un document tableur dont l'url est "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"l'ID est `spreadsheet:123456789`\n"
-"*Pour une présentation dont l'url est "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, l'ID est `presentation:123456789`\n"
-"* Pour un dessin dont l'url est "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, l'ID est "
-"`drawings:123456789`\n"
-"...\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Motif de nom de document Google"
diff --git a/addons/google_docs/i18n/google_docs.pot b/addons/google_docs/i18n/google_docs.pot
deleted file mode 100644
index 8da7c5d2f70..00000000000
--- a/addons/google_docs/i18n/google_docs.pot
+++ /dev/null
@@ -1,159 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_docs
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 17:05+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:139
-#, 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:101
-#, 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:125
-#, 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:56
-#: code:addons/google_docs/google_docs.py:101
-#: code:addons/google_docs/google_docs.py:125
-#, python-format
-msgid "Google Docs Error!"
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:56
-#, 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:139
-#, 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/google_docs/i18n/hr.po b/addons/google_docs/i18n/hr.po
deleted file mode 100644
index ac1a64cd1e2..00000000000
--- a/addons/google_docs/i18n/hr.po
+++ /dev/null
@@ -1,190 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-09 20:25+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Croatian <hr@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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 "Dodaj Google Doc..."
-
-#. 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 "Google Docs greška!"
-
-#. 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 "Postave Google Docs-a"
-
-#. 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 "Model"
-
-#. 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 ""
-"Odaberite kako će se nazivati novi google dokumenti, on google side. Eg. "
-"gdoc_%(field_name)s"
-
-#. 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/google_docs/i18n/hu.po b/addons/google_docs/i18n/hu.po
deleted file mode 100644
index 344e01173a9..00000000000
--- a/addons/google_docs/i18n/hu.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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-03-02 09:35+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-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Kulcs hiba!"
-
-#. 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 ""
-"a bemutatóhoz (diavetítés) a dokumentum URL elérési útja mint "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, az ID azonosítója `presentation:123456789`"
-
-#. 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 ""
-"egy szöveges dokumantum URL elérési útja mint "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, az ID "
-"azonosítója `document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "Google forrás ID azonosító sablonként való használathoz"
-
-#. 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 ""
-"egy ábra dokumantum URL elérési útja mint "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, az ID "
-"azonosítója `drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Google Doc hozzáadása..."
-
-#. 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 ""
-"Eza samlon dokumentum ID azonosítója, a google oldalról. Megtalálhatja az "
-"URL elérési úrjának köszönhetően:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Google Docs sablon beállítás"
-
-#. 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 ""
-"A felhasználó google igazolásai még nincsenek beállítva. Lépjen kapcsolatba "
-"az adminnal segítségért."
-
-#. 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 ""
-"egy táblázatkezelő dokumentumhoz ilyen URL elérési úttal mint "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"ai ID azonosítója `spreadsheet:123456789`"
-
-#. 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 ""
-"A forrás ID azonosítója nem helyes. Megtalálhatja az ID azonosítót a google "
-"dokumentum URL elérési útjában."
-
-#. 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 "Lehet, hogy egyszerre csak egy google dokumentumot hozhat létre."
-
-#. 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 "Google dokumentum hiba!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Ellenőrizze a google beállításokat az "
-"Felhsználók/Felhasználók/Szinkronizáció fülön."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Google dokumentum beállítás"
-
-#. 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 "Modell beállítás"
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr "Modell"
-
-#. 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 "Google személyi okmányok nincsenek beállítva."
-
-#. 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 "A Google dokumentum náv minta kulcs nem található az objektumban."
-
-#. 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 ""
-"Vállassza ki a Google dokumentum új név alkotási módját, a google oldalról. "
-"Pl. gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Google dokumentum beállítás"
-
-#. 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 ""
-"\n"
-"Ez a sablon dokumentum ID azonosító, a google oldalon. Megtalálja az URL "
-"elérési útnak köszönhetően: \n"
-"*a szöveges dokumentumnak az URL elérési útja mint "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, az ID "
-"azonosítója `document:123456789`\n"
-"*a táblázatkezelő dokumentumnak az URL elérési útja mint "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"az ID azonosítója `spreadsheet:123456789`\n"
-"*a bemutató (diavetítés) dokumentumnak az URL elérési útja "
-"mint`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slid"
-"e=id.p`, az ID azonosítója `presentation:123456789`\n"
-"*a grafikai dokumentumnak az URL elérési útja mint "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, az ID "
-"azonosítója `drawings:123456789`\n"
-"...\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Google dokumentum név minta"
diff --git a/addons/google_docs/i18n/it.po b/addons/google_docs/i18n/it.po
deleted file mode 100644
index 2eca676d6c7..00000000000
--- a/addons/google_docs/i18n/it.po
+++ /dev/null
@@ -1,227 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-18 22:11+0000\n"
-"Last-Translator: Sergio Corato <Unknown>\n"
-"Language-Team: Italian <it@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Errore Chiave!"
-
-#. 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 ""
-"per un documento di presentazione (proiezione diapositive) con un url come "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, l'ID è `presentation:123456789`"
-
-#. 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 ""
-"per un documento di testo con un url come "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, l'ID è "
-"`document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "ID risorsa google da usare come modello"
-
-#. 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 ""
-"per un documento di disegno con url come "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, l'ID è "
-"`drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Aggiungi google doc"
-
-#. 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 ""
-"Questo è l'id del modello di documento, sul lato google. E' possibile "
-"trovarlo tramite il suo URL:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Config. modello google docs"
-
-#. 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 ""
-"Le credeziali dell'utente google non sono ancora impostate. Contattare "
-"l'amministratore per aiuto."
-
-#. 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 ""
-"per un foglio di calcolo con url come "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"l'ID è `spreadsheet:123456789`"
-
-#. 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 ""
-"Il vostro ID risorsa non è corretto. Potete trovarlo nell'URL di google docs"
-
-#. 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 ""
-"La creazione di documenti google può essere fatto solo uno alla volta."
-
-#. 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 "Errore Google Docs!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Controllare la configurazione google nella scheda "
-"Utenti/Utenti/Sincronizzazione"
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Configurazione Google Docs"
-
-#. 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 "Configurazione modelli"
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr "Modello"
-
-#. 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 "Credenziali utente google non ancora impostate."
-
-#. 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 ""
-"La chiave dello Schema Nome di Google Doc non è stata trovata nell'oggetto."
-
-#. 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 ""
-"Scegliere come il nuovo google docs sarà nominato, sul lato google. Es.: "
-"gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Configurazione Google Docs"
-
-#. 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 ""
-"\n"
-"Questo è l'id del modello di documento, sul lato google. E' possibile "
-"trovarlo grazie al suo URL:\n"
-"*per un documento di testo con url come "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, l'ID è "
-"`document:123456789`\n"
-"*per un foglio di calcolo con url come "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"l'ID è `spreadsheet:123456789`\n"
-"*per un documento di presentazione (proiezione diapositive) con url come "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, l'ID è `presentation:123456789`\n"
-"*per un documento di disegno con url come "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, l'ID è "
-"`drawings:123456789`\n"
-"...\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Schema Nome Google Doc"
diff --git a/addons/google_docs/i18n/ln.po b/addons/google_docs/i18n/ln.po
deleted file mode 100644
index 24c26b98920..00000000000
--- a/addons/google_docs/i18n/ln.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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/google_docs/i18n/mk.po b/addons/google_docs/i18n/mk.po
deleted file mode 100644
index 1dfd2120b5b..00000000000
--- a/addons/google_docs/i18n/mk.po
+++ /dev/null
@@ -1,204 +0,0 @@
-# Macedonian 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-03-08 14:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Macedonian <mk@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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 ""
-"за презентација (слајдшоу) документ со url како "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, ID е `presentation:123456789`"
-
-#. 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 ""
-"за текст документ со урл "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`,  ID е "
-"`document:123456789`"
-
-#. 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 ""
-"за цртеж со урл како  "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, ID е "
-"`drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Додади Google док..."
-
-#. 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 "Конфигурација на Google Docs шаблони"
-
-#. 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 ""
-"Google креденциите за корисникот сеуште не се сетирани.  Контактирајте го "
-"администраторот."
-
-#. 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 ""
-"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`"
-
-#. 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 "Креирање на google docs може да се направи едно по едно."
-
-#. 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 "Google Docs Грешка!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Провери ја google конфигурацијата во Корисници/Корисници/Синхронизација "
-"табот."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Google Docs конфигурација"
-
-#. 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 "Google креденциите за корисникот сеуште не се поставени."
-
-#. 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 "Google Docs конфигурација"
-
-#. 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 "ir.attachment"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr ""
diff --git a/addons/google_docs/i18n/mn.po b/addons/google_docs/i18n/mn.po
deleted file mode 100644
index 68380d3592f..00000000000
--- a/addons/google_docs/i18n/mn.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Mongolian 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-02-19 02:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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/google_docs/i18n/nl.po b/addons/google_docs/i18n/nl.po
deleted file mode 100644
index 91b4d963e01..00000000000
--- a/addons/google_docs/i18n/nl.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-01 16:42+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
-"Language-Team: Dutch <nl@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Key fout!"
-
-#. 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 ""
-"voor een presentatie (dia weergave) document met een website adres, zoals: "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, the ID is `presentation:123456789`"
-
-#. 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 ""
-"voor een tekst document met een met een website adres, zoals: "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
-"`document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "Google Resource ID te gebruiken als sjabloon"
-
-#. 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 ""
-"voor een tekening met een met een website adres, zoals: "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
-"`drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Google Doc toevoegen..."
-
-#. 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 ""
-"Dit is het ID van het sjabloon document op de Google site. U kunt deze "
-"vinden, dankzij dit website adres:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Google Docs sjablonen instellingen"
-
-#. 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 ""
-"De Google gebruiker referenties zijn nog niet ingesteld. Neem contact op met "
-"de beheerder voor hulp."
-
-#. 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 ""
-"voor een spreadsheet document met een met een website adres, zoals: "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"the ID is `spreadsheet:123456789`"
-
-#. 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 ""
-"Uw resource ID is niet correct. U kunt deze vinden in het Google docs "
-"website adres."
-
-#. 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 "U kunt maar één Google doc tegelijk aanmaken."
-
-#. 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 "Google Docs fout!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Controleer uw Google docs instellingen op het tabblad 'Synchronisatie' bij "
-"in Instellingen/Gebruikers."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Google Docs instellingen"
-
-#. 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 "Models configuratie"
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr "Model"
-
-#. 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 "Google gebruiker referenties zijn niet ingesteld."
-
-#. 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 "Uw Google Doc 'Name Pattern's key'  is niet gevonden in object."
-
-#. 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 ""
-"Kies welke naam de nieuw aangemaakte Google docs krijgen op de Google "
-"website. Bijv. gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Google Docs Instellingen"
-
-#. 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 ""
-"\n"
-"Dit is het id van het sjabloon document aan de google kant. Je kunt hem "
-"vinden dankzij dit adres:\n"
-"*voor een tekstdocument met een adres als "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, het ID is "
-"`document:123456789`\n"
-"*voor een spreadsheet met een adres als "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"het ID is `spreadsheet:123456789`\n"
-"*voor een presentatie met een adres "
-"als`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide"
-"=id.p`, het ID is `presentation:123456789`\n"
-"*voor een tekening met een adres als "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, het ID is "
-"`drawings:123456789`\n"
-"...\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Google Doc naam patroon"
diff --git a/addons/google_docs/i18n/pl.po b/addons/google_docs/i18n/pl.po
deleted file mode 100644
index dcd97078a6f..00000000000
--- a/addons/google_docs/i18n/pl.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-16 11:28+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: Polish <pl@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Błąd klucza"
-
-#. 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 "Dodaj Google doc..."
-
-#. 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/google_docs/i18n/pt.po b/addons/google_docs/i18n/pt.po
deleted file mode 100644
index 1539bcbedb6..00000000000
--- a/addons/google_docs/i18n/pt.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-10 17:49+0000\n"
-"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
-"Language-Team: Portuguese <pt@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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 "Modelo"
-
-#. 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 "ir.attachment"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr ""
diff --git a/addons/google_docs/i18n/pt_BR.po b/addons/google_docs/i18n/pt_BR.po
deleted file mode 100644
index 38e3c400c25..00000000000
--- a/addons/google_docs/i18n/pt_BR.po
+++ /dev/null
@@ -1,227 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-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: 2012-12-07 22:47+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Erro de Chave!"
-
-#. 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 ""
-"para um documento de apresentação (slide) com a url como "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, o ID é `presentation:123456789`"
-
-#. 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 ""
-"para um documento de texto com a url como "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, o ID é "
-"`document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "Id de Recurso do Google para usar como Modelo"
-
-#. 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 ""
-"para um documento de desenho com a url como "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, o ID "
-"é`drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Adicionar um Documento do Google..."
-
-#. 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 ""
-"Este é o id do modelo do documento, no lado do google. Você pode encontrá-lo "
-"graças à url:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Configuração dos modelos do Google Docs"
-
-#. 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 ""
-"As credenciais do usuário do google ainda não foram definidas. Para mais "
-"informações, solicite auxílio ao Administrador do Sistema."
-
-#. 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 ""
-"para uma planilha de cálculo com url como "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"o ID é `spreadsheet:123456789`"
-
-#. 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 ""
-"Sua id de recurso não está correta. Você encontra a id na url do google docs."
-
-#. 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 "A criação de documentos do google deve ser feita um de cada vez."
-
-#. 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 "Erro do Google Docs!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Verifique a sua configuração do google na aba "
-"Usuários/Usuários/Sincronização."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Configuração do Google Docs"
-
-#. 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 "Configuração de modelos"
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr "Modelo"
-
-#. 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 "As credenciais de usuário do Google ainda não foram definidas."
-
-#. 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 ""
-"A chave do seu Padrão de Nome do Google Docs não foi encontrada no objeto."
-
-#. 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 ""
-"Escolha como os novos documentos do google serão nomeados, no lado do "
-"google. Ex: gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Configuração do Google Docs"
-
-#. 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 ""
-"\n"
-"Este é o ID do modelo de documento no Google. Você pode encontra-lo graças a "
-"essa URL: \n"
-"*para um documento de texto com uma url como "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, o ID é "
-"`document:123456789`\n"
-"*para uma planilha com url como "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"o ID é `spreadsheet:123456789`\n"
-"*para uma apresentação (slide show) com url como "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, o ID é `presentation:123456789`\n"
-"*para um documento de desenho com url como "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, o ID é "
-"`drawings:123456789`\n"
-"...\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr "Anexo"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Padrão de Nome do Google Docs"
diff --git a/addons/google_docs/i18n/ro.po b/addons/google_docs/i18n/ro.po
deleted file mode 100644
index 716b970f190..00000000000
--- a/addons/google_docs/i18n/ro.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# Romanian 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-01-27 09:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Eroare Cheie!"
-
-#. 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 ""
-"pentru un document de prezentare (slide show) cu url-ul "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, ID-ul este `prezentare:123456789`"
-
-#. 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 ""
-"pentru un document text cu url-ul "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, ID-ul "
-"este `document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "ID Resurse Google pentru a fi folosite ca Sablon"
-
-#. 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 ""
-"pentru un document desen cu url-ul "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, ID-ul "
-"este`desene:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Adauga Document Google..."
-
-#. 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 ""
-"Acesta este id-ul documentului sablon, pe partea google. Il puteti gasi cu "
-"ajutorul URL-ului:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "configurarea sabloanelor documentelor Google"
-
-#. 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 ""
-"Acreditarile utilizatorului google nu sunt inca configurate. Contactati "
-"administratorul pentru ajutor."
-
-#. 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 ""
-"pentru un document cu tabele cu url-ul: "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"ID-ul este `tabele:123456789`"
-
-#. 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 ""
-"Id-ul resursei dumneavoastra nu este corect. Puteti gasi id-ul in URL "
-"documente google."
-
-#. 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 "Crearea de documente google poate fi facuta numai pe rand."
-
-#. 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 "Eroare Documente Google!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Verificati configurarea google in tabul Utilizatori/Utilizatori/Sincronizare."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Configurarea Documentelor Google"
-
-#. 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 "Configurare modele"
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr "Model"
-
-#. 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 "Acreditarile utilizatorului Google nu sunt inca configurate."
-
-#. 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 ""
-"Cheia modelului numelui documentului Google nu a fost gasita in obiect."
-
-#. 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 ""
-"Alegeti modul in care vor fi numite documentele google, pe partea google. De "
-"exemplu gdoc_%(nume_camp)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Configurarea Documentelor Google"
-
-#. 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 ""
-"\n"
-"Acesta este id-ul documentului tipar, pe partea google. Il puteti gasi cu "
-"ajutorul URL-ului: \n"
-"*pentru un document text cu url-ul "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, ID-ul "
-"este `document:123456789`\n"
-"*pentru un document cu tabele cu url-ul "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"ID-ul este `spreadsheet:123456789`\n"
-"*pentru un document prezentare (slide show) cu url-ul "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, ID-ul este `presentation:123456789`\n"
-"*pentru un document cu desene cu url-ul "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, ID-ul "
-"este `drawings:123456789`\n"
-"...\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr "ir.attachment (ir.atasament)"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Tiparul Numelui Documentului Google"
diff --git a/addons/google_docs/i18n/ru.po b/addons/google_docs/i18n/ru.po
deleted file mode 100644
index 33f24ed557f..00000000000
--- a/addons/google_docs/i18n/ru.po
+++ /dev/null
@@ -1,196 +0,0 @@
-# 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-03-01 11:29+0000\n"
-"Last-Translator: Эдуард <Unknown>\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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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 ""
-"для документа-презентации (слайд шоу) с url как "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`,  ID - `presentation:123456789`"
-
-#. 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 ""
-"для текстового документа с url как "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`,  ID - "
-"`document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "ID ресурса Google для использования в качестве шаблона"
-
-#. 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 "Добавить Google Документ..."
-
-#. 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 "Конфигурация шаблонов Документов Google"
-
-#. 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 "Ошибка Документов Google!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Проверьте ваши google настройки во вкладке "
-"Пользователи/Пользователи/Синхронизация."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Настройки Документов Google"
-
-#. 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 "Настройки Документов Google"
-
-#. 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 "Шаблон имени Документа Google"
diff --git a/addons/google_docs/i18n/sl.po b/addons/google_docs/i18n/sl.po
deleted file mode 100644
index a93afe16703..00000000000
--- a/addons/google_docs/i18n/sl.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Slovenian 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-01-26 12:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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 "Model"
-
-#. 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 "ir.attachment"
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr ""
diff --git a/addons/google_docs/i18n/sv.po b/addons/google_docs/i18n/sv.po
deleted file mode 100644
index 24e7c63ea39..00000000000
--- a/addons/google_docs/i18n/sv.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Swedish 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-02-15 14:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Nyckelfel!"
-
-#. 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 "Lägg till Google-dokument..."
-
-#. 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/google_docs/i18n/tr.po b/addons/google_docs/i18n/tr.po
deleted file mode 100644
index 349d71a96b8..00000000000
--- a/addons/google_docs/i18n/tr.po
+++ /dev/null
@@ -1,188 +0,0 @@
-# Turkish 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-02-04 14:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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/google_docs/i18n/zh_CN.po b/addons/google_docs/i18n/zh_CN.po
deleted file mode 100644
index 3ca3b5cadf9..00000000000
--- a/addons/google_docs/i18n/zh_CN.po
+++ /dev/null
@@ -1,197 +0,0 @@
-# Chinese (Simplified) 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-01-04 11:38+0000\n"
-"Last-Translator: Roc Wu <irocwu@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:53+0000\n"
-"X-Generator: Launchpad (build 16532)\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 ""
-"网址如`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide"
-"=id.p`,的演示文档（幻灯片） 其 ID 为 `presentation:123456789`"
-
-#. 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 ""
-"网址如 `https://docs.google.com/a/openerp.com/document/d/123456789/edit`的文本文档, "
-"其 ID 为 `document:123456789`"
-
-#. 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 ""
-"网址如`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`的绘图文档, 其 "
-"ID 为 `drawings:123456789`"
-
-#. 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 "这是位于Google端的模板文档的 ID. 你可以通过其网址找到它:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "配置Google文档模板"
-
-#. 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 "用户 google 用户授权尚未被设定. 联系你的管理员以获得帮助."
-
-#. 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 ""
-"网址如 "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`的电"
-"子表格文档, 其 ID 为 `spreadsheet:123456789`"
-
-#. 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 "你的源 id 不正确. 你可以在 google 文档的网址中找到它."
-
-#. 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 "一次只能生成一份google 文档."
-
-#. 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 "Google 文档错误!"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr "在Users/Users/Synchronization 标签中检查你的google 配置."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Google 文档配置"
-
-#. 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 "Google的用户证书尚未设定."
-
-#. 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 "选择在Google端如何命名新的google 文档. 如. gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Google 文档设置"
-
-#. 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/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
deleted file mode 100644
index e6c4223735f..00000000000
--- a/addons/google_docs/res_config_user_view.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- add google docs config field in user form -->
-
-        <record model="ir.ui.view" id="view_google_docs_config_tree">
-            <field name="name">google_docs.config.tree</field>
-            <field name="model">google.docs.config</field>
-            <field name="arch" type="xml">
-                <tree string="Google Docs Configuration">
-                    <field name="model_id"/>
-                    <field name="name_template"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_google_docs_config_form">
-            <field name="name">google_docs.config.form</field>
-            <field name="model">google.docs.config</field>
-            <field name="arch" type="xml">
-                <form string="Google Docs Configuration" version="7.0">
-                <group>
-                    <field name="model_id"/>
-                    <label for='gdocs_resource_id'/>
-                    <div>
-                        <field name='gdocs_resource_id'/>
-                        <p class="oe_grey">
-This is the id of the template document, on google side. You can find it thanks to its URL:
-<ul>
-<li>for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`</li>
-<li>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`</li>
-<li>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`</li>
-<li>for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`</li>
-</ul>
-                        </p>
-                    </div>
-                    <field name='name_template'/>
-                </group>
-                </form>
-            </field>
-        </record>
-
-        <record model='ir.actions.act_window' id='action_google_docs_users_config'>
-            <field name='name'>Models configuration</field>
-            <field name='res_model'>google.docs.config</field>
-            <field name='type'>ir.actions.act_window</field>
-            <field name='view_type'>form</field>
-            <field name='view_id' ref='view_google_docs_config_tree'/>
-        </record>
-        <menuitem name='Google Docs configuration' id='menu_gdocs_config' parent='base.menu_administration'/>
-        <menuitem name='Models configuration' id='menu_gdocs_model_config' parent='menu_gdocs_config' action='action_google_docs_users_config'/>
-    </data>
-</openerp>
diff --git a/addons/google_docs/security/ir.model.access.csv b/addons/google_docs/security/ir.model.access.csv
deleted file mode 100644
index 9393d586fb8..00000000000
--- a/addons/google_docs/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_google_docs,google.docs.config,model_google_docs_config,,1,0,0,0
-access_google_docs,google.docs.config,model_google_docs_config,base.group_system,1,1,1,1
\ No newline at end of file
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
deleted file mode 100644
index 1cc511ef4d9..00000000000
--- a/addons/google_docs/static/src/js/gdocs.js
+++ /dev/null
@@ -1,40 +0,0 @@
-openerp.google_docs = function(instance, m) {
-var _t = instance.web._t,
-    QWeb = instance.web.qweb;
-
-    instance.web.Sidebar.include({
-        redraw: function() {
-            var self = this;
-            this._super.apply(this, arguments);
-            self.$el.find('.oe_sidebar_add_attachment').after(QWeb.render('AddGoogleDocumentItem', {widget: self}))
-            self.$el.find('.oe_sidebar_add_google_doc').on('click', function (e) {
-                self.on_google_doc();
-            });
-        },
-        on_google_doc: function() {
-            var self = this;
-            var view = self.getParent();
-            var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
-            if( !_.isEmpty(ids) ){
-                view.sidebar_eval_context().done(function (context) {
-                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-                    ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
-                        if (r == 'False') {
-                            var params = {
-                                error: response,
-                                message: _t("The user google credentials are not set yet. Contact your administrator for help.")
-                            }
-                            $(openerp.web.qweb.render("DialogWarning", params)).dialog({
-                                title: _t("User Google credentials are not yet set."),
-                                modal: true,
-                            });
-                        }
-                    }).done(function(r){
-                        window.open(r.url,"_blank");
-                        view.reload();
-                    });
-                });
-            }
-        }
-    });
-};
diff --git a/addons/google_drive/__init__.py b/addons/google_drive/__init__.py
new file mode 100644
index 00000000000..e1cf2d00f3c
--- /dev/null
+++ b/addons/google_drive/__init__.py
@@ -0,0 +1 @@
+import google_drive
diff --git a/addons/google_docs/__openerp__.py b/addons/google_drive/__openerp__.py
similarity index 63%
rename from addons/google_docs/__openerp__.py
rename to addons/google_drive/__openerp__.py
index 2d064fdb8a9..9e6c73d2649 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_drive/__openerp__.py
@@ -20,22 +20,31 @@
 ##############################################################################
 
 {
-    'name': 'Google Docs integration',
+    'name': 'Google Drive™ integration',
     'version': '0.2',
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'category': 'Tools',
     'installable': True,
     'auto_install': False,
-    'js': ['static/src/js/gdocs.js'],
-    'qweb': ['static/src/xml/gdocs.xml'],
+    'js': [
+        'static/lib/gapi/client.js',
+        'static/src/js/gdrive.js',
+    ],
     'data': [
         'security/ir.model.access.csv',
-        'res_config_user_view.xml'
+        'res_config_user_view.xml',
+        'google_drive_data.xml'
     ],
-    'depends': ['google_base_account','document'],
+    'demo': [
+        'google_drive_demo.xml'
+    ],
+    'depends': ['base_setup', 'google_base_account'],
     'description': """
-Module to attach a google document to any model.
-================================================
+Integrate google document to OpenERP record.
+============================================
+
+This module allows you to integrate google documents to any of your OpenERP record quickly and easily using OAuth 2.0 for Installed Applications,
+You can configure your google Authorization Code from Settings > Configuration > General Settings by clicking on "Generate Google Authorization Code"
 """
 }
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
new file mode 100644
index 00000000000..8bc487ada7c
--- /dev/null
+++ b/addons/google_drive/google_drive.py
@@ -0,0 +1,227 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2012 OpenERP SA (<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/>.
+#
+##############################################################################
+import logging
+
+from openerp import SUPERUSER_ID
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+import urllib
+import urllib2
+import json
+import re
+
+_logger = logging.getLogger(__name__)
+
+
+class config(osv.osv):
+    _name = 'google.drive.config'
+    _description = "Google Drive templates config"
+
+    def get_google_drive_url(self, cr, uid, config_id, res_id, template_id, context=None):
+        config = self.browse(cr, SUPERUSER_ID, config_id, context=context)
+        model = config.model_id
+        filter_name = config.filter_id and config.filter_id.name or False
+        record = self.pool.get(model.model).read(cr, uid, res_id, [], context=context)
+        record.update({'model': model.name, 'filter': filter_name})
+        name_gdocs = config.name_template
+        try:
+            name_gdocs = name_gdocs % record
+        except:
+            raise osv.except_osv(_('Key Error!'), _("At least one key cannot be found in your Google Drive name pattern"))
+
+        attach_pool = self.pool.get("ir.attachment")
+        attach_ids = attach_pool.search(cr, uid, [('res_model', '=', model.model), ('name', '=', name_gdocs), ('res_id', '=', res_id)])
+        url = False
+        if attach_ids:
+            attachment = attach_pool.browse(cr, uid, attach_ids[0], context)
+            url = attachment.url
+        else:
+            url = self.copy_doc(cr, uid, res_id, template_id, name_gdocs, model.model, context).get('url')
+        return url
+
+    def get_access_token(self, cr, uid, scope=None, context=None):
+        ir_config = self.pool['ir.config_parameter']
+        google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
+        group_config = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_erp_manager')[1]
+        user = self.pool['res.users'].read(cr, uid, uid, "groups_id")
+        if not google_drive_refresh_token:
+            if group_config in user['groups_id']:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
+            else:
+                raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator."))
+        google_drive_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
+        google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret')
+        #For Getting New Access Token With help of old Refresh Token
+
+        data = urllib.urlencode(dict(client_id=google_drive_client_id,
+                                     refresh_token=google_drive_refresh_token,
+                                     client_secret=google_drive_client_secret,
+                                     grant_type="refresh_token",
+                                     scope=scope or 'https://www.googleapis.com/auth/drive'))
+        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
+        try:
+            req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
+            content = urllib2.urlopen(req).read()
+        except urllib2.HTTPError:
+            if group_config in user['groups_id']:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."), context=context)
+            else:
+                raise osv.except_osv(_('Error!'), _("Google Drive is not yet configured. Please contact your administrator."))
+        content = json.loads(content)
+        return content.get('access_token')
+
+    def copy_doc(self, cr, uid, res_id, template_id, name_gdocs, res_model, context=None):
+        ir_config = self.pool['ir.config_parameter']
+        google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
+        access_token = self.get_access_token(cr, uid, context=context)
+        # Copy template in to drive with help of new access token
+        request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, access_token)
+        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
+        try:
+            req = urllib2.Request(request_url, None, headers)
+            parents = urllib2.urlopen(req).read()
+        except urllib2.HTTPError:
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("The Google Template cannot be found. Maybe it has been deleted."), context=context)
+        parents_dict = json.loads(parents)
+
+        record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
+        data = {"title": name_gdocs, "description": record_url, "parents": parents_dict['parents']}
+        request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (template_id, access_token)
+        headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
+        data_json = json.dumps(data)
+        # resp, content = Http().request(request_url, "POST", data_json, headers)
+        req = urllib2.Request(request_url, data_json, headers)
+        content = urllib2.urlopen(req).read()
+        content = json.loads(content)
+        res = {}
+        if content.get('alternateLink'):
+            attach_pool = self.pool.get("ir.attachment")
+            attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url': content['alternateLink']}
+            res['id'] = attach_pool.create(cr, uid, attach_vals)
+            res['url'] = content['alternateLink']
+        return res
+
+    def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
+        '''
+        Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
+        will first seek for a google.docs.config associated with the model `res_model` to find out what's the template
+        of google doc to copy (this is usefull if you want to start with a non-empty document, a type or a name
+        different than the default values). If no config is associated with the `res_model`, then a blank text document
+        with a default name is created.
+          :param res_model: the object for which the google doc is created
+          :param ids: the list of ids of the objects for which the google doc is created. This list is supposed to have
+            a length of 1 element only (batch processing is not supported in the code, though nothing really prevent it)
+          :return: the config id and config name
+        '''
+        if not res_id:
+            raise osv.except_osv(_('Google Drive Error!'), _("Creating google drive may only be done by one at a time."))
+        # check if a model is configured with a template
+        config_ids = self.search(cr, uid, [('model_id', '=', res_model)], context=context)
+        configs = []
+        for config in self.browse(cr, uid, config_ids, context=context):
+            if config.filter_id:
+                if (config.filter_id.user_id and config.filter_id.user_id.id != uid):
+                    #Private
+                    continue
+                domain = [('id', 'in', [res_id])] + eval(config.filter_id.domain)
+                local_context = context and context.copy() or {}
+                local_context.update(eval(config.filter_id.context))
+                google_doc_configs = self.pool.get(config.filter_id.model_id).search(cr, uid, domain, context=local_context)
+                if google_doc_configs:
+                    configs.append({'id': config.id, 'name': config.name})
+            else:
+                configs.append({'id': config.id, 'name': config.name})
+        return configs
+
+    def _resource_get(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        for data in self.browse(cr, uid, ids, context):
+            mo = re.search("(key=|/d/)([A-Za-z0-9-_]+)", data.google_drive_template_url)
+            if mo:
+                result[data.id] = mo.group(2)
+            else:
+                raise osv.except_osv(_('Incorrect URL!'), _("Please enter a valid Google Document URL."))
+        return result
+
+    def _client_id_get(self, cr, uid, ids, name, arg, context=None):
+        result = {}
+        client_id = self.pool['ir.config_parameter'].get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
+        for config_id in ids:
+            result[config_id] = client_id
+        return result
+
+    _columns = {
+        'name': fields.char('Template Name', required=True, size=1024),
+        'model_id': fields.many2one('ir.model', 'Model', ondelete='set null', required=True),
+        'model': fields.related('model_id', 'model', type='char', string='Model', readonly=True),
+        'filter_id': fields.many2one('ir.filters', 'Filter', domain="[('model_id', '=', model)]"),
+        'google_drive_template_url': fields.char('Template URL', required=True, size=1024),
+        'google_drive_resource_id': fields.function(_resource_get, type="char", string='Resource Id'),
+        'google_drive_client_id': fields.function(_client_id_get, type="char", string='Google Client '),
+        'name_template': fields.char('Google Drive Name Pattern', size=64, help='Choose how the new google drive will be named, on google side. Eg. gdoc_%(field_name)s', required=True),
+        'active': fields.boolean('Active'),
+    }
+
+    def onchange_model_id(self, cr, uid, ids, model_id, context=None):
+        res = {}
+        if model_id:
+            model = self.pool['ir.model'].browse(cr, uid, model_id, context=context)
+            res['value'] = {'model': model.model}
+        else:
+            res['value'] = {'filter_id': False, 'model': False}
+        return res
+
+    _defaults = {
+        'name_template': 'Document %(name)s',
+        'active': True,
+    }
+
+    def _check_model_id(self, cr, uid, ids, context=None):
+        config_id = self.browse(cr, uid, ids[0], context=context)
+        if config_id.filter_id and config_id.model_id.model != config_id.filter_id.model_id:
+            return False
+        return True
+
+    _constraints = [
+        (_check_model_id, 'Model of selected filter is not matching with model of current template.', ['model_id', 'filter_id']),
+    ]
+
+    def get_google_scope(self):
+        return 'https://www.googleapis.com/auth/drive'
+
+config()
+
+
+class base_config_settings(osv.osv):
+    _inherit = "base.config.settings"
+
+    _columns = {
+        'google_drive_authorization_code': fields.char('Authorization Code', size=124),
+        'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
+    }
+    _defaults = {
+        'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', scope=s.pool['google.drive.config'].get_google_scope(), context=c),
+    }
+
+    def set_google_authorization_code(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        refresh_token = self.pool['google.service'].generate_refresh_token(cr, uid, 'drive', config.google_drive_authorization_code, context=context)
+        self.pool['ir.config_parameter'].set_param(cr, uid, 'google_drive_refresh_token', refresh_token)
diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/google_drive_data.xml
new file mode 100644
index 00000000000..b1f9883c149
--- /dev/null
+++ b/addons/google_drive/google_drive_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+  
+         <record id="config_google_drive_client_id" model="ir.config_parameter">
+            <field name="key">google_drive_client_id</field>
+            <field name="value">598905559630.apps.googleusercontent.com</field>
+        </record>
+        
+        <record id="config_google_drive_client_secret" model="ir.config_parameter">
+            <field name="key">google_drive_client_secret</field>
+            <field name="value">vTmou73c-njP-1qCxm7qx7QE</field>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_drive/google_drive_demo.xml b/addons/google_drive/google_drive_demo.xml
new file mode 100644
index 00000000000..ebe73f40ec2
--- /dev/null
+++ b/addons/google_drive/google_drive_demo.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- filter demo -->
+        <record id="filter_partner" model="ir.filters">
+            <field name="name">Customer</field>
+            <field name="model_id">res.partner</field>
+            <field name="domain">[['customer', '=', 1]]</field>
+            <field name="user_id" eval="False" />
+        </record>
+
+        <!-- template demo -->
+        <record id="template_partner" model="google.drive.config">
+            <field name="name">Partner Review</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="filter_id" ref="filter_partner"/>
+            <field name="google_drive_template_url">https://docs.google.com/spreadsheet/ccc?key=0Ah2qnrLAoZmUdGRvdVdmS1VoSDctWk1kd18taGZ4ckE#gid=0</field>
+            <field name="name_template">Partner Review %(name)s</field>
+        </record>
+        
+    </data>
+</openerp>
+
diff --git a/addons/google_drive/i18n/ar.po b/addons/google_drive/i18n/ar.po
new file mode 100644
index 00000000000..119cd48268c
--- /dev/null
+++ b/addons/google_drive/i18n/ar.po
@@ -0,0 +1,259 @@
+# Arabic 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-02-25 21:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/cs.po b/addons/google_drive/i18n/cs.po
new file mode 100644
index 00000000000..8d076ddc8e4
--- /dev/null
+++ b/addons/google_drive/i18n/cs.po
@@ -0,0 +1,259 @@
+# Czech 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-03-31 16:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <cs@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/de.po b/addons/google_drive/i18n/de.po
new file mode 100644
index 00000000000..95e051fea35
--- /dev/null
+++ b/addons/google_drive/i18n/de.po
@@ -0,0 +1,260 @@
+# German translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2012-12-10 11:38+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\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-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Fehler im 'Key' !"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Modul"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/es.po b/addons/google_drive/i18n/es.po
new file mode 100644
index 00000000000..8e7770930e0
--- /dev/null
+++ b/addons/google_drive/i18n/es.po
@@ -0,0 +1,303 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-08-07 02:00+0000\n"
+"Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-08-08 04:39+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr "Configuración de Google Drive"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "¡Error de clave!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+"El nombre del documento adjunto puede contener información fija o variable. "
+"Para distinguir documentos en Google Drive, use palabras y campos fijos. "
+"Así, en el ejemplo anterior, si se escribió 'Agrolait_%(name)s_Sales' en el "
+"campo de nombre de GoogleDrive, el documento en su Google Drive y en los "
+"adjuntos de OpenERP se llamarán 'Agrolait_SO0001_Sales'."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+"- Si no especifica un filtro, el enlace del documento de Google aparecerá en "
+"la opción \"Más\" para todos los usuarios para todas las oportunidades."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr "Para crear un nuevo filtro:"
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Pulse para añadir una plantilla.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Enlace sus propias plantillas de Google Drive a "
+"cualquier registro de OpenERP. Si tiene documentos realmente específicos que "
+"quiere que su colaborador rellene (como usar una hoja de cálculo para "
+"controlar la calidad de su producto o revisar los detalles de entrega de "
+"cada pedido en un país extranjero,...) es muy sencillo gestionarlo. "
+"Enlácelos en OpenERP y úselos para colaborar con sus empleados.\n"
+"                </p>\n"
+"            "
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr "¡URL incorrecta!"
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr "Configure sus plantillas"
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+"Elija el nombre de la nueva unidad de Google Drive, en el lado de Google. "
+"P.ej.: gdoc_%(field_name)s"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+"- Vaya al documento de OpenERP que quiera filtrar. Por ejemplo, vaya a "
+"Oportunidades y busque en el Departamento de ventas."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+"- En esta vista de \"Búsqueda\", seleccione la opción \"Guardar filtro "
+"actual\" e introduzca el nombre (p.ej.: Departamento de ventas)"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+"- Si selecciona \"Compartir con todos los usuarios\", el enlace al documento "
+"de Google en la opción \"Más\" aparecerá para todos los usuarios en las "
+"oportunidades del Departamento de ventas."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+"- Si no selecciona \"Compartir con todos los usuarios\", el enlace al "
+"documento de Google en la opción \"Más\" no aparecerá para otros usuarios en "
+"las oportunidades del Departamento de ventas."
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+"No se ha podido encontrar al menos una clave de su patrón de nombres de "
+"Google Drive"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr "Por favor, introduzca una URL de documento de Google válida."
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr "Cliente de Google "
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr "Filtro"
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr "Patrón de nombres de Google Drive"
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr "La URL para generar el código de autorización de Google"
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr "ID del recurso"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr "No se encuentra la plantilla de Google. Tal vez se haya eliminado."
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr "Plantillas de Google Drive"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+"Algo ha ido mal durante la creación del testigo. Por favor, solicite un "
+"código de autorización otra vez en "
+"%(menu:base_setup.menu_general_configuration)s."
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr "¡Error de Google Drive!"
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr "URI"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+"Es posible que la creación de Google Drive sólo se pueda hacer de una en una."
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr "Configuración de Google Drive"
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr "Nombre de la plantilla"
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+"El modelo del filtro seleccionado no coincide con el modelo de la plantilla "
+"actual."
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr "URL de la plantilla"
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr "y péguela aquí"
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr "Cídigo de autorización"
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr "Configuración de plantillas de Google Drive"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+"No ha configurado el 'código de autorización' generado por Google. Por "
+"favor, genérelo y configúrelo en "
+"%(menu:base_setup.menu_general_configuration)s."
diff --git a/addons/google_drive/i18n/fr.po b/addons/google_drive/i18n/fr.po
new file mode 100644
index 00000000000..c32125d1989
--- /dev/null
+++ b/addons/google_drive/i18n/fr.po
@@ -0,0 +1,260 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2012-12-21 13:47+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\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-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Erreur de clé!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Modèles"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/google_drive.pot b/addons/google_drive/i18n/google_drive.pot
new file mode 100644
index 00000000000..4472e9c0ed1
--- /dev/null
+++ b/addons/google_drive/i18n/google_drive.pot
@@ -0,0 +1,227 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* google_drive
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 8.0alpha1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-06-27 16:03+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "The name of the attached document can use fixed or variable data. To distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "- If filter is not specified, link of google document will appear in \"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of OpenERP. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to OpenERP and use them to collaborate with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid "Choose how the new google drive will be named, on google side. Eg. gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "- Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "- In this \"Search\" view, select the option \"Save Current Filter\", enter the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "- If you select \"Share with all users\", link of google document in \"More\" options will appear for all users in opportunities of Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "- If you don't select \"Share with all users\", link of google document in \"More\" options will not appear for other users in opportunities of Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid "Something went wrong during the token generation. Please request again an authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid "Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid "You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
diff --git a/addons/google_drive/i18n/hr.po b/addons/google_drive/i18n/hr.po
new file mode 100644
index 00000000000..be76be7ef99
--- /dev/null
+++ b/addons/google_drive/i18n/hr.po
@@ -0,0 +1,259 @@
+# Croatian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2012-12-09 20:25+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"Language-Team: Croatian <hr@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/hu.po b/addons/google_drive/i18n/hu.po
new file mode 100644
index 00000000000..5ff6354f18b
--- /dev/null
+++ b/addons/google_drive/i18n/hu.po
@@ -0,0 +1,259 @@
+# 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-03-02 09:35+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-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Kulcs hiba!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Modell"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/it.po b/addons/google_drive/i18n/it.po
new file mode 100644
index 00000000000..0dc867b43ad
--- /dev/null
+++ b/addons/google_drive/i18n/it.po
@@ -0,0 +1,259 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2012-12-18 22:11+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
+"Language-Team: Italian <it@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Errore Chiave!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Modello"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/ln.po b/addons/google_drive/i18n/ln.po
new file mode 100644
index 00000000000..100033037fc
--- /dev/null
+++ b/addons/google_drive/i18n/ln.po
@@ -0,0 +1,259 @@
+# 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: 2013-06-27 16:03+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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/mk.po b/addons/google_drive/i18n/mk.po
new file mode 100644
index 00000000000..d2f329517c1
--- /dev/null
+++ b/addons/google_drive/i18n/mk.po
@@ -0,0 +1,259 @@
+# Macedonian 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-03-08 14:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Грешка во клуч!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Модел"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/mn.po b/addons/google_drive/i18n/mn.po
new file mode 100644
index 00000000000..060c1e7b596
--- /dev/null
+++ b/addons/google_drive/i18n/mn.po
@@ -0,0 +1,259 @@
+# Mongolian 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-02-19 02:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Модел"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/nl.po b/addons/google_drive/i18n/nl.po
new file mode 100644
index 00000000000..771e7b754d5
--- /dev/null
+++ b/addons/google_drive/i18n/nl.po
@@ -0,0 +1,259 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2012-12-01 16:42+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Key fout!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/pl.po b/addons/google_drive/i18n/pl.po
new file mode 100644
index 00000000000..4c7ec91b703
--- /dev/null
+++ b/addons/google_drive/i18n/pl.po
@@ -0,0 +1,259 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2012-12-16 11:28+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
+"Language-Team: Polish <pl@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Błąd klucza"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/pt.po b/addons/google_drive/i18n/pt.po
new file mode 100644
index 00000000000..11edb4ffc2a
--- /dev/null
+++ b/addons/google_drive/i18n/pt.po
@@ -0,0 +1,259 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2012-12-10 17:49+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"Language-Team: Portuguese <pt@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/pt_BR.po b/addons/google_drive/i18n/pt_BR.po
new file mode 100644
index 00000000000..be9806e4c66
--- /dev/null
+++ b/addons/google_drive/i18n/pt_BR.po
@@ -0,0 +1,305 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-07-20 22:32+0000\n"
+"Last-Translator: Claudio de Araujo Santos <claudioaraujosantos@gmail.com>\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-07-22 05:34+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr "Configuração do Google Drive"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Erro de Chave!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+"O nome do documento em anexo pode usar dados fixos ou variáveis. Para "
+"distinguir entre documentos\n"
+"                                Google Drive, usar palavras fixos e campos. "
+"Por exemplo, no exemplo acima, se escreveu Agrolait_% (nome) s_Sales\n"
+"                                no campo Nome da unidade do Google, o "
+"documento em seu Google Drive e em OpenERP anexo será nomeado\n"
+"                                'Agrolait_SO0001_Sales \"."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+"- Se o filtro não for especificado, ligação de documento google aparecerá na "
+"opção \"Mais\" para todos os usuários de todas as oportunidades."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr "Para criar um novo filtro:"
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Clique para adicionar um novo modelo.\n"
+"                </ P>\n"
+"                <p>\n"
+"                    Vincular seus próprios modelos Google Drive para "
+"qualquer registro de OpenERP. Se você tem documentos específicos que você "
+"realmente deseja que seu colaborador preencher, por exemplo, usar uma "
+"planilha para controlar a qualidade do seu produto ou rever a lista de "
+"entrega para cada ordem em um país estrangeiro, ... É muito fácil de "
+"gerenciá-los, associá-los a OpenERP e usá-los para colaborar com seus "
+"empregados.\n"
+"                </ P>\n"
+"            "
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr "URL incorreto!"
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr "Configure seus modelos"
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+"Escolha como a nova unidade google será nomeado, no lado google. Por "
+"exemplo. gdoc_% (field_name) s"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+"- Vá para o documento OpenERP você deseja filtrar. Por exemplo, ir para "
+"Oportunidades e de pesquisa no Departamento de Vendas."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+"- Neste ponto de vista \"Pesquisar\", selecione a opção \"Salvar Filtro "
+"Atual\", digite o nome (Ex: Departamento de Vendas)"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+"- Se você selecionar \"Compartilhar com todos os usuários\", ligação de "
+"documento google na opção \"Mais\" será exibido para todos os usuários em "
+"oportunidades do Departamento de Vendas."
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+"- Se você não selecionar \"Compartilhar com todos os usuários\", link do "
+"documento google em \"More\" opções não aparecerá para outros usuários em "
+"oportunidades do Departamento de Vendas."
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+"Pelo menos uma chave não pode ser encontrado em seu padrão de nome de Google "
+"Drive"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr "Por favor insira um URL Documento Google válida."
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr "Google Cliente "
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr "Filtro"
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr "Nome Padrão Google Drive"
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr "O URL para gerar o código de autorização do Google"
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr "ID Recurso"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+"O modelo do Google não pode ser encontrado. Talvez tenha sido excluído."
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr "Templates do Google Drive"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+"Algo deu errado durante a geração de token. Por favor, solicite novamente um "
+"código de autorização em%(menu:base_setup.menu_general_configuration)s."
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr "Google Drive Error!"
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr "URL"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr "Criação de unidade google só pode ser feito por um de cada vez."
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr "Configuração do acionamento Google"
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr "Nome do modelo"
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+"Modelo de filtro selecionado não está combinando com o modelo do modelo "
+"atual."
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr "Modelo de URL"
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr "e cole-o aqui"
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr "Código de Autorização"
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr "Google Drive templates de configuração"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+"Você não configurou \"Código de Autorização\" gerado a partir do Google, por "
+"favor, gerar e configurá-lo em "
+"%(menu:base_setup.menu_general_configuration)s."
diff --git a/addons/google_drive/i18n/ro.po b/addons/google_drive/i18n/ro.po
new file mode 100644
index 00000000000..8f4d9a1169f
--- /dev/null
+++ b/addons/google_drive/i18n/ro.po
@@ -0,0 +1,259 @@
+# Romanian 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-01-27 09:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Romanian <ro@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Eroare Cheie!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/ru.po b/addons/google_drive/i18n/ru.po
new file mode 100644
index 00000000000..9579b8a93c5
--- /dev/null
+++ b/addons/google_drive/i18n/ru.po
@@ -0,0 +1,259 @@
+# 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-03-01 11:29+0000\n"
+"Last-Translator: Эдуард <Unknown>\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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Ошибка ключа!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Модель"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/sl.po b/addons/google_drive/i18n/sl.po
new file mode 100644
index 00000000000..eb7ef7ed79c
--- /dev/null
+++ b/addons/google_drive/i18n/sl.po
@@ -0,0 +1,259 @@
+# Slovenian 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-01-26 12:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Slovenian <sl@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/sv.po b/addons/google_drive/i18n/sv.po
new file mode 100644
index 00000000000..c0435c8bd9e
--- /dev/null
+++ b/addons/google_drive/i18n/sv.po
@@ -0,0 +1,259 @@
+# Swedish 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-02-15 14:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Nyckelfel!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/tr.po b/addons/google_drive/i18n/tr.po
new file mode 100644
index 00000000000..a3e3b6b791b
--- /dev/null
+++ b/addons/google_drive/i18n/tr.po
@@ -0,0 +1,259 @@
+# Turkish 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-02-04 14:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr "Anahtar Hatası!"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr ""
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "Model"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr ""
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/i18n/zh_CN.po b/addons/google_drive/i18n/zh_CN.po
new file mode 100644
index 00000000000..f7171c9225e
--- /dev/null
+++ b/addons/google_drive/i18n/zh_CN.po
@@ -0,0 +1,259 @@
+# Chinese (Simplified) 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: 2013-06-27 16:03+0000\n"
+"PO-Revision-Date: 2013-06-29 04:39+0000\n"
+"Last-Translator: David.Xu <xzxyxu@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-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: google_drive
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_config
+msgid "Google Drive configuration"
+msgstr "Google Drive配置"
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"The name of the attached document can use fixed or variable data. To "
+"distinguish between documents in\n"
+"                                Google Drive, use fixed words and fields. "
+"For instance, in the example above, if you wrote Agrolait_%(name)s_Sales\n"
+"                                in the Google Drive name field, the document "
+"in your Google Drive and in OpenERP attachment will be named\n"
+"                                'Agrolait_SO0001_Sales'."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If filter is not specified, link of google document will appear in "
+"\"More\" option for all users for all opportunities."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "To create a new filter:"
+msgstr "创建新过滤器"
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,help:google_drive.action_google_drive_users_config
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to add a new template.\n"
+"                </p>\n"
+"                <p>\n"
+"                    Link your own google drive templates to any record of "
+"OpenERP. If you have really specific documents you want your collaborator "
+"fill in, e.g. Use a spreadsheet to control the quality of your product or "
+"review the delivery checklist for each order in a foreign country, ... Its "
+"very easy to manage them, link them to OpenERP and use them to collaborate "
+"with your employees.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Incorrect URL!"
+msgstr "错误的URL"
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "Configure your templates"
+msgstr "配置你的模版"
+
+#. module: google_drive
+#: help:google.drive.config,name_template:0
+msgid ""
+"Choose how the new google drive will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- Go to the OpenERP document you want to filter. For instance, go to "
+"Opportunities and search on Sales Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- In this \"Search\" view, select the option \"Save Current Filter\", enter "
+"the name (Ex: Sales Department)"
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you select \"Share with all users\", link of google document in "
+"\"More\" options will appear for all users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"- If you don't select \"Share with all users\", link of google document in "
+"\"More\" options will not appear for other users in opportunities of Sales "
+"Department."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:48
+#, python-format
+msgid "At least one key cannot be found in your Google Drive name pattern"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:150
+#, python-format
+msgid "Please enter a valid Google Document URL."
+msgstr "请输入一个有效的Google文档URL"
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_client_id:0
+msgid "Google Client "
+msgstr ""
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid ""
+"https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcu"
+"a4/edit"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,filter_id:0
+msgid "Filter"
+msgstr "过滤器"
+
+#. module: google_drive
+#: field:google.drive.config,name_template:0
+msgid "Google Drive Name Pattern"
+msgstr ""
+
+#. module: google_drive
+#: help:base.config.settings,google_drive_uri:0
+msgid "The URL to generate the authorization code from Google"
+msgstr ""
+
+#. module: google_drive
+#: model:ir.filters,name:google_drive.filter_partner
+msgid "Customer"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_resource_id:0
+msgid "Resource Id"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:91
+#, python-format
+msgid "The Google Template cannot be found. Maybe it has been deleted."
+msgstr ""
+
+#. module: google_drive
+#: model:ir.actions.act_window,name:google_drive.action_google_drive_users_config
+#: model:ir.ui.menu,name:google_drive.menu_google_drive_model_config
+msgid "Google Drive Templates"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:81
+#, python-format
+msgid ""
+"Something went wrong during the token generation. Please request again an "
+"authorization code in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Google Drive Error!"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_uri:0
+msgid "URI"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:124
+#, python-format
+msgid "Creating google drive may only be done by one at a time."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,model:0
+#: field:google.drive.config,model_id:0
+msgid "Model"
+msgstr "模块"
+
+#. module: google_drive
+#: view:google.drive.config:0
+msgid "Google Drive Configuration"
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,name:0
+msgid "Template Name"
+msgstr "模板名称"
+
+#. module: google_drive
+#: constraint:google.drive.config:0
+msgid ""
+"Model of selected filter is not matching with model of current template."
+msgstr ""
+
+#. module: google_drive
+#: field:google.drive.config,google_drive_template_url:0
+msgid "Template URL"
+msgstr ""
+
+#. module: google_drive
+#: view:base.config.settings:0
+msgid "and paste it here"
+msgstr ""
+
+#. module: google_drive
+#: field:base.config.settings,google_drive_authorization_code:0
+msgid "Authorization Code"
+msgstr "授权码"
+
+#. module: google_drive
+#: model:ir.model,name:google_drive.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
+#. module: google_drive
+#: code:addons/google_drive/google_drive.py:64
+#, python-format
+msgid ""
+"You haven't configured 'Authorization Code' generated from google, Please "
+"generate and configure it in %(menu:base_setup.menu_general_configuration)s."
+msgstr ""
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
new file mode 100644
index 00000000000..dc563a76c2b
--- /dev/null
+++ b/addons/google_drive/res_config_user_view.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- add google drive config field in user form -->
+
+        <record model="ir.ui.view" id="view_google_drive_config_tree">
+            <field name="name">google_drive.config.tree</field>
+            <field name="model">google.drive.config</field>
+            <field name="arch" type="xml">
+                <tree string="Google Drive Configuration">
+                    <field name="name" />
+                    <field name="model_id" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_google_drive_config_form">
+            <field name="name">google_drive.config.form</field>
+            <field name="model">google.drive.config</field>
+            <field name="arch" type="xml">
+                <form string="Google Drive Configuration" version="7.0">
+                    <field name="model" invisible="1" />
+                    <group>
+                        <field name="name" />
+                        <field name="active" />
+                        <field name="model_id" on_change="onchange_model_id(model_id)" />
+                        <label for='filter_id' />
+                        <div>
+                            <field name='filter_id' />
+                            <p class="oe_grey">
+                                <b>To create a new filter:</b><br/>
+                                - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
+                                - In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
+                                - If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
+                                - If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
+                                - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
+                            </p>
+                        </div>
+                        <field name='google_drive_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1" />
+                        <field name='google_drive_resource_id' invisible="1" />
+                        <label for='name_template' />
+                        <div>
+                            <field name='name_template' />
+                            <p class="oe_grey">
+                                The name of the attached document can use fixed or variable data. To distinguish between documents in
+                                Google Drive, use fixed words and fields. For instance, in the example above, if you wrote Agrolait_%%(name)s_Sales
+                                in the Google Drive name field, the document in your Google Drive and in OpenERP attachment will be named
+                                'Agrolait_SO0001_Sales'.
+                            </p>
+                        </div>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='action_google_drive_users_config'>
+            <field name='name'>Templates</field>
+            <field name='res_model'>google.drive.config</field>
+            <field name='type'>ir.actions.act_window</field>
+            <field name='view_type'>form</field>
+            <field name='view_id' ref='view_google_drive_config_tree' />
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to add a new template.
+                </p>
+                <p>
+                    Link your own google drive templates to any record of OpenERP. If you have really specific documents you want your collaborator fill in, e.g. Use a spreadsheet to control the quality of your product or review the delivery checklist for each order in a foreign country, ... Its very easy to manage them, link them to OpenERP and use them to collaborate with your employees.
+                </p>
+            </field>
+        </record>
+
+        <record id="inherited_google_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">
+                <xpath expr="//div[@name='module_google_drive']" position="after">
+                    <div attrs="{'invisible': [('module_google_drive','=',False)]}">
+                        <div class="oe_inline">
+                            <field name="google_drive_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
+                            and paste it here
+                            <field name="google_drive_authorization_code" class="oe_inline" />
+                        </div>
+                        <button type="action" name="%(google_drive.action_google_drive_users_config)d" string="Configure your templates" class="oe_link" />
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+        <menuitem name='Google Drive' id='menu_google_drive_config' parent='base.menu_administration' />
+        <menuitem id='menu_google_drive_model_config' parent='menu_google_drive_config' action='action_google_drive_users_config' />
+    </data>
+</openerp>
diff --git a/addons/google_drive/security/ir.model.access.csv b/addons/google_drive/security/ir.model.access.csv
new file mode 100644
index 00000000000..ae98cb36976
--- /dev/null
+++ b/addons/google_drive/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_google_drive_all,google.drive.config,model_google_drive_config,,1,0,0,0
+access_google_drive,google.drive.config,model_google_drive_config,base.group_system,1,1,1,1
\ No newline at end of file
diff --git a/addons/google_drive/static/description/icon.png b/addons/google_drive/static/description/icon.png
new file mode 100644
index 00000000000..3989ab57b30
Binary files /dev/null and b/addons/google_drive/static/description/icon.png differ
diff --git a/addons/google_drive/static/lib/gapi/client.js b/addons/google_drive/static/lib/gapi/client.js
new file mode 100644
index 00000000000..7f40ec55ef9
--- /dev/null
+++ b/addons/google_drive/static/lib/gapi/client.js
@@ -0,0 +1,7 @@
+var gapi=window.gapi=window.gapi||{};gapi._bs=new Date().getTime();(function(){var f=null,g=encodeURIComponent,k=window,m=decodeURIComponent,n="push",r="test",t="shift",u="replace",y="length",B="split",C="join";var D=k,E=document,aa=D.location,ba=function(){},ca=/\[native code\]/,G=function(a,b,c){return a[b]=a[b]||c},da=function(a){for(var b=0;b<this[y];b++)if(this[b]===a)return b;return-1},ea=function(a){a=a.sort();for(var b=[],c=void 0,d=0;d<a[y];d++){var e=a[d];e!=c&&b[n](e);c=e}return b},H=function(){var a;if((a=Object.create)&&ca[r](a))a=a(f);else{a={};for(var b in a)a[b]=void 0}return a},I=G(D,"gapi",{});var J;J=G(D,"___jsl",H());G(J,"I",0);G(J,"hel",10);var K=function(){var a=aa.href,b;if(J.dpo)b=J.h;else{b=J.h;var c=RegExp("([#].*&|[#])jsh=([^&#]*)","g"),d=RegExp("([?#].*&|[?#])jsh=([^&#]*)","g");if(a=a&&(c.exec(a)||d.exec(a)))try{b=m(a[2])}catch(e){}}return b},fa=function(a){var b=G(J,"PQ",[]);J.PQ=[];var c=b[y];if(0===c)a();else for(var d=0,e=function(){++d===c&&a()},h=0;h<c;h++)b[h](e)},L=function(a){return G(G(J,"H",H()),a,H())};var M=G(J,"perf",H()),N=G(M,"g",H()),ga=G(M,"i",H());G(M,"r",[]);H();H();var O=function(a,b,c){var d=M.r;"function"===typeof d?d(a,b,c):d[n]([a,b,c])},Q=function(a,b,c){b&&0<b[y]&&(b=P(b),c&&0<c[y]&&(b+="___"+P(c)),28<b[y]&&(b=b.substr(0,28)+(b[y]-28)),c=b,b=G(ga,"_p",H()),G(b,c,H())[a]=(new Date).getTime(),O(a,"_p",c))},P=function(a){return a[C]("__")[u](/\./g,"_")[u](/\-/g,"_")[u](/\,/g,"_")};var S=H(),T=[],U=function(a){throw Error("Bad hint"+(a?": "+a:""));};T[n](["jsl",function(a){for(var b in a)if(Object.prototype.hasOwnProperty.call(a,b)){var c=a[b];"object"==typeof c?J[b]=G(J,b,[]).concat(c):G(J,b,c)}if(b=a.u)a=G(J,"us",[]),a[n](b),(b=/^https:(.*)$/.exec(b))&&a[n]("http:"+b[1])}]);var ha=/^(\/[a-zA-Z0-9_\-]+)+$/,ia=/^[a-zA-Z0-9\-_\.!]+$/,ja=/^gapi\.loaded_[0-9]+$/,ka=/^[a-zA-Z0-9,._-]+$/,oa=function(a,b,c,d){var e=a[B](";"),h=S[e[t]()],l=f;h&&(l=h(e,b,c,d));if(!(b=!l))b=l,c=b.match(la),d=b.match(ma),b=!(d&&1===d[y]&&na[r](b)&&c&&1===c[y]);b&&U(a);return l},qa=function(a,b,c,d){a=pa(a);ja[r](c)||U("invalid_callback");b=V(b);d=d&&d[y]?V(d):f;var e=function(a){return g(a)[u](/%2C/g,",")};return[g(a.d)[u](/%2C/g,",")[u](/%2F/g,"/"),"/k=",e(a.version),"/m=",e(b),d?"/exm="+e(d):
+"","/rt=j/sv=1/d=1/ed=1",a.a?"/am="+e(a.a):"",a.b?"/rs="+e(a.b):"","/cb=",e(c)][C]("")},pa=function(a){"/"!==a.charAt(0)&&U("relative path");for(var b=a.substring(1)[B]("/"),c=[];b[y];){a=b[t]();if(!a[y]||0==a.indexOf("."))U("empty/relative directory");else if(0<a.indexOf("=")){b.unshift(a);break}c[n](a)}a={};for(var d=0,e=b[y];d<e;++d){var h=b[d][B]("="),l=m(h[0]),p=m(h[1]);2!=h[y]||(!l||!p)||(a[l]=a[l]||p)}b="/"+c[C]("/");ha[r](b)||U("invalid_prefix");c=W(a,"k",!0);d=W(a,"am");a=W(a,"rs");return{d:b,
+version:c,a:d,b:a}},V=function(a){for(var b=[],c=0,d=a[y];c<d;++c){var e=a[c][u](/\./g,"_")[u](/-/g,"_");ka[r](e)&&b[n](e)}return b[C](",")},W=function(a,b,c){a=a[b];!a&&c&&U("missing: "+b);if(a){if(ia[r](a))return a;U("invalid: "+b)}return f},na=/^https?:\/\/[a-z0-9_.-]+\.google\.com(:\d+)?\/[a-zA-Z0-9_.,!=\-\/]+$/,ma=/\/cb=/g,la=/\/\//g,ra=function(){var a=K();if(!a)throw Error("Bad hint");return a};S.m=function(a,b,c,d){(a=a[0])||U("missing_hint");return"https://apis.google.com"+qa(a,b,c,d)};var X=decodeURI("%73cript"),Y=function(a,b){for(var c=[],d=0;d<a[y];++d){var e=a[d];e&&0>da.call(b,e)&&c[n](e)}return c},sa=function(a){"loading"!=E.readyState?Z(a):E.write("<"+X+' src="'+encodeURI(a)+'"></'+X+">")},Z=function(a){var b=E.createElement(X);b.setAttribute("src",a);b.async="true";(a=E.getElementsByTagName(X)[0])?a.parentNode.insertBefore(b,a):(E.head||E.body||E.documentElement).appendChild(b)},ta=function(a,b){var c=b&&b._c;if(c)for(var d=0;d<T[y];d++){var e=T[d][0],h=T[d][1];h&&Object.prototype.hasOwnProperty.call(c,
+e)&&h(c[e],a,b)}},ua=function(a,b){$(function(){var c;c=b===K()?G(I,"_",H()):H();c=G(L(b),"_",c);a(c)})},wa=function(a,b){var c=b||{};"function"==typeof b&&(c={},c.callback=b);ta(a,c);var d=a?a[B](":"):[],e=c.h||ra(),h=G(J,"ah",H());if(!h["::"]||!d[y])va(d||[],c,e);else{for(var l=[],p=f;p=d[t]();){var v=p[B]("."),v=h[p]||h[v[1]&&"ns:"+v[0]||""]||e,s=l[y]&&l[l[y]-1]||f,z=s;if(!s||s.hint!=v)z={hint:v,c:[]},l[n](z);z.c[n](p)}var A=l[y];if(1<A){var F=c.callback;F&&(c.callback=function(){0==--A&&F()})}for(;d=
+l[t]();)va(d.c,c,d.hint)}},va=function(a,b,c){a=ea(a)||[];var d=b.callback,e=b.config,h=b.timeout,l=b.ontimeout,p=f,v=!1;if(h&&!l||!h&&l)throw"Timeout requires both the timeout parameter and ontimeout parameter to be set";var s=G(L(c),"r",[]).sort(),z=G(L(c),"L",[]).sort(),A=[].concat(s),F=function(a,b){if(v)return 0;D.clearTimeout(p);z[n].apply(z,q);var d=((I||{}).config||{}).update;d?d(e):e&&G(J,"cu",[])[n](e);if(b){Q("me0",a,A);try{ua(b,c)}finally{Q("me1",a,A)}}return 1};0<h&&(p=D.setTimeout(function(){v=
+!0;l()},h));var q=Y(a,z);if(q[y]){var q=Y(a,s),w=G(J,"CP",[]),x=w[y];w[x]=function(a){if(!a)return 0;Q("ml1",q,A);var b=function(b){w[x]=f;F(q,a)&&fa(function(){d&&d();b()})},c=function(){var a=w[x+1];a&&a()};0<x&&w[x-1]?w[x]=function(){b(c)}:b(c)};if(q[y]){var R="loaded_"+J.I++;I[R]=function(a){w[x](a);I[R]=f};a=oa(c,q,"gapi."+R,s);s[n].apply(s,q);Q("ml0",q,A);b.sync||D.___gapisync?sa(a):Z(a)}else w[x](ba)}else F(q)&&d&&d()};var $=function(a){if(J.hee&&0<J.hel)try{return a()}catch(b){J.hel--,wa("debug_error",function(){k.___jsl.hefn(b)})}else return a()};I.load=function(a,b){return $(function(){return wa(a,b)})};N.bs0=k.gapi._bs||(new Date).getTime();O("bs0");N.bs1=(new Date).getTime();O("bs1");delete k.gapi._bs;})();
+gapi.load("client",{callback:window["gapi_onload"],_c:{"jsl":{"ci":{"services":{},"deviceType":"desktop","lexps":[102,103,100,71,98,96,110,108,79,106,45,17,86,81,112,61,30],"inline":{"css":1},"report":{},"oauth-flow":{"disableOpt":true,"authUrl":"https://accounts.google.com/o/oauth2/auth","proxyUrl":"https://accounts.google.com/o/oauth2/postmessageRelay","persist":true},"isLoggedIn":true,"isPlusUser":true,"iframes":{"additnow":{"methods":["launchurl"],"url":"https://apis.google.com/additnow/additnow.html?bsv"},"shortlists":{"url":"?bsv"},"plus":{"methods":["onauth"],"url":":socialhost:/u/:session_index:/_/pages/badge?bsv"},":socialhost:":"https://plusone.google.com","recobox":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/recobox?bsv"},"plus_followers":{"params":{"url":""},"url":":socialhost:/_/im/_/widget/render/plus/followers?bsv"},"autocomplete":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/autocomplete?bsv"},"plus_share":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/+1/sharebutton?plusShare\u003dtrue\u0026bsv"},"savetowallet":{"url":"https://clients5.google.com/s2w/o/savetowallet?bsv"},"panoembed":{"url":"https://ssl.gstatic.com/pano/embed/?bsv"},"signin":{"methods":["onauth"],"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/render/signin?bsv"},"appcirclepicker":{"url":":socialhost:/:session_prefix:_/widget/render/appcirclepicker?bsv"},"commentcount":{"url":":socialhost:/:session_prefix:_/widget/render/commentcount?bsv"},"hangout":{"url":"https://talkgadget.google.com/:session_prefix:talkgadget/_/widget?bsv"},"plus_circle":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/widget/plus/circle?bsv"},"savetodrive":{"methods":["save"],"url":"https://drive.google.com/savetodrivebutton?usegapi\u003d1\u0026bsv"},"card":{"url":":socialhost:/:session_prefix:_/hovercard/card?bsv"},"evwidget":{"params":{"url":""},"url":":socialhost:/:session_prefix:_/events/widget?bsv"},"zoomableimage":{"url":"https://ssl.gstatic.com/microscope/embed/?bsv"},":signuphost:":"https://plus.google.com","plusone":{"preloadUrl":["https://ssl.gstatic.com/s2/oz/images/stars/po/Publisher/sprite4-a67f741843ffc4220554c34bd01bb0bb.png"],"params":{"count":"","size":"","url":""},"url":":socialhost:/:session_prefix:_/+1/fastbutton?bsv"},"comments":{"methods":["scroll","openwindow"],"params":{"location":["search","hash"]},"url":":socialhost:/:session_prefix:_/widget/render/comments?bsv"}},"debug":{"host":"https://plusone.google.com","reportExceptionRate":0.05,"rethrowException":true},"csi":{"rate":0.01},"googleapis.config":{"mobilesignupurl":"https://m.google.com/app/plus/oob?"}},"h":"m;/_/scs/apps-static/_/js/k\u003doz.gapi.en.02N985CHyyc.O/m\u003d__features__/am\u003dIQ/rt\u003dj/d\u003d1/rs\u003dAItRSTPZZ0JVQCv9Qljsu0NQlsb1ZzD2zQ","u":"https://apis.google.com/js/client.js","hee":true,"fp":"e2aa6cd0095417dbec61deca3abed1394160dab3","dpo":false},"fp":"e2aa6cd0095417dbec61deca3abed1394160dab3","annotation":["autocomplete","profile","interactivepost"],"bimodal":["signin"]}});
\ No newline at end of file
diff --git a/addons/google_drive/static/src/img/drive_icon.png b/addons/google_drive/static/src/img/drive_icon.png
new file mode 100644
index 00000000000..590dde867f4
Binary files /dev/null and b/addons/google_drive/static/src/img/drive_icon.png differ
diff --git a/addons/google_drive/static/src/img/drive_icon_mono.png b/addons/google_drive/static/src/img/drive_icon_mono.png
new file mode 100644
index 00000000000..9fd836b6988
Binary files /dev/null and b/addons/google_drive/static/src/img/drive_icon_mono.png differ
diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
new file mode 100644
index 00000000000..dbbe50d0794
--- /dev/null
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -0,0 +1,76 @@
+openerp.google_drive = function (instance, m) {
+    var _t = instance.web._t,
+        QWeb = instance.web.qweb;
+
+    instance.web.Sidebar.include({
+        start: function () {
+            var self = this;
+            var ids
+            this._super.apply(this, arguments);
+            var view = self.getParent();
+            var result;
+            if (view.fields_view.type == "form") {
+                ids = []
+                view.on("load_record", self, function (r) {
+                    ids = [r.id]
+                    self.add_gdoc_items(view, r.id)
+                });
+            }
+        },
+        add_gdoc_items: function (view, res_id) {
+            var self = this;
+            var gdoc_item = _.indexOf(_.pluck(self.items.other, 'classname'), 'oe_share_gdoc');
+            if (gdoc_item !== -1) {
+                self.items.other.splice(gdoc_item, 1);
+            }
+            if (res_id) {
+                view.sidebar_eval_context().done(function (context) {
+                    var ds = new instance.web.DataSet(this, 'google.drive.config', context);
+                    ds.call('get_google_drive_config', [view.dataset.model, res_id, context]).done(function (r) {
+                        if (!_.isEmpty(r)) {
+                            _.each(r, function (res) {
+                                var already_there = false;
+                                for (var i = 0;i < self.items.other.length;i++){
+                                    if (self.items.other[i].classname === "oe_share_gdoc" && self.items.other[i].label.indexOf(res.name) > -1){
+                                        already_there = true;
+                                        break;
+                                    }
+                                }
+                                if (!already_there){
+                                    self.add_items('other', [{
+                                            label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
+                                            config_id: res.id,
+                                            res_id: res_id,
+                                            res_model: view.dataset.model,
+                                            callback: self.on_google_doc,
+                                            classname: 'oe_share_gdoc'
+                                        },
+                                    ]);
+                                }
+                            })
+                        }
+                    });
+                });
+            }
+        },
+
+        fetch: function (model, fields, domain, ctx) {
+            return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
+        },
+
+        on_google_doc: function (doc_item) {
+            var self = this;
+            self.config = doc_item;
+            var loaded = self.fetch('google.drive.config', ['google_drive_resource_id', 'google_drive_client_id'], [['id', '=', doc_item.config_id]])
+                .then(function (configs) {
+                var ds = new instance.web.DataSet(self, 'google.drive.config');
+                ds.call('get_google_drive_url', [doc_item.config_id, doc_item.res_id,configs[0].google_drive_resource_id]).done(function (url) {
+                    if (url){
+                        window.open(url, '_blank');
+                    }
+                });
+            });
+        },
+
+    });
+};
\ No newline at end of file
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_drive/static/src/xml/gdocs.xml
similarity index 100%
rename from addons/google_docs/static/src/xml/gdocs.xml
rename to addons/google_drive/static/src/xml/gdocs.xml
diff --git a/addons/google_spreadsheet/__init__.py b/addons/google_spreadsheet/__init__.py
new file mode 100644
index 00000000000..f57aaed7749
--- /dev/null
+++ b/addons/google_spreadsheet/__init__.py
@@ -0,0 +1 @@
+import google_spreadsheet
\ No newline at end of file
diff --git a/addons/base_status/__openerp__.py b/addons/google_spreadsheet/__openerp__.py
similarity index 71%
rename from addons/base_status/__openerp__.py
rename to addons/google_spreadsheet/__openerp__.py
index 79b6dd2016c..1ae2d48d349 100644
--- a/addons/base_status/__openerp__.py
+++ b/addons/google_spreadsheet/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012-today OpenERP SA (<http://openerp.com>)
+#    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
@@ -19,21 +19,23 @@
 #
 ##############################################################################
 
-{
-    'name': 'State/Stage Management',
-    'version': '1.0',
-    'category': 'Hidden',
-    'description': """
-This module handles state and stage. It is derived from the crm_base and crm_case classes from crm.
-===================================================================================================
 
-    * ``base_state``: state management
-    * ``base_stage``: stage management
-    """,
+{
+    'name': 'Google Spreadsheet',
+    'version': '1.0',
+    'category': 'Tools',
+    'description': """
+The module adds the possibility to display data from OpenERP in Google Spreadsheets in real time.
+========================================
+""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
-    'data': [],
+    'depends': ['board', 'google_drive'],
+    'js': [
+        'static/src/js/search.js',
+    ],
+    'qweb': ['static/src/xml/*.xml'],
+    'data': ['google_spreadsheet_view.xml', 'google_spreadsheet_data.xml'],
     'demo': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
new file mode 100644
index 00000000000..693300904d0
--- /dev/null
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -0,0 +1,119 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2012 OpenERP SA (<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/>.
+#
+##############################################################################
+
+import simplejson
+import logging
+from lxml import etree
+import re
+import urllib
+import urllib2
+
+from openerp.osv import osv
+from openerp import SUPERUSER_ID
+
+_logger = logging.getLogger(__name__)
+
+class config(osv.osv):
+    _inherit = 'google.drive.config'
+
+    def get_google_scope(self):
+        scope = super(config, self).get_google_scope()
+        return '%s https://spreadsheets.google.com/feeds' % scope
+
+    def write_config_formula(self, cr, uid, attachment_id, spreadsheet_key, model, domain, groupbys, view_id, context=None):
+        access_token = self.get_access_token(cr, uid, scope='https://spreadsheets.google.com/feeds', context=context)
+
+        fields = self.pool.get(model).fields_view_get(cr, uid, view_id=view_id, view_type='tree')
+        doc = etree.XML(fields.get('arch'))
+        display_fields = []
+        for node in doc.xpath("//field"):
+            if node.get('modifiers'):
+                modifiers = simplejson.loads(node.get('modifiers'))
+                if not modifiers.get('invisible') and not modifiers.get('tree_invisible'):
+                    display_fields.append(node.get('name'))
+        fields = " ".join(display_fields)
+        domain = domain.replace("'", r"\'").replace('"', "'")
+        if groupbys:
+            fields = "%s %s" % (groupbys, fields)
+            formula = '=oe_read_group("%s";"%s";"%s";"%s")' % (model, fields, groupbys, domain)
+        else:
+            formula = '=oe_browse("%s";"%s";"%s")' % (model, fields, domain)
+        url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        dbname = cr.dbname
+        user = self.pool['res.users'].read(cr, uid, uid, ['login', 'password'], context=context)
+        username = user['login']
+        password = user['password']
+        if self.pool['ir.module.module'].search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_crypt'), ('state', '=', 'installed')]) == 1:
+            config_formula = '=oe_settings("%s";"%s")' % (url, dbname)
+        else:
+            config_formula = '=oe_settings("%s";"%s";"%s";"%s")' % (url, dbname, username, password)
+        request = '''<feed xmlns="http://www.w3.org/2005/Atom"
+      xmlns:batch="http://schemas.google.com/gdata/batch"
+      xmlns:gs="http://schemas.google.com/spreadsheets/2006">
+  <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full</id>
+  <entry>
+    <batch:id>A1</batch:id>
+    <batch:operation type="update"/>
+    <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R1C1</id>
+    <link rel="edit" type="application/atom+xml"
+      href="https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R1C1"/>
+    <gs:cell row="1" col="1" inputValue="%s"/>
+  </entry>
+  <entry>
+    <batch:id>A2</batch:id>
+    <batch:operation type="update"/>
+    <id>https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15</id>
+    <link rel="edit" type="application/atom+xml"
+      href="https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/R60C15"/>
+    <gs:cell row="60" col="15" inputValue="%s"/>
+  </entry>
+</feed>''' % (spreadsheet_key, spreadsheet_key, spreadsheet_key, formula.replace('"', '&quot;'), spreadsheet_key, spreadsheet_key, config_formula.replace('"', '&quot;'))
+
+        try:
+            req = urllib2.Request(
+                'https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/batch?%s' % (spreadsheet_key, urllib.urlencode({'v': 3, 'access_token': access_token})),
+                data=request,
+                headers={'content-type': 'application/atom+xml', 'If-Match': '*'})
+            urllib2.urlopen(req)
+        except (urllib2.HTTPError, urllib2.URLError):
+            _logger.warning("An error occured while writting the formula on the Google Spreadsheet.")
+
+        description = '''
+        formula: %s
+        ''' % formula
+        if attachment_id:
+            self.pool['ir.attachment'].write(cr, uid, attachment_id, {'description': description}, context=context)
+        return True
+
+    def set_spreadsheet(self, cr, uid, model, domain, groupbys, view_id, context=None):
+        try:
+            config_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'google_spreadsheet', 'google_spreadsheet_template')[1]
+        except ValueError:
+            raise
+        config = self.browse(cr, uid, config_id, context=context)
+        title = 'Spreadsheet %s' % model
+        res = self.copy_doc(cr, uid, False, config.google_drive_resource_id, title, model, context=context)
+
+        mo = re.search("(key=|/d/)([A-Za-z0-9-_]+)", res['url'])
+        if mo:
+            key = mo.group(2)
+
+        self.write_config_formula(cr, uid, res.get('id'), key, model, domain, groupbys, view_id, context=context)
+        return res
diff --git a/addons/google_spreadsheet/google_spreadsheet_data.xml b/addons/google_spreadsheet/google_spreadsheet_data.xml
new file mode 100644
index 00000000000..19802e9d140
--- /dev/null
+++ b/addons/google_spreadsheet/google_spreadsheet_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      <record id="google_spreadsheet_template" model="google.drive.config">
+            <field name="name">Base Spreadsheet Template</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="google_drive_template_url">https://docs.google.com/spreadsheet/ccc?key=0ApGVjjwUC-ygdDZ0TG5EQnRlLVFQNlFGdFN5b1ZrY1E</field>
+            <field name="name_template">Reporting %(name)s</field>
+            <field name="active" eval="0" />
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_spreadsheet/google_spreadsheet_view.xml b/addons/google_spreadsheet/google_spreadsheet_view.xml
new file mode 100644
index 00000000000..e99826dae52
--- /dev/null
+++ b/addons/google_spreadsheet/google_spreadsheet_view.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- add google drive config field in user form -->
+
+        <record model="ir.ui.view" id="view_ir_attachment_google_spreadsheet_tree">
+            <field name="name">ir.attachment.google.spreadsheet.tree</field>
+            <field name="model">ir.attachment</field>
+            <field name="arch" type="xml">
+                <tree string="Google Spreadsheets" version="7.0">
+                    <field name="name" string="Name"/>
+                    <field name="url" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_ir_attachment_google_spreadsheet_form">
+            <field name="name">ir.attachment.google.spreadsheet.form</field>
+            <field name="model">ir.attachment</field>
+            <field name="arch" type="xml">
+                <form string="Google Spreadsheets" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name" string="Name"/>
+                                <field name="url" widget="url"/>
+                            </group>
+                            <group colspan="2">
+                                <label for="description" colspan="2"/>
+                                <field name="description" nolabel="1" colspan="2"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_ir_attachment_google_spreadsheet_tree" model="ir.actions.act_window">
+            <field name="name">Google Spreadsheets</field>
+            <field name="res_model">ir.attachment</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{}</field>
+            <field name="domain">[('url', 'like', '/spreadsheet/')]</field>
+            <field name="help">Google Spreadsheets</field>
+        </record>
+
+        <record id="action_ir_attachment_google_spreadsheet_tree_view" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_ir_attachment_google_spreadsheet_tree"/>
+            <field name="act_window_id" ref="action_ir_attachment_google_spreadsheet_tree"/>
+        </record>
+
+        <record id="action_ir_attachment_google_spreadsheet_form_view" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_ir_attachment_google_spreadsheet_form"/>
+            <field name="act_window_id" ref="action_ir_attachment_google_spreadsheet_tree"/>
+        </record>
+
+        <menuitem id="menu_reporting_dashboard_google_spreadsheets" parent="base.menu_reporting_dashboard" action="action_ir_attachment_google_spreadsheet_tree"/>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/google_spreadsheet/i18n/google_spreadsheet.pot b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
new file mode 100644
index 00000000000..3cf39bd8df5
--- /dev/null
+++ b/addons/google_spreadsheet/i18n/google_spreadsheet.pot
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* google_spreadsheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 8.0alpha1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-25 12:39+0000\n"
+"PO-Revision-Date: 2013-07-25 12:39+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: google_spreadsheet
+#: model:ir.actions.act_window,help:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
+#: model:ir.actions.act_window,name:google_spreadsheet.action_ir_attachment_google_spreadsheet_tree
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:google_spreadsheet.menu_reporting_dashboard_google_spreadsheets
+msgid "Google Spreadsheets"
+msgstr ""
+
+#. module: google_spreadsheet
+#. openerp-web
+#: code:addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml:3
+#, python-format
+msgid "Add to Google Spreadsheet"
+msgstr ""
+
+#. module: google_spreadsheet
+#: view:ir.attachment:0
+msgid "Name"
+msgstr ""
+
+#. module: google_spreadsheet
+#: model:ir.model,name:google_spreadsheet.model_google_drive_config
+msgid "Google Drive templates config"
+msgstr ""
+
diff --git a/addons/google_spreadsheet/static/src/js/search.js b/addons/google_spreadsheet/static/src/js/search.js
new file mode 100644
index 00000000000..c46ec615792
--- /dev/null
+++ b/addons/google_spreadsheet/static/src/js/search.js
@@ -0,0 +1,54 @@
+openerp.google_spreadsheet = function(instance) {
+    var _t = instance.web._t;
+    instance.web.FormView.include({
+    	on_processed_onchange: function(result, processed) {
+    		var self = this;
+    		
+    			var fields = self.fields;
+		        _(result.selection).each(function (selection, fieldname) {
+		            var field = fields[fieldname];
+		            if (!field) { return; }
+		            field.field.selection = selection;
+		            field.values = selection;
+		            field.renderElement(); 
+		        });
+    		return this._super(result, processed);
+    	},
+    });
+    instance.board.AddToGoogleSpreadsheet = instance.web.search.Input.extend({
+	    template: 'SearchView.addtogooglespreadsheet',
+	    _in_drawer: true,
+	    start: function () {
+	        var self = this;
+	        this.$el.on('click', 'h4', function(){
+    		 	var view = self.view;
+				var data = view.build_search_data();
+				var model = view.model;
+				var list_view = self.view.getParent().views['list'];
+				var view_id = list_view ? list_view.view_id : false; 
+		        var context = new instance.web.CompoundContext(view.dataset.get_context() || []);
+		        var domain = new instance.web.CompoundDomain(view.dataset.get_domain() || []);
+		        _.each(data.contexts, context.add, context);
+		        _.each(data.domains, domain.add, domain);
+		        domain = JSON.stringify(domain.eval());
+		        var groupbys = instance.web.pyeval.eval('groupbys', data.groupbys).join(" ");
+		        var view_id = view_id;
+                var ds = new instance.web.DataSet(self, 'google.drive.config');
+                ds.call('set_spreadsheet', [model, domain, groupbys, view_id]).done(function (res) {
+        			if (res['url']){
+            			window.open(res['url'], '_blank');
+        			}
+				});
+	        });
+	    },
+	});
+	instance.web.SearchView.include({
+	    add_common_inputs: function() {
+	        this._super();
+	        var vm = this.getParent().getParent();
+	        if (vm.inner_action && vm.inner_action.views) {
+	            (new instance.board.AddToGoogleSpreadsheet(this));
+	        }
+	    }
+	});
+};
\ No newline at end of file
diff --git a/addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml b/addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml
new file mode 100644
index 00000000000..faf984141a6
--- /dev/null
+++ b/addons/google_spreadsheet/static/src/xml/addtospreadsheet.xml
@@ -0,0 +1,5 @@
+<template>
+<div t-name="SearchView.addtogooglespreadsheet" class="oe_searchview_dashboard">
+    <h4>Add to Google Spreadsheet</h4>
+</div>
+</template>
\ No newline at end of file
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 02ac7f16fd9..fbd01761f39 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -23,5 +23,6 @@ import hr_department
 import hr
 
 import res_config
+import res_users
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index b4b8e982845..b074a80aa88 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -59,6 +59,8 @@ You can manage:
         'hr_installer.xml',
         'hr_data.xml',
         'res_config_view.xml',
+        'mail_hr_view.xml',
+        'res_users_view.xml',
     ],
     'demo': ['hr_demo.xml'],
     'test': [
@@ -69,5 +71,7 @@ You can manage:
     'application': True,
     'auto_install': False,
     'css': [ 'static/src/css/hr.css' ],
+    'js': [ 'static/src/js/suggestions.js' ],
+    'qweb': [ 'static/src/xml/suggestions.xml' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 7f704e42e5e..d19f1f7de8b 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -25,9 +25,11 @@ from openerp.modules.module import get_module_resource
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp import tools
+from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+
 class hr_employee_category(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
@@ -49,9 +51,9 @@ class hr_employee_category(osv.osv):
     _name = "hr.employee.category"
     _description = "Employee Category"
     _columns = {
-        'name': fields.char("Category", size=64, required=True),
+        'name': fields.char("Employee Tag", size=64, required=True),
         'complete_name': fields.function(_name_get_fnc, type="char", string='Name'),
-        'parent_id': fields.many2one('hr.employee.category', 'Parent Category', select=True),
+        'parent_id': fields.many2one('hr.employee.category', 'Parent Employee Tag', select=True),
         'child_ids': fields.one2many('hr.employee.category', 'parent_id', 'Child Categories'),
         'employee_ids': fields.many2many('hr.employee', 'employee_category_rel', 'category_id', 'emp_id', 'Employees'),
     }
@@ -127,7 +129,7 @@ class hr_job(osv.osv):
     }
 
     _sql_constraints = [
-        ('name_company_uniq', 'unique(name, company_id)', 'The name of the job position must be unique per company!'),
+        ('name_company_uniq', 'unique(name, company_id, department_id)', 'The name of the job position must be unique per department in company!'),
     ]
 
 
@@ -150,18 +152,21 @@ class hr_job(osv.osv):
 class hr_employee(osv.osv):
     _name = "hr.employee"
     _description = "Employee"
+    _order = 'name_related'
     _inherits = {'resource.resource': "resource_id"}
     _inherit = ['mail.thread']
 
+    _mail_post_access = 'read'
+
     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)
-    
+
     _columns = {
         #we need a related field in order to be able to sort the employee by name
         'name_related': fields.related('resource_id', 'name', type='char', string='Name', readonly=True, store=True),
@@ -171,12 +176,12 @@ class hr_employee(osv.osv):
         'sinid': fields.char('SIN No', size=32, help="Social Insurance Number"),
         'identification_id': fields.char('Identification No', size=32),
         'otherid': fields.char('Other Id', size=64),
-        'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
+        'gender': fields.selection([('male', 'Male'), ('female', 'Female')], 'Gender'),
         'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
-        'department_id':fields.many2one('hr.department', 'Department'),
+        'department_id': fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner', 'Working Address'),
         'address_home_id': fields.many2one('res.partner', 'Home Address'),
-        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
+        'bank_account_id': fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
         'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
         'work_email': fields.char('Work Email', size=240),
@@ -187,7 +192,7 @@ class hr_employee(osv.osv):
         'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
-        'job_id': fields.many2one('hr.job', 'Job'),
+        'job_id': fields.many2one('hr.job', 'Job Title'),
         # 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 employee, limited to 1024x1024px."),
@@ -207,25 +212,42 @@ class hr_employee(osv.osv):
             help="Small-sized photo of the employee. It is automatically "\
                  "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'passport_id':fields.char('Passport No', size=64),
+        'passport_id': fields.char('Passport No', size=64),
         'color': fields.integer('Color Index'),
         'city': fields.related('address_id', 'city', type='char', string='City'),
         'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
         'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
     }
 
-    _order='name_related'
+    def _get_default_image(self, cr, uid, context=None):
+        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 = {
+        'active': 1,
+        'image': _get_default_image,
+        'color': 0,
+    }
 
     def create(self, cr, uid, data, context=None):
-        employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
-        try:
-            (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 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
+        if context is None:
+            context = {}
+        create_ctx = dict(context, mail_create_nolog=True)
+        employee_id = super(hr_employee, self).create(cr, uid, data, context=create_ctx)
+        employee = self.browse(cr, uid, employee_id, context=context)
+        if employee.user_id:
+            # send a copy to every user of the company
+            company_id = employee.user_id.partner_id.company_id.id
+            partner_ids = self.pool.get('res.partner').search(cr, uid, [
+                ('company_id', '=', company_id),
+                ('user_ids', '!=', False)], context=context)
+        else:
+            partner_ids = []
+        self.message_post(cr, uid, [employee_id],
+            body=_('Welcome to %s! Please help him/her take the first steps with OpenERP!') % (employee.name),
+            partner_ids=partner_ids,
+            subtype='mail.mt_comment', context=context
+        )
         return employee_id
 
     def unlink(self, cr, uid, ids, context=None):
@@ -246,7 +268,7 @@ class hr_employee(osv.osv):
             company_id = self.pool.get('res.company').browse(cr, uid, company, context=context)
             address = self.pool.get('res.partner').address_get(cr, uid, [company_id.partner_id.id], ['default'])
             address_id = address and address['default'] or False
-        return {'value': {'address_id' : address_id}}
+        return {'value': {'address_id': address_id}}
 
     def onchange_department_id(self, cr, uid, ids, department_id, context=None):
         value = {'parent_id': False}
@@ -259,17 +281,36 @@ class hr_employee(osv.osv):
         work_email = False
         if user_id:
             work_email = self.pool.get('res.users').browse(cr, uid, user_id, context=context).email
-        return {'value': {'work_email' : work_email}}
+        return {'value': {'work_email': work_email}}
 
-    def _get_default_image(self, cr, uid, context=None):
-        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'))
+    def action_follow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_subscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_subscribe_users(cr, uid, ids, context=context)
 
-    _defaults = {
-        'active': 1,
-        'image': _get_default_image,
-        'color': 0,
-    }
+    def action_unfollow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_unsubscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_unsubscribe_users(cr, uid, ids, context=context)
+
+    def get_suggested_thread(self, cr, uid, removed_suggested_threads=None, context=None):
+        """Show the suggestion of employees if display_employees_suggestions if the
+        user perference allows it. """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.display_employees_suggestions:
+            return []
+        else:
+            return super(hr_employee, self).get_suggested_thread(cr, uid, removed_suggested_threads, context)
+
+    def _message_get_auto_subscribe_fields(self, cr, uid, updated_fields, auto_follow_fields=['user_id'], context=None):
+        """ Overwrite of the original method to always follow user_id field,
+        even when not track_visibility so that a user will follow it's employee
+        """
+        user_field_lst = []
+        for name, column_info in self._all_columns.items():
+            if name in auto_follow_fields and name in updated_fields and column_info.column._obj == 'res.users':
+                user_field_lst.append(name)
+        return user_field_lst
 
     def _check_recursion(self, cr, uid, ids, context=None):
         level = 100
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 641d5b272cf..41b09c3aea3 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -91,14 +91,14 @@
     <!--Employees-->
 
       <record id="employee_fp" model="hr.employee">
-          <field name="name">Peter Parker</field>
+          <field name="name">Pieter Parker</field>
           <field name="user_id" ref="base.user_root"/>
           <field name="department_id" ref="dep_management"/>
           <field name="job_id" ref="hr.job_ceo"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_2')])]"/>
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
-          <field name="work_email">peter@openerp.com</field>
+          <field name="work_email">pieter@openerp.com</field>
           <field name="image">/9j/4AAQSkZJRgABAQEAZABkAAD/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/wAARCABaAGQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDvvH/wU1XVJpp9Fj0S+TflVedo2/8AQCP/AB6vI9Z+DfxD0vfcx+ALn5f47G4hmb8lk3/+O16p8WPh1Lqs76l4ekiS9/59ppPLV/8AclHzRt/47/u14lrfiD4meEJIUutf8ZaXE00kUG/U5pIXkjZkdUYuyNhl+7/wL7tevRnP7Ml8zyMTCHN70X8jG1nSfEOjx79Y0PxBpSf3riwuIf8Ax4ptra0LTk03SZtY1X/j4ZF8iCaRvkhf+OXP8R/hX/gVdP4P+L3xPuNN1K9vfFslxptvD9mT7RaQ+Y1xKrBNrxxqfk/1n/fNcdryPeabZaakcr3FxdM1zd3MnmM8j8szZ/5af3mb5q3p8/2zlfJ8UdfU43xb4p1Ce1dIpI0indt33tzrtx1rn5rvULsJaW8/+q+bb/y0dv72P4quy2TzSTTNH8zOzN+7+4vzf0qPWdMuIZIXf/Wr8jbPvfIzDt/u0TgTTqQLWhpKkHnX3yW8u5F/ebWZuobHB4rv/B+rXCWiWz+VePLu8+L5WXyz/eRj83zVwdrpkqWrvdxyzW6f88rjasufSptNvfsDpbpJvZk+6/zQsx/hGfSrE/5jvNa0yL7J/aWleakSor3NtNuVrf5sbkZvvR/+g1hyXD/I/wDf+9/vVa8L69cabrP2a8+S3uPk2vceZby54+Zj92k8X6S+iT+d9zTbj5YJHk/1TfxRO394fw/3l+b+9UC/vRKUlw/l76ktLvfB/uP/AD5rMRll+eKSOb/ck3fyqOOWGGT5/KT+9+FaGfObD3Cbv9Z/5EorL+3WX8dxbZ/66LRQaH3tAm+/tf8Aruv/AKFXmviHTrS8fUIbm3imt7idknV4/MWVQzffQ/K2P4f/AB3bXqFqn/Eytk/g85f/AEKvPNW/4+7r/rvLuX/gTV5UD25nivjpNB8MWumeG7PzIYIHkup1+aRlluGQ8fxbliWJV3fN/DurJ0K4TWIE022/0Z0ulbb5m5k/eZZtw+83zfM1YXxjlf8A4WhqyeZK6QTKu1P721Dt/BWr1r4DeHrG51pL+aOKbyoPlb+4x/8AHV+9Xd8EeY8uHv1eUJ/AGnaPpP8Ax7/PAm6Xf82/e2yX/wBkqlqXg23sNaheazi/dXXzf3XjPDN/8VXuereG/t6eTD8kTI0Uq/7JX+jVS8Q6Db38E9tcx/61P3v930+8Kw9sdv1Y821b4e2L6b9mSzimif5tqe/5f99V5TrvgCbRLt0tvtMNu33oH2yL+RBr6T0K0vv7Jhs7+T/SLVPK83/nrs4V2/2j/FVLUtG86TZN5T/7VEKxE8NGZ8v6Tol3NrX2Z7OKaJvlZX+WN13fxjkN/vLXuvwdE8XidNP0u8udKa4gaKCVI45Gl2Lv8p0bI+7W34p8F6cnhPUNVhs4/Ngh3XO/5flC/M+3+L+7/e2v/srXkvwwu/EMXxa0m2tJPtk76pG3lvJ+8dVZfNf8IpHZ/wDvpauc+eEjCEPYzj5n0lqfgTRtY/5C/gzwlqkz/enuNMjWRvxXmsx/hN4Og2fZvDFjpUq/9A6/Zd3/AABkZa9I2O8nyfJF/e/ip8cSJ9z7/wDerzuaR6nJE84uPAE3nsth4v8AHOlwrgfZLS6tJI4jgdDJAzHP3uWP3uMDABXfMn+k3H++P/QVop88h8sT468M/tWeKLRbdtf8KaTrUkIj33EU72k0jD+NvvJuP+ytW9G+LX277bNbap9tia9klXT9Ujb7RFDJIx2JKv8Ac3fe3Mv+z91a+aQf8/Wtvw1cJbatazSXEcMSzKszS7tqRvw7NtBbbht3yq1dkIRPPnOTO78fTf2r471O5SOWF72682KL/WbN6r8u6vqP4DeHn0HwJBc38fky3XzbX+9FGP8A2Y1534r8DW9nr3hPUbYf6VeOlrth+75cFigjfkBufLdv/Qq+gf7OR9FTTYZNiRIsSt9KdafuKJOGo+85SM/xD4y0zSrTe9vfOip/yxt9zf8AfNc3aeNNO1KTZbfbod//AD827R/1rjfih4JvhcfufG/je3lZ90s8V/tX/cWJdqxrVHw14ImudTe8sJNXhi/dbYprhpFT+9I0rEs2f7tRCEeU3nOXMeqR6jElZ/8AwkOjWd+iXOqWMMv8KzXCrv8Azp/izSbtPDU1npsn/EwitfN3eXu/u5214ZfeHvFf9pWzw+KNJmfzm+1rcWHnR+Xu4ZFZN27b95f++aIQjMJzlA+j/EVzYaj8NfEF1p1zFcSrplyyqnzb9sbMv/oNfL/gP4g2GhXqfES18OfbVsoPssVh9r8nZcS/KX8zY3SLfjj+OvoD4S2mv217DDq/9mXNhdfPFc28fkttO5TFLFltrf7rba+cPHegpo/g3UE02DyVg1qy06WC3j3fvEhumdu//PJGqqPJ70SK05e7L+tD09P2rbl/+aaRf+FF/wDc9WR+1DeNvz8Pbddvrrcjf+0K+ZIILz+C01H5flbZaSf/ABFa1pb6ikbv/Z+pfc/js5F/pW/1Wkcv1zEf0j9APBtw3iDw1Ya3MI4JL+1humjhBKp5kSOFyRk4DAZ4zjOBnAKj+DZJ+GHhtmO0tpFkcf8AbrFRXkyep7kFeKZ+XoTdDN/31Uke1k2t91vl3LU09u9o+yX+L5aZLaXFtJCk0exZUWWNv70b9Gr1DyPjPuH4TunxC+GHh3X57yVr6yjRZ2MnmTLd26pFNv8A99Y0k/7bvur06C4/d7/ub6+Kf2btQ1628WT2FneXv9jJayX+oWqSN5bbNio5X+9uZPmr7G83946VySgdlKfP7walcWn33+fZ/f8AmqPw9qKald3SQx/JaorN+LMF/wDQaxtWR3k2fvXrJu9PtJrTzv7YlsH+ZPPhvPs+/wDvIvPzU+QXOegfZ/tOtTf63elr8q/98iuLv7fSb+ebztPtklt52iZvL/iDYb5f96uTjh8aXN28MN5KkqOv2a5SSFvNUfxKvP8A6DW5YQypG/nSedL9+WR/vPIeWZqvk5PtBz8/Q7fwn5Vs9t5PleVvX7n3du6vHvFOl3Fh8LYNWmcfaNW8VPdfJJ/D5N0q5avTvD3mzSJCnzu+77lY/wAfdOt7DwNpFhZx7LeDV49qvIzN/qbr5iTWcfi9Rz+H0PF7R38t/wDW/fb/AJaUX7/uH/d0+C3f5/8Af/8AiaL+L9xXccJ9XfCuRG+G/ht1dFDaTZnDdf8Aj3joqn8Kd/8AwrXw0q/w6PZA/X7NHRXjT+Jnqw+FHw1b+BtW1qO9mubP7Bv8v7M95+73sG+ZmUfP93/Zrf0T4TeHbFHudWurnV2RGdlU/Z4f/HSXb/vuu0gu3ufntpIn2/eien/aIXtLpPL+fyG3RfxV7Mzy4R5DzlLWyur/APsHRbCPTbCVGlu1i3bmhjVnbexyzZ27Vr6l0TUWvdI0nUBH811plpc7f+ulujV87fD3ZZ6l/pP753tZfPlf/lq3nKjf+O7K9d+G189z8PrPTXk/4mXhr/iUz/w7o4/+Pd/+BwbP++HrOtuXhjrb93vJ/syeaiP95krjNa+F/h6wvn1vRJPsdw3zyweW0lvK3+3Fkdf7ysrV1vh7VrSaTybn9y/8Na1/b6ZNH88kSP8A3ax55QOnkjM8ck8C32q7LZNc+wf7VpHJu+9/fZ2213Ph7Sf7BsEsH1S+v3VN8s99J50zsfvfPxWvHplokn+s+9Rqb2KSIn2iOH5Gllkm+VbeMLl3f/ZC/NROfORCHIcr408f33gzVtMh0e3sbnULpJZZFu42aNLUNs+XaQdzv/6B/tVn+M/iEnjDw9DbXOjyaVdWt6rM32jzoXxHKPvYDL/rK8n8Vay3iPxJpPiXy5Vt9Ukvfs0L/eSyXyvIXv8ANhPMP+0710W/ZpKb/v3G52raEIe7IxnWlzOJp2iff/ub/vU+dP3FYUd28MCTQyeTuT/vhhxWhpt99vg2XPlQ3H/jvP8AFxWhmfTvwgTzvhvoTf3dPtl/KCMUVD8E5kb4c6XGJYmaGJIXCSg7GRFUqfcYoryanxM9Wn8KPlK0l+x3c0M3mw733r/eRv8A4mtrzfOkSF4/9IV/mZPuuv8AeX/Zrn7lme0O9i22fjJzj7/+A/IVZ8OfNdw7ufk7/wC61eseVApSIln4s2fcSXzV/wC+1U/+hLXW6Lqc2lalDrdt9908i+i+6sqiuW8S/L4hh28fOvT/AHWrc0n/AFzr/Dvbjt92iYQOw1byr+B7/SpPv/eV/l6f3v8AaFY0fiHWbb5PM37P7/zf+PVn6MzKyKrEL5B4B44mdR+SgL9ABWncf8fb1A5zZNH4n1m5kRP3Sf7X+z+NcH8TPFV94jP/AAhXh64+XUX8rUr7/nuo5KJ/0zG3c3977v3auePpJE06ZUdlBTkA4BrnPBKquqaoyqAyae20gcr9PSnyomrVnDYfqX2e58QpbWf/AB5aXBFawf7vzb62p5dkaQ/wI7J/uLWFpKr/AGtN8o+bzc8df9KatOf/AFn/AANq1IgEc0Pl7/4Ef90tSWEv+nvN/AibV/H722qsf+r/AOB0R/8As8n/ALJQM6mzxPAssWzB/v8AX2/TFFY9uS0QLHJ96Kgs/9k=</field>
       </record>
 
@@ -139,7 +139,7 @@
       </record>
 
       <record id="employee_stw" model="hr.employee">
-          <field name="name">Liam Neeson</field>
+          <field name="name">Liam Nelson</field>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -212,7 +212,7 @@
       </record>
 
       <record id="employee_ngh" model="hr.employee">
-          <field name="name">Famke Janssen</field>
+          <field name="name">Famke Jenssens</field>
           <field name="department_id" ref="dep_sales"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_marketing"/>
@@ -255,7 +255,7 @@
       </record>
       
       <record id="employee_jep" model="hr.employee">
-          <field name="name">Jean Pierre</field>
+          <field name="name">Jean-Pierre Carnaud</field>
           <field name="department_id" ref="dep_ps"/>
           <field name="job_id" ref="hr.job_consultant"/>
           <field name="work_location">Grand-Rosière</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index ccd11bc0dc2..05a21c2908a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,6 +27,10 @@
                             </h1>
                             <label for="category_ids" class="oe_edit_only" groups="base.group_hr_user"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_user"/>
+                            <label for="work_email" class="oe_edit_only"/>
+                            <field name="work_email" widget="email"/>
+                            <label for="work_phone" class="oe_edit_only"/>
+                            <field name="work_phone"/>
                         </div>
                         <div class="oe_right oe_button_box" name="button_box">
                             <!-- Put here related buttons -->
@@ -36,8 +40,6 @@
                                 <group>
                                     <group string="Contact Information">
                                         <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="work_email" widget="email"/>
-                                        <field name="work_phone"/>
                                         <field name="mobile_phone"/>
                                         <field name="work_location"/>
                                     </group>
@@ -136,6 +138,9 @@
         <field name="arch" type="xml">
             <kanban>
                 <field name="last_login"/>
+                <field name="message_is_follower"/>
+                <field name="message_follower_ids"/>
+                <field name="message_ids"/>
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
@@ -154,10 +159,19 @@
                                     </li>
                                     <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>
                                 </ul>
+                                <div class="oe_kanban_footer_left">
+                                    <span title='Messages'><span class='oe_e'>9</span><t t-esc="record.message_ids.raw_value.length"/></span>
+                                    <span title='Followers'><span class='oe_e'>+</span><t t-esc="record.message_follower_ids.raw_value.length"/></span>
+                                </div>
+                                <div class="oe_followers" groups="base.group_user">
+                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_follower oe_following">
+                                        <span class="oe_unfollow">Unfollow</span>
+                                        <span class="oe_following">Following</span>
+                                    </button>
+                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object" class="oe_follower oe_notfollow">Follow</button>
+                                </div>
                             </div>
                         </div>
                         <script>
@@ -334,12 +348,10 @@
                             <h1><field name="name" class="oe_inline"/></h1>
                         </div>
                         <group>
-                            <group>
+                            <group name="job_data">
                                 <field name="no_of_employee" groups="base.group_user"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                                 <field name="expected_employees" groups="base.group_user"/>
-                            </group>
-                            <group>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 <field name="department_id"/>
                             </group>
@@ -368,10 +380,9 @@
                 <tree string="Job">
                     <field name="name"/>
                     <field name="department_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="expected_employees"/>
                     <field name="no_of_employee"/>
                     <field name="no_of_recruitment"/>
+                    <field name="expected_employees"/>
                     <field name="state"/>
                 </tree>
             </field>
diff --git a/addons/hr/mail_hr_view.xml b/addons/hr/mail_hr_view.xml
new file mode 100644
index 00000000000..203878c7a77
--- /dev/null
+++ b/addons/hr/mail_hr_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="mail.action_mail_inbox_feeds" model="ir.actions.client">
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('to_read', '=', True),
+                  ('starred', '=', False),
+                ],
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read',
+                'show_compose_message': True
+            }&quot;"/>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr/res_users.py b/addons/hr/res_users.py
new file mode 100644
index 00000000000..c3550596281
--- /dev/null
+++ b/addons/hr/res_users.py
@@ -0,0 +1,65 @@
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+
+class res_users(osv.Model):
+    """ Update of res.users class
+        - if adding groups to an user, check if base.group_user is in it
+        (member of 'Employee'), create an employee form linked to it.
+    """
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    _columns = {
+        'display_employees_suggestions': fields.boolean("Display Employees Suggestions"),
+    }
+
+    _defaults = {
+        'display_employees_suggestions': True,
+    }
+
+    def __init__(self, pool, cr):
+        """ Override of __init__ to add access rights on
+        display_employees_suggestions fields. Access rights are disabled by
+        default, but allowed on some specific fields defined in
+        self.SELF_{READ/WRITE}ABLE_FIELDS.
+        """
+        init_res = super(res_users, self).__init__(pool, cr)
+        # duplicate list to avoid modifying the original reference
+        self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
+        self.SELF_WRITEABLE_FIELDS.append('display_employees_suggestions')
+        # duplicate list to avoid modifying the original reference
+        self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS)
+        self.SELF_READABLE_FIELDS.append('display_employees_suggestions')
+        return init_res
+
+    def stop_showing_employees_suggestions(self, cr, uid, user_id, context=None):
+        """Update display_employees_suggestions value to False"""
+        if context is None:
+            context = {}
+        self.write(cr, uid, user_id, {"display_employees_suggestions": False}, context)
+
+    def _create_welcome_message(self, cr, uid, user, context=None):
+        """Do not welcome new users anymore, welcome new employees instead"""
+        return True
+
+    def _message_post_get_eid(self, cr, uid, thread_id, context=None):
+        assert thread_id, "res.users does not support posting global messages"
+        if context and 'thread_model' in context:
+            context['thread_model'] = 'hr.employee'
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        return self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', thread_id)], context=context)
+
+    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
+        """ Redirect the posting of message on res.users to the related employee.
+            This is done because when giving the context of Chatter on the
+            various mailboxes, we do not have access to the current partner_id. """
+        if kwargs.get('type') == 'email':
+            return super(res_users, self).message_post(cr, uid, thread_id, context=context, **kwargs)
+        employee_ids = self._message_post_get_eid(cr, uid, thread_id, context=context)
+        if not employee_ids:
+            pass  # dpo something
+        for employee_id in employee_ids:
+            res = self.pool.get('hr.employee').message_post(cr, uid, employee_id, context=context, **kwargs)
+        return res
diff --git a/addons/hr/res_users_view.xml b/addons/hr/res_users_view.xml
new file mode 100644
index 00000000000..0843269e716
--- /dev/null
+++ b/addons/hr/res_users_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- Update user form !-->
+        <record id="view_users_form_mail" model="ir.ui.view">
+            <field name="name">res.users.form.hr</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="mail.view_users_form_mail"/>
+            <field name="arch" type="xml">
+            <data>
+                <field name="display_groups_suggestions" position="after">
+                    <field name="display_employees_suggestions"/>
+                </field>
+            </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/hr/html/crm_game_01.png b/addons/hr/static/description/crm_game_01.png
similarity index 100%
rename from addons/hr/html/crm_game_01.png
rename to addons/hr/static/description/crm_game_01.png
diff --git a/addons/hr/html/crm_game_02.png b/addons/hr/static/description/crm_game_02.png
similarity index 100%
rename from addons/hr/html/crm_game_02.png
rename to addons/hr/static/description/crm_game_02.png
diff --git a/addons/hr/html/crm_game_03.png b/addons/hr/static/description/crm_game_03.png
similarity index 100%
rename from addons/hr/html/crm_game_03.png
rename to addons/hr/static/description/crm_game_03.png
diff --git a/addons/hr/html/hr_appraisal.png b/addons/hr/static/description/hr_appraisal.png
similarity index 100%
rename from addons/hr/html/hr_appraisal.png
rename to addons/hr/static/description/hr_appraisal.png
diff --git a/addons/hr/html/hr_employee.png b/addons/hr/static/description/hr_employee.png
similarity index 100%
rename from addons/hr/html/hr_employee.png
rename to addons/hr/static/description/hr_employee.png
diff --git a/addons/hr/html/hr_expense.png b/addons/hr/static/description/hr_expense.png
similarity index 100%
rename from addons/hr/html/hr_expense.png
rename to addons/hr/static/description/hr_expense.png
diff --git a/addons/hr/html/hr_illu_01.png b/addons/hr/static/description/hr_illu_01.png
similarity index 100%
rename from addons/hr/html/hr_illu_01.png
rename to addons/hr/static/description/hr_illu_01.png
diff --git a/addons/hr/html/hr_illu_02.png b/addons/hr/static/description/hr_illu_02.png
similarity index 100%
rename from addons/hr/html/hr_illu_02.png
rename to addons/hr/static/description/hr_illu_02.png
diff --git a/addons/hr/html/hr_kanban.png b/addons/hr/static/description/hr_kanban.png
similarity index 100%
rename from addons/hr/html/hr_kanban.png
rename to addons/hr/static/description/hr_kanban.png
diff --git a/addons/hr/html/hr_recruitment.png b/addons/hr/static/description/hr_recruitment.png
similarity index 100%
rename from addons/hr/html/hr_recruitment.png
rename to addons/hr/static/description/hr_recruitment.png
diff --git a/addons/hr/html/hr_social.png b/addons/hr/static/description/hr_social.png
similarity index 100%
rename from addons/hr/html/hr_social.png
rename to addons/hr/static/description/hr_social.png
diff --git a/addons/hr/html/hr_timesheet.png b/addons/hr/static/description/hr_timesheet.png
similarity index 100%
rename from addons/hr/html/hr_timesheet.png
rename to addons/hr/static/description/hr_timesheet.png
diff --git a/addons/hr/static/src/img/icon.png b/addons/hr/static/description/icon.png
similarity index 100%
rename from addons/hr/static/src/img/icon.png
rename to addons/hr/static/description/icon.png
diff --git a/addons/hr/html/index.html b/addons/hr/static/description/index.html
similarity index 98%
rename from addons/hr/html/index.html
rename to addons/hr/static/description/index.html
index 0bc3db084a4..f97cb462fe3 100644
--- a/addons/hr/html/index.html
+++ b/addons/hr/static/description/index.html
@@ -17,7 +17,7 @@ Get all your HR operations managed easily: knowledge sharing, recruitments, appr
 		   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>
+                <a href="http://www.openerp.com/start?app=hr" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 16657394736..951ec4d02e3 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -68,3 +68,8 @@
   margin: 2px 0;
   padding: 0;
 }
+
+.openerp .oe_employee_vignette .oe_followers {
+  width: auto;
+  float: none;
+}
diff --git a/addons/hr/static/src/js/suggestions.js b/addons/hr/static/src/js/suggestions.js
new file mode 100644
index 00000000000..3bc37e71344
--- /dev/null
+++ b/addons/hr/static/src/js/suggestions.js
@@ -0,0 +1,78 @@
+openerp.hr = function(session) {
+    var _t = session.web._t;
+    var QWeb = session.web.qweb;
+
+    var suggestions = session.suggestions;
+    var removed_suggested_employee = session.suggestions.removed_suggested_employee = [];
+
+    suggestions.Employees = session.web.Widget.extend({
+        events: {
+            'click .oe_suggestion_remove.oe_suggestion_employee': 'stop_employee_suggestion',
+            'click .oe_suggestion_remove_item.oe_suggestion_employee': 'remove_employee_suggestion',
+            'click .oe_suggestion_follow': 'follow_employee',
+        },
+
+        init: function () {
+            this._super(this, arguments);
+            this.hr_employee = new session.web.DataSetSearch(this, 'hr.employee');
+            this.res_users = new session.web.DataSetSearch(this, 'res.users');
+            this.employees = [];
+        },
+
+        start: function () {
+            this._super.apply(this, arguments);
+            return this.fetch_suggested_employee();
+        },
+
+        fetch_suggested_employee: function () {
+            var self = this;
+            var employee = self.hr_employee.call('get_suggested_thread', {'removed_suggested_threads': removed_suggested_employee}).then(function (res) {
+                _(res).each(function (result) {
+                    result['image']=self.session.url('/web/binary/image', {model: 'hr.employee', field: 'image_small', id: result.id});
+                });
+                self.employees = res;
+            });
+            return $.when(employee).done(this.proxy('display_suggested_employees'));
+        },
+
+        display_suggested_employees: function () {
+            var suggested_employees = this.$('.oe_sidebar_suggestion.oe_suggestion_employee');
+            if (suggested_employees) {
+                suggested_employees.remove();
+            }
+            if (this.employees.length === 0) {
+                return this.$el.empty();
+            }
+            return this.$el.empty().html(QWeb.render('hr.suggestions.employees', {'widget': this}));
+        },
+
+        follow_employee: function (event) {
+            var self = this;
+            var employee_id = parseInt($(event.currentTarget).attr('id'), 10);
+            return this.hr_employee.call('message_subscribe_users', [[employee_id], [this.session.uid], undefined]).then(function(res) {
+                self.fetch_suggested_employee();
+            });
+        },
+
+        remove_employee_suggestion: function (event) {
+            removed_suggested_employee.push($(event.currentTarget).attr('id'));
+            return this.fetch_suggested_employee();
+        },
+
+        stop_employee_suggestion: function (event) {
+            var self = this;
+            return this.res_users.call('stop_showing_employees_suggestions', [this.session.uid]).then(function(res) {
+                self.$(".oe_sidebar_suggestion.oe_suggestion_employee").hide();
+            });
+        }
+    });
+
+    session.mail.WallSidebar.include({
+        start: function () {
+            this._super.apply(this, arguments);
+            var sug_employees = new suggestions.Employees(this);
+            return sug_employees.appendTo(this.$('.oe_suggestions_employees'));
+        },
+    });
+
+};
diff --git a/addons/hr/static/src/xml/suggestions.xml b/addons/hr/static/src/xml/suggestions.xml
new file mode 100644
index 00000000000..f3095627bae
--- /dev/null
+++ b/addons/hr/static/src/xml/suggestions.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+
+    <!-- Employees placeholder in sidebar -->
+    <t t-extend="mail.wall.sidebar">
+        <t t-jquery=".oe_mail_wall_sidebar" t-operation="append">
+            <div class="oe_suggestions_employees"></div>
+        </t>
+    </t>
+
+    <!-- Suggested employees -->
+    <div t-name="hr.suggestions.employees" class="oe_sidebar_suggestion oe_suggestion_employee">
+        <div class="oe_suggest_title">
+            <a class="oe_suggestion_remove oe_suggestion_employee oe_e">X</a>
+            <h2>Suggested Employees</h2>
+        </div>
+        <div class="oe_suggest_items">
+            <t t-foreach="widget.employees" t-as="result">
+                <div class="oe_suggested_item">
+                    <div class="oe_suggested_item_image">
+                        <a t-attf-href="#model=hr.employee&amp;id=#{result.id}">
+                            <img t-attf-src="{result.image}" t-attf-alt="{result.name}"/>
+                        </a>
+                    </div>
+                    <div class="oe_suggested_item_content">
+                        <a class="oe_suggestion_item_name" t-attf-href="#model=hr.employee&amp;id=#{result.id}"><t t-esc="result.name"/></a>
+                        <a class="oe_suggestion_remove_item oe_suggestion_employee oe_e" t-attf-id="{result.id}">X</a>
+                        <br/>
+                        <button class="oe_suggestion_follow" t-att-id="result.id">Follow</button>
+                    </div>
+                </div>
+            </t>
+        </div>
+    </div>
+
+</template>
diff --git a/addons/hr_attendance/i18n/th.po b/addons/hr_attendance/i18n/th.po
new file mode 100644
index 00000000000..673d5e7ddd1
--- /dev/null
+++ b/addons/hr_attendance/i18n/th.po
@@ -0,0 +1,466 @@
+# 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-06-20 01:48+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-06-21 05:35+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.employee,last_sign:0
+msgid "Last Sign"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr ""
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/attendance.js:34
+#, python-format
+msgid "Last sign in: %s,<br />%s.<br />Click to sign out."
+msgstr ""
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/report/timesheet.py:120
+#, python-format
+msgid "Attendances by Week"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+msgid "Sign out"
+msgstr "ลงชื่อออก"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "ตุลาคม"
+
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:154
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+#, python-format
+msgid "Sign Out"
+msgstr "ออกจากระบบ"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records are found for your selection!"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+msgid "Print"
+msgstr "พิมพ์"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,employee_id:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr "พนักงาน"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "เดือน"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr ""
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:154
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+#, python-format
+msgid "Sign In"
+msgstr "เข้าสู่ระบบ"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "วันที่เริ่ม"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "มีนาคม"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "สิงหาคม"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:161
+#, python-format
+msgid "Warning"
+msgstr "คำเตือน"
+
+#. module: hr_attendance
+#: help:hr.config.settings,group_hr_attendance:0
+msgid "Allocates attendance group to all users."
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendance"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "มิถุนายน"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
+#, python-format
+msgid "Attendances by Month"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
+msgid "Attendances By Week"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "เหตุผล"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"The Time Tracking functionality aims to manage employee attendances from "
+"Sign in/Sign out actions. You can also link this feature to an attendance "
+"device using OpenERP's web service features."
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "วันนี้"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "วันที่"
+
+#. module: hr_attendance
+#: field:hr.config.settings,group_hr_attendance:0
+msgid "Track attendances for all employees"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "กรกฎาคม"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
+#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
+msgid "Attendance Error Report"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "วัน"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "นำเสนอ"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "ขาด"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "กุมภาพันธ์"
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr "ปี"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+msgid "Sign in"
+msgstr "ลงชื่อเข้าใช้"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+msgid "Attendances By Month"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "มกราคม"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available !"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "เมษายน"
+
+#. module: hr_attendance
+#: view:hr.attendance.week:0
+msgid "Print Attendance Report Weekly"
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "ปฏิบัติ"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "ติดตามเวลา"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
+msgid "Attendance Reasons"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "พฤศจิกายน"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "กันยายน"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr ""
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr "hr.config.settings"
+
+#. module: hr_attendance
+#. openerp-web
+#: code:addons/hr_attendance/static/src/js/attendance.js:36
+#, python-format
+msgid "Click to Sign In at %s."
+msgstr ""
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action Type"
+msgstr "ชนิดการทำงาน"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "พฤษภาคม"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:161
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the HR Manager to correct attendances."
+msgstr ""
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "ธันวาคม"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "ปฏิบัติการ"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+msgid "or"
+msgstr "หรือ"
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr ""
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index 137bac30215..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:
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 0cd31d66bcf..d74253b5d53 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -88,6 +88,15 @@ class hr_contract(osv.osv):
         'type_id': _get_type
     }
 
+    def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
+        if not employee_id:
+            return {'value': {'job_id': False}}
+        emp_obj = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context)
+        job_id = False
+        if emp_obj.job_id:
+            job_id = emp_obj.job_id.id
+        return {'value': {'job_id': job_id}}
+
     def _check_dates(self, cr, uid, ids, context=None):
         for contract in self.read(cr, uid, ids, ['date_start', 'date_end'], context=context):
              if contract['date_start'] and contract['date_end'] and contract['date_start'] > contract['date_end']:
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0659d661420..57a04dc9517 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -73,14 +73,15 @@
                 <form string="Contract" version="7.0">
                     <sheet>
                     <div class="oe_title">
+                        <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" placeholder="Contract Reference"/>
                         </h1>
                     </div>
                     <group>
                         <group>
-                            <field name="employee_id"/>
-                            <field name="job_id"/>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                            <field name="job_id" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                         </group>
                         <group>
                             <field name="type_id"/>
diff --git a/addons/hr_contract/i18n/th.po b/addons/hr_contract/i18n/th.po
new file mode 100644
index 00000000000..faa98497b01
--- /dev/null
+++ b/addons/hr_contract/i18n/th.po
@@ -0,0 +1,232 @@
+# 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-06-15 17: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-06-16 04:38+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "ข้อมูล"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "วันที่เริ่มต้นการทดลอง"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "แผนก"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "พนักงาน"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "สัญญา"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "จำนวนบุตร"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "งาน"
+
+#. module: hr_contract
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "ใบอนุญาตทำงาน"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "ประเภทสัญญา"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Exam"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "วันสิ้นสุด"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "เงินเดือนของพนักงาน"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "อ้างอิงตามสัญญา"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: view:hr.employee:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Salary and Advantages"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr ""
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Dist."
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period Duration"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr ""
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr ""
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2462daa6301..f76f8236b4d 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -165,9 +165,14 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
+                    <h1><field name="employee_id" class="oe_inline"
+                                attrs="{'readonly': [('state', '=', 'done')]}"
+                                on_change="onchange_employee_id(employee_id)"/>,
+                        <field name="date"
+                                attrs="{'readonly': [('state', '=', 'done')]}"/>
+                    </h1>
                     <label for="plan_id" class="oe_edit_only"/>
-                    <h2><field name="plan_id"/></h2>
+                    <h2><field name="plan_id" attrs="{'readonly': [('state', '=', 'done')]}"/></h2>
                     <group>
                         <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                             <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
@@ -175,7 +180,7 @@
                         </group>
                     </group>
                     <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
-                        <field nolabel="1" name="survey_request_ids">
+                        <field nolabel="1" name="survey_request_ids" attrs="{'readonly': [('state', '=', 'done')]}">
                             <form string="Interview Appraisal" version="7.0">
                                 <div class="oe_right oe_button_box">
                                     <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
diff --git a/addons/hr_evaluation/static/src/img/icon.png b/addons/hr_evaluation/static/description/icon.png
similarity index 100%
rename from addons/hr_evaluation/static/src/img/icon.png
rename to addons/hr_evaluation/static/description/icon.png
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 8d707baa50e..5d5be0eec97 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -65,9 +65,9 @@ class hr_expense_expense(osv.osv):
     _order = "id desc"
     _track = {
         'state': {
-            'hr_expense.mt_expense_approved': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'accepted',
-            'hr_expense.mt_expense_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancelled',
-            'hr_expense.mt_expense_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'confirm',
+            'hr_expense.mt_expense_approved': lambda self, cr, uid, obj, ctx=None: obj.state == 'accepted',
+            'hr_expense.mt_expense_refused': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancelled',
+            'hr_expense.mt_expense_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirm',
         },
     }
 
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index ca882406d63..0d9e2a247fd 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -86,7 +86,7 @@
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="line_ids" context="{'currency_id': currency_id, 'default_analytic_account': context.get('analytic_account')}">
+                            <field name="line_ids" context="{'currency_id': currency_id, 'default_analytic_account': context.get('analytic_account', '')}">
                                 <form string="Expense Lines" version="7.0">
                                     <group>
                                         <group>
@@ -210,6 +210,11 @@
             <field name="context">{"default_hr_expense_ok":1}</field>
             <field name="domain">[('hr_expense_ok','=',True)]</field>
             <field name="search_view_id" ref="product.product_search_form_view"/>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new expense category. 
+             </p>
+            </field>
         </record>
 
         <menuitem id="menu_hr_product" name="Expense Categories" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
diff --git a/addons/hr_expense/i18n/th.po b/addons/hr_expense/i18n/th.po
new file mode 100644
index 00000000000..c3e70f447d8
--- /dev/null
+++ b/addons/hr_expense/i18n/th.po
@@ -0,0 +1,939 @@
+# 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-06-20 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-06-21 05:35+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.node,name:hr_expense.process_node_confirmedexpenses0
+msgid "Confirmed Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_line
+msgid "Expense Line"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reimbursement0
+msgid "The accoutant reimburse the expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_confirm:0
+#: field:hr.expense.report,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.air_ticket_product_template
+msgid "Air Ticket"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Validated By"
+msgstr "ตรวจสอบโดย"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,department_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,department_id:0
+msgid "Department"
+msgstr "แผนก"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "New Expense"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,uom_id:0
+#: view:product.product:0
+msgid "Unit of Measure"
+msgstr "หน่วยของการวัด"
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "March"
+msgstr "มีนาคม"
+
+#. module: hr_expense
+#: field:hr.expense.expense,message_unread:0
+msgid "Unread Messages"
+msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#. module: hr_expense
+#: field:hr.expense.expense,company_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,company_id:0
+msgid "Company"
+msgstr "บริษัท"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Set to Draft"
+msgstr "กำหนดให้เป็นแบบร่าง"
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "To Pay"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid ""
+"No expense journal found. Please make sure you have a journal with type "
+"'purchase' configured."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.model,name:hr_expense.model_hr_expense_report
+msgid "Expenses Statistics"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Open Receipt"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,day:0
+msgid "Day"
+msgstr "วัน"
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_valid:0
+msgid ""
+"Date of the acceptation of the sheet expense. It's filled when the button "
+"Accept is pressed."
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Notes"
+msgstr "บันทึกย่อ"
+
+#. module: hr_expense
+#: field:hr.expense.expense,message_ids:0
+msgid "Messages"
+msgstr "ข้อความ"
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:238
+#: code:addons/hr_expense/hr_expense.py:240
+#: code:addons/hr_expense/hr_expense.py:349
+#: code:addons/hr_expense/hr_expense.py:353
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.hr_expense_product
+#: view:product.product:0
+msgid "Products"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Confirm Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Cancelled"
+msgstr "ยกเลิกแล้ว"
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_refused0
+msgid "The direct manager refuses the sheet.Reset as draft."
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.expense,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Waiting confirmation"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Certified honest and conform,"
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.expense,state:0
+msgid ""
+"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'.            \n"
+"If the admin accepts it, the status is 'Accepted'.\n"
+" If a receipt is made for the expense request, the status is 'Done'."
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.expense,date_confirm:0
+msgid ""
+"Date of the confirmation of the sheet expense. It's filled when the button "
+"Confirm is pressed."
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.expense,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: hr_expense
+#: code:addons/hr_expense/hr_expense.py:453
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "(Date and signature)"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_refuseexpense0
+msgid "Refuse expense"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_confirm0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_supplierinvoice0
+msgid "The accoutant validates the sheet"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_valid:0
+msgid "Delay to Valid"
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.line,sequence:0
+msgid "Gives the sequence order when displaying a list of expense lines."
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,analytic_account:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,analytic_account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,date:0
+msgid "Date "
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Waiting"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,employee_id:0
+#: view:hr.expense.report:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: selection:hr.expense.expense,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_reinvoicing0
+msgid "Some costs may be reinvoices to the customer"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:238
+#, python-format
+msgid "The employee must have a home address."
+msgstr ""
+
+#. module: hr_expense
+#: view:board.board:0
+#: view:hr.expense.expense:0
+#: model:ir.actions.act_window,name:hr_expense.action_my_expense
+msgid "My Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.report.xml,name:hr_expense.hr_expenses
+msgid "HR expenses"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,id:0
+msgid "Sheet ID"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimburseexpense0
+msgid "Reimburse expense"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,journal_id:0
+#: field:hr.expense.report,journal_id:0
+msgid "Force Journal"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,no_of_products:0
+msgid "# of Products"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
+msgid "After creating invoice, reimburse expenses"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:121
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reimbursement0
+msgid "Reimbursement"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_valid:0
+#: field:hr.expense.report,date_valid:0
+msgid "Validation Date"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:226
+#, python-format
+msgid "Expense Receipt"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: model:ir.actions.act_window,name:hr_expense.action_hr_expense_report_all
+#: model:ir.ui.menu,name:hr_expense.menu_hr_expense_report_all
+msgid "Expenses Analysis"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.line,expense_id:0
+#: model:ir.model,name:hr_expense.model_hr_expense_expense
+#: model:process.process,name:hr_expense.process_process_expenseprocess0
+msgid "Expense"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,line_ids:0
+#: view:hr.expense.line:0
+msgid "Expense Lines"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,delay_confirm:0
+msgid "Delay to Confirm"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,currency_id:0
+#: field:hr.expense.report,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,voucher_id:0
+msgid "Employee's Receipt"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_draftexpenses0
+msgid "Employee encode all his expenses"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:453
+#, python-format
+msgid ""
+"Selected Unit of Measure does not belong to the same category as the product "
+"Unit of Measure"
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.expense,journal_id:0
+msgid "The journal used when the expense is done."
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,note:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_reimbursereinvoice0
+msgid "Create Customer invoice"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:353
+#, python-format
+msgid ""
+"Please configure Default Expense account for Product purchase: "
+"`property_account_expense_categ`."
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveexpense0
+msgid "Expense is approved."
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_approved0
+msgid "The direct manager approves the sheet"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,amount:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_draftexpenses0
+msgid "Draft Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,name:hr_expense.product_normal_form_view_installer
+msgid "Review Your Expenses Products"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.expense,date:0
+#: field:hr.expense.line,date_value:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.expense_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register new expenses. \n"
+"              </p><p>\n"
+"                OpenERP will ensure the whole process is followed; the "
+"expense\n"
+"                sheet is validated by manager(s), the employee is "
+"reimbursed\n"
+"                from his expenses, some expenses must be re-invoiced to the\n"
+"                customers.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Generate Accounting Entries"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "HR Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.car_travel_product_template
+msgid "Car Travel Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Submit to Manager"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Done Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,note:hr_expense.process_node_confirmedexpenses0
+msgid "The employee validates his expense sheet"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses to Invoice"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_supplierinvoice0
+#: model:process.transition,name:hr_expense.process_transition_approveinvoice0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expenses Sheet"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,voucher_id:0
+msgid "Receipt"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+msgid "Approved Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: field:hr.expense.line,unit_amount:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: selection:hr.expense.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition.action,name:hr_expense.process_transition_action_supplierinvoice0
+msgid "Invoice"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0
+msgid "Reinvoice"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Expense Date"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,user_valid:0
+msgid "Validation By"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:process.transition.action,name:hr_expense.process_transition_action_refuse0
+msgid "Refuse"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_confirmexpense0
+msgid "Confirm expense"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,name:hr_expense.process_transition_approveexpense0
+msgid "Approve expense"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition.action,name:hr_expense.process_transition_action_accept0
+msgid "Accept"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "This document must be dated and signed for reimbursement"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_refuseexpense0
+msgid "Expense is refused."
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.actions.act_window,help:hr_expense.product_normal_form_view_installer
+msgid ""
+"Define one product for each expense type allowed for an employee (travel by "
+"car, hostel, restaurant, etc). If you reimburse the employees at a fixed "
+"rate, set a cost and a unit of measure on the product. If you reimburse "
+"based on real costs, set the cost at 0.00. The user will set the real price "
+"when recording his expense sheet."
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
+#: model:process.node,name:hr_expense.process_node_approved0
+msgid "Approved"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,product_id:0
+#: view:hr.expense.report:0
+#: field:hr.expense.report,product_id:0
+#: model:ir.model,name:hr_expense.model_product_product
+msgid "Product"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+#: view:hr.expense.expense:0
+#: field:hr.expense.expense,name:0
+#: field:hr.expense.line,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,unit_quantity:0
+msgid "Quantities"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Price"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,no_of_account:0
+msgid "# of Accounts"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
+#: model:process.node,name:hr_expense.process_node_refused0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_expense
+#: field:product.product,hr_expense_ok:0
+msgid "Can be Expensed"
+msgstr ""
+
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Ref."
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.report,employee_id:0
+msgid "Employee's Name"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.report:0
+#: field:hr.expense.report,user_id:0
+msgid "Validation User"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Accounting Data"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:121
+#, python-format
+msgid "You can only delete draft expenses!"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.expense,account_move_id:0
+msgid "Ledger Posting"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_approveinvoice0
+msgid "Creates supplier invoice."
+msgstr ""
+
+#. module: hr_expense
+#: model:product.template,name:hr_expense.hotel_rent_product_template
+msgid "Hotel Accommodation"
+msgstr ""
+
+#. module: hr_expense
+#: selection:hr.expense.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,name:0
+msgid "Expense Note"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_expense
+#: help:hr.expense.expense,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: hr_expense
+#: field:hr.expense.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.transition,note:hr_expense.process_transition_confirmexpense0
+msgid "Expense is confirmed."
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:ir.actions.act_window,name:hr_expense.expense_all
+#: model:ir.ui.menu,name:hr_expense.menu_expense_all
+#: model:ir.ui.menu,name:hr_expense.next_id_49
+#: model:product.category,name:hr_expense.cat_expense
+msgid "Expenses"
+msgstr ""
+
+#. module: hr_expense
+#: help:product.product,hr_expense_ok:0
+msgid "Specify if the product can be selected in an HR expense line."
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
+msgid "To Approve"
+msgstr ""
+
+#. module: hr_expense
+#: view:hr.expense.expense:0
+#: view:hr.expense.line:0
+#: field:hr.expense.line,total_amount:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_expense
+#: model:process.node,name:hr_expense.process_node_reinvoicing0
+msgid "Reinvoicing"
+msgstr ""
diff --git a/addons/hr_expense/static/src/img/icon.png b/addons/hr_expense/static/description/icon.png
similarity index 100%
rename from addons/hr_expense/static/src/img/icon.png
rename to addons/hr_expense/static/description/icon.png
diff --git a/addons/hr_holidays/doc/changelog.rst b/addons/hr_holidays/doc/changelog.rst
new file mode 100644
index 00000000000..b286a60d1b5
--- /dev/null
+++ b/addons/hr_holidays/doc/changelog.rst
@@ -0,0 +1,13 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+ - updated ``hr.holidays`` workflow. It now starts in ``confirm`` state. In
+   ``confirm```and ``refuse`` a Reset to Draft has been added in view / workflow,
+   allowing to edit the request. Added a ``can_reset`` computed field to enable
+   this transition. A user can edit its own requests, or all requests if he is
+   an Hr Manager.
diff --git a/addons/hr_holidays/doc/index.rst b/addons/hr_holidays/doc/index.rst
new file mode 100644
index 00000000000..dc87c275b74
--- /dev/null
+++ b/addons/hr_holidays/doc/index.rst
@@ -0,0 +1,13 @@
+Hr Holidays module documentation
+================================
+
+Hr Holidays documentation topics
+''''''''''''''''''''''''''''''''
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 0eb3c0cbf16..008c711a1f0 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -22,11 +22,10 @@
 ##############################################################################
 
 import datetime
-import time
-from itertools import groupby
-from operator import attrgetter, itemgetter
-
 import math
+import time
+from operator import attrgetter
+
 from openerp import tools
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
@@ -36,40 +35,37 @@ class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
     _description = "Leave Type"
 
-    def get_days(self, cr, uid, ids, employee_id, return_false, context=None):
-        cr.execute("""SELECT id, type, number_of_days, holiday_status_id FROM hr_holidays WHERE employee_id = %s AND state='validate' AND holiday_status_id in %s""",
-            [employee_id, tuple(ids)])
-        result = sorted(cr.dictfetchall(), key=lambda x: x['holiday_status_id'])
-        grouped_lines = dict((k, [v for v in itr]) for k, itr in groupby(result, itemgetter('holiday_status_id')))
-        res = {}
-        for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = {}
-            max_leaves = leaves_taken = 0
-            if not return_false:
-                if record.id in grouped_lines:
-                    leaves_taken = -sum([item['number_of_days'] for item in grouped_lines[record.id] if item['type'] == 'remove'])
-                    max_leaves = sum([item['number_of_days'] for item in grouped_lines[record.id] if item['type'] == 'add'])
-            res[record.id]['max_leaves'] = max_leaves
-            res[record.id]['leaves_taken'] = leaves_taken
-            res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
-        return res
+    def get_days(self, cr, uid, ids, employee_id, context=None):
+        result = dict((id, dict(max_leaves=0, leaves_taken=0, remaining_leaves=0,
+                                virtual_remaining_leaves=0)) for id in ids)
+        holiday_ids = self.pool['hr.holidays'].search(cr, uid, [('employee_id', '=', employee_id),
+                                                                ('state', 'in', ['confirm', 'validate1', 'validate']),
+                                                                ('holiday_status_id', 'in', ids)
+                                                                ], context=context)
+        for holiday in self.pool['hr.holidays'].browse(cr, uid, holiday_ids, context=context):
+            status_dict = result[holiday.holiday_status_id.id]
+            if holiday.type == 'add':
+                status_dict['virtual_remaining_leaves'] += holiday.number_of_days
+                if holiday.state == 'validate':
+                    status_dict['max_leaves'] += holiday.number_of_days
+                    status_dict['remaining_leaves'] += holiday.number_of_days
+            elif holiday.type == 'remove':  # number of days is negative
+                status_dict['virtual_remaining_leaves'] += holiday.number_of_days
+                if holiday.state == 'validate':
+                    status_dict['leaves_taken'] -= holiday.number_of_days
+                    status_dict['remaining_leaves'] += holiday.number_of_days
+        return result
 
     def _user_left_days(self, cr, uid, ids, name, args, context=None):
-        return_false = False
         employee_id = False
-        res = {}
-        if context and context.has_key('employee_id'):
-            if not context['employee_id']:
-                return_false = True
+        if context and 'employee_id' in context:
             employee_id = context['employee_id']
         else:
-            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
+            employee_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
             if employee_ids:
                 employee_id = employee_ids[0]
-            else:
-                return_false = True
         if employee_id:
-            res = self.get_days(cr, uid, ids, employee_id, return_false, context=context)
+            res = self.get_days(cr, uid, ids, employee_id, context=context)
         else:
             res = dict.fromkeys(ids, {'leaves_taken': 0, 'remaining_leaves': 0, 'max_leaves': 0})
         return res
@@ -79,11 +75,12 @@ class hr_holidays_status(osv.osv):
         'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
             help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and will not take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
         'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
+        'virtual_remaining_leaves': fields.function(_user_left_days, string='Virtual Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken - Leaves Waiting Approval', multi='user_left_days'),
         'double_validation': fields.boolean('Apply Double Validation', help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved."),
     }
     _defaults = {
@@ -92,8 +89,6 @@ class hr_holidays_status(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context=None):
-        if not ids:
-            return []
         res = []
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
@@ -110,9 +105,9 @@ class hr_holidays(osv.osv):
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {
         'state': {
-            'hr_holidays.mt_holidays_approved': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'validate',
-            'hr_holidays.mt_holidays_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'refuse',
-            'hr_holidays.mt_holidays_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'confirm',
+            'hr_holidays.mt_holidays_approved': lambda self, cr, uid, obj, ctx=None: obj.state == 'validate',
+            'hr_holidays.mt_holidays_refused': lambda self, cr, uid, obj, ctx=None: obj.state == 'refuse',
+            'hr_holidays.mt_holidays_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirm',
         },
     }
 
@@ -134,6 +129,19 @@ class hr_holidays(osv.osv):
                 result[hol.id] = hol.number_of_days_temp
         return result
 
+    def _get_can_reset(self, cr, uid, ids, name, arg, context=None):
+        """User can reset a leave request if it is its own leave request or if
+        he is an Hr Manager. """
+        user = self.pool['res.users'].browse(cr, uid, uid, context=context)
+        group_hr_manager_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_hr_manager')[1]
+        if group_hr_manager_id in [g.id for g in user.groups_id]:
+            return dict.fromkeys(ids, True)
+        result = dict.fromkeys(ids, False)
+        for holiday in self.browse(cr, uid, ids, context=context):
+            if holiday.employee_id and holiday.employee_id.user_id and holiday.employee_id.user_id.id == uid:
+                result[holiday.id] = True
+        return result
+
     def _check_date(self, cr, uid, ids):
         for holiday in self.browse(cr, uid, ids):
             holiday_ids = self.search(cr, uid, [('date_from', '<=', holiday.date_to), ('date_to', '>=', holiday.date_from), ('employee_id', '=', holiday.employee_id.id), ('id', '<>', holiday.id)])
@@ -167,10 +175,13 @@ class hr_holidays(osv.osv):
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Tag')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Tag: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
         'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
+        'can_reset': fields.function(
+            _get_can_reset,
+            type='boolean'),
     }
     _defaults = {
         'employee_id': _employee_get,
-        'state': 'draft',
+        'state': 'confirm',
         'type': 'remove',
         'user_id': lambda obj, cr, uid, context: uid,
         'holiday_type': 'employee'
@@ -302,27 +313,20 @@ class hr_holidays(osv.osv):
         if context is None:
             context = {}
         context = dict(context, mail_create_nolog=True)
-        return super(hr_holidays, self).create(cr, uid, values, context=context)
+        hol_id = super(hr_holidays, self).create(cr, uid, values, context=context)
+        self.check_holidays(cr, uid, [hol_id], context=context)
+        return hol_id
 
-    def write(self, cr, uid, ids, vals, context=None):
-        check_fnct = self.pool.get('hr.holidays.status').check_access_rights
-        for  holiday in self.browse(cr, uid, ids, context=context):
-            if holiday.state in ('validate','validate1') and not check_fnct(cr, uid, 'write', raise_exception=False):
-                raise osv.except_osv(_('Warning!'),_('You cannot modify a leave request that has been approved. Contact a human resource manager.'))
-        return super(hr_holidays, self).write(cr, uid, ids, vals, context=context)
-
-    def set_to_draft(self, cr, uid, ids, context=None):
+    def holidays_reset(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
             'state': 'draft',
             'manager_id': False,
             'manager_id2': False,
         })
-        self.delete_workflow(cr, uid, ids)
-        self.create_workflow(cr, uid, ids)
         to_unlink = []
         for record in self.browse(cr, uid, ids, context=context):
             for record2 in record.linked_request_ids:
-                self.set_to_draft(cr, uid, [record2.id], context=context)
+                self.holidays_reset(cr, uid, [record2.id], context=context)
                 to_unlink.append(record2.id)
         if to_unlink:
             self.unlink(cr, uid, to_unlink, context=context)
@@ -421,13 +425,16 @@ class hr_holidays(osv.osv):
         return True
 
     def check_holidays(self, cr, uid, ids, context=None):
-        holi_status_obj = self.pool.get('hr.holidays.status')
-        for record in self.browse(cr, uid, ids):
-            if record.holiday_type == 'employee' and record.type == 'remove':
-                if record.employee_id and not record.holiday_status_id.limit:
-                    leaves_rest = holi_status_obj.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
-                    if leaves_rest < record.number_of_days_temp:
-                        raise osv.except_osv(_('Warning!'), _('There are not enough %s allocated for employee %s; please create an allocation request for this leave type.') % (record.holiday_status_id.name, record.employee_id.name))
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.holiday_type != 'employee' or record.type != 'remove' or not record.employee_id or record.holiday_status_id.limit:
+                continue
+            leave_days = self.pool.get('hr.holidays.status').get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, context=context)[record.holiday_status_id.id]
+            if leave_days['remaining_leaves'] < record.number_of_days_temp:
+                raise osv.except_osv(_('Warning!'),
+                                     _('There are not enough remaining days available in %s for employee %s.') % (record.holiday_status_id.name, record.employee_id.name))
+            if leave_days['virtual_remaining_leaves'] < record.number_of_days_temp:
+                raise osv.except_osv(_('Warning!'),
+                                     _('Other pending requests already book too much days in %s for employee %s.') % (record.holiday_status_id.name, record.employee_id.name))
         return True
 
     # -----------------------------
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 2b370f08821..703fa74a2ee 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -49,7 +49,7 @@
         <record id="mt_holidays_confirmed" model="mail.message.subtype">
             <field name="name">To Approve</field>
             <field name="res_model">hr.holidays</field>
-            <field name="description">Request created and waiting confirmation</field>
+            <field name="description">Request confirmed and waiting approval</field>
         </record>
         <record id="mt_holidays_approved" model="mail.message.subtype">
             <field name="name">Approved</field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 5ffbff10040..d532a8e9bbb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -53,11 +53,14 @@
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Leave Request" version="7.0">
+                <field name="can_reset" invisible="1"/>
                 <header>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user"/>
+                    <button string="Reset to Draft" name="reset" type="workflow"
+                            attrs="{'invisible': ['|', ('can_reset', '=', False), ('state', 'not in', ['confirm', 'refuse'])]}"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request">
@@ -98,11 +101,14 @@
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
+                <field name="can_reset" invisible="1"/>
                 <header>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user"/>
+                    <button string="Reset to Draft" name="reset" type="workflow"
+                            attrs="{'invisible': ['|', ('can_reset', '=', False), ('state', 'not in', ['confirm', 'refuse'])]}"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
@@ -146,6 +152,7 @@
                     <field name="number_of_days" string="Allocated Days" sum="Remaining Days"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
+                    <field name="date_from" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
                 </tree>
@@ -162,7 +169,7 @@
                         <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                         <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
                         <button string="Refuse" name="refuse" states="confirm,validate,draft" type="workflow" icon="gtk-no"/>
-                        <button string="Reset to New" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
+                        <button string="Reset to Draft" name="reset" states="confirm" type="workflow" groups="base.group_hr_manager"/>
                         <field name="state"/>
                     </header>
                     <group col="4">
@@ -350,8 +357,8 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
-            <field name="context">{'search_default_group_type': 1, 'search_default_validated': 1}</field>
-            <field name="domain">[('holiday_type','=','employee')]</field>
+            <field name="context">{'search_default_group_type': 1}</field>
+            <field name="domain">[('holiday_type','=','employee'), ('state', '!=', 'refuse')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index b729ea54a30..14cbc48138a 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -2,15 +2,16 @@
 <openerp>
 <data>
 
-    <!-- Workflow definition 
-        1. draft->submitted (no signal)
+    <!-- Workflow definition
+        1. draft->submitted (confirm signal) if can_reset
+        2. submitted->draft (reset signal) if can_reset
         2. submitted->accepted (validate signal) if not double_validation
-        2. submitted -> first_accepted (validate signal) if double_validation
+        2. submitted->first_accepted (validate signal) if double_validation
         2. submitted->refused (refuse signal)
         3. accepted->refused (refuse signal)
-        4. first_accepted -> accepted (second_validate  signal)
+        4. first_accepted -> accepted (second_validate signal)
         4. first_accepted -> refused (refuse signal)
-
+        5. refuse -> draft (reset signal) if can_reset
     -->
 
     <record model="workflow" id="wkf_holidays">
@@ -21,13 +22,15 @@
 
     <record model="workflow.activity" id="act_draft"> <!-- draft -->
         <field name="wkf_id" ref="wkf_holidays" />
-        <field name="flow_start">True</field>
         <field name="name">draft</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_reset()</field>
     </record>
 
     <record model="workflow.activity" id="act_confirm"> <!-- submitted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">confirm</field>
+        <field name="flow_start">True</field>
         <field name="kind">function</field>
         <field name="action">holidays_confirm()</field>
         <field name="split_mode">OR</field>
@@ -48,11 +51,9 @@
         <field name="split_mode">OR</field>
     </record>
 
-
     <record model="workflow.activity" id="act_refuse"> <!-- refused -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">refuse</field>
-        <field name="flow_stop">True</field>
         <field name="kind">function</field>
         <field name="action">holidays_refuse()</field>
     </record>
@@ -61,9 +62,20 @@
         workflow transition
     -->
 
-    <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (no signal) -->
+    <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (confirm signal) -->
         <field name="act_from" ref="act_draft" />
         <field name="act_to" ref="act_confirm" />
+        <field name="signal">confirm</field>
+        <field name="condition">can_reset</field>
+        <field name="group_id" ref="base.group_user"/>
+    </record>
+
+    <record model="workflow.transition" id="holiday_confirm2draft"> <!-- 2. submitted->draft (reset signal) -->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_draft" />
+        <field name="signal">reset</field>
+        <field name="condition">can_reset</field>
+        <field name="group_id" ref="base.group_user"/>
     </record>
 
     <record model="workflow.transition" id="holiday_confirm2validate"> <!-- 2. submitted->accepted (validate signal) if not double_validation-->
@@ -82,7 +94,6 @@
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-
     <record model="workflow.transition" id="holiday_confirm2refuse"> <!-- 2. submitted->refused (refuse signal) -->
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_refuse" />
@@ -107,7 +118,6 @@
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-
     <record model="workflow.transition" id="holiday_validate1_validate"> <!-- 4. first_accepted -> accepted (second_validate  signal) -->
         <field name="act_from" ref="act_validate1" />
         <field name="act_to" ref="act_validate" />
@@ -124,5 +134,13 @@
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
+    <record model="workflow.transition" id="holiday_refuse2draft"> <!-- 5. refused->draft (reset signal) -->
+        <field name="act_from" ref="act_refuse" />
+        <field name="act_to" ref="act_draft" />
+        <field name="signal">reset</field>
+        <field name="condition">can_reset</field>
+        <field name="group_id" ref="base.group_hr_manager"/>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index ebc13bc02d4..ad5730d2268 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.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-14 12:51+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
+"PO-Revision-Date: 2013-06-22 10:54+0000\n"
+"Last-Translator: Dariusz Kubiak <d.kubiak@macopedia.pl>\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:30+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-23 05:13+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -32,7 +32,7 @@ msgid "Waiting Second Approval"
 msgstr "Oczekuje na drugą aprobatę"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:298
+#: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
@@ -109,11 +109,13 @@ msgid ""
 "The default duration interval between the start date and the end date is 8 "
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
+"Domyślny odstęp między datą rozpoczęcia i data zakończenia jest 8 godzin. "
+"Zapraszam do dostosowania go do swoich potrzeb."
 
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
 msgid "Request refused"
-msgstr ""
+msgstr "Wniosek odrzucony"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
@@ -274,12 +276,12 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:238
 #: code:addons/hr_holidays/hr_holidays.py:249
-#: code:addons/hr_holidays/hr_holidays.py:274
-#: code:addons/hr_holidays/hr_holidays.py:298
-#: code:addons/hr_holidays/hr_holidays.py:421
-#: code:addons/hr_holidays/hr_holidays.py:471
+#: code:addons/hr_holidays/hr_holidays.py:260
+#: code:addons/hr_holidays/hr_holidays.py:285
+#: code:addons/hr_holidays/hr_holidays.py:309
+#: code:addons/hr_holidays/hr_holidays.py:432
+#: code:addons/hr_holidays/hr_holidays.py:482
 #, python-format
 msgid "Warning!"
 msgstr "Ostrzeżenie !"
@@ -317,7 +319,7 @@ msgid "Sick Leaves"
 msgstr "Zwolnienie lekarskie"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:478
+#: code:addons/hr_holidays/hr_holidays.py:489
 #, python-format
 msgid "Leave Request for %s"
 msgstr "Wniosek urlopowy dla %s"
@@ -341,7 +343,7 @@ msgstr "Pozostało dni urlopu"
 #. module: hr_holidays
 #: field:hr.holidays,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Obserwatorzy"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
@@ -388,7 +390,7 @@ msgid "Wheat"
 msgstr "Pszenny"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:476
+#: code:addons/hr_holidays/hr_holidays.py:487
 #, python-format
 msgid "Allocation for %s"
 msgstr "Przydział dla %s"
@@ -412,7 +414,7 @@ msgid "Number of Days"
 msgstr "Liczba dni"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:471
+#: code:addons/hr_holidays/hr_holidays.py:482
 #, python-format
 msgid ""
 "The feature behind the field 'Remaining Legal Leaves' can only be used when "
@@ -516,7 +518,7 @@ msgid "Start Date"
 msgstr "Data początkowa"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:421
+#: code:addons/hr_holidays/hr_holidays.py:432
 #, python-format
 msgid ""
 "There are not enough %s allocated for employee %s; please create an "
@@ -678,7 +680,7 @@ msgstr "Podsumowanie"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
 msgid "Unpaid"
-msgstr "Niezapłacone"
+msgstr "Bezpłatny"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -741,7 +743,7 @@ msgstr "Różne"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Urlop wyrównawczy"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -766,7 +768,7 @@ msgid "Validated"
 msgstr "Zatwierdzony"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
 #, python-format
 msgid "You cannot delete a leave which is in %s state."
 msgstr "Nie możesz usunąć nieobecności, która jest w stanie %s."
@@ -830,7 +832,7 @@ msgid "To Submit"
 msgstr "Do wysłania"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:343
+#: code:addons/hr_holidays/hr_holidays.py:354
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 #: field:resource.calendar.leaves,holiday_id:0
@@ -930,8 +932,8 @@ msgid "Messages and communication history"
 msgstr "Wiadomości i historia komunikacji"
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:249
-#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:260
+#: code:addons/hr_holidays/hr_holidays.py:285
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index 0375a17ac53..8a2594bb7d7 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,8 +1,9 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_holydays_status_user,hr.holidays.status user,model_hr_holidays_status,base.group_hr_user,1,1,1,1
 access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,1,1,1
 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
+access_hr_holydays_status_manager,hr.holidays.status manager,model_hr_holidays_status,base.group_hr_manager,1,1,1,1
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
 access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
+access_crm_meeting_hr_user,crm.meeting.hr.user,base_calendar.model_crm_meeting,base.group_hr_user,1,1,1,1
 access_crm_meeting_type_manager,crm.meeting.type.manager,base_calendar.model_crm_meeting_type,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_holidays/static/src/img/icon.png b/addons/hr_holidays/static/description/icon.png
similarity index 100%
rename from addons/hr_holidays/static/src/img/icon.png
rename to addons/hr_holidays/static/description/icon.png
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 2bb60300cff..7bedd3302e8 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -18,7 +18,7 @@
   I again set to draft and then confirm.
 -
   !python {model: hr.holidays}: |
-     self.set_to_draft(cr, uid, [ref('hr_holidays_employee1_cl')])
+     self.holidays_reset(cr, uid, [ref('hr_holidays_employee1_cl')])
      self.signal_confirm(cr, uid, [ref('hr_holidays_employee1_cl')])
 -
   I validate the holiday request by clicking on "To Approve" button.
diff --git a/addons/marketing_campaign/res_partner.py b/addons/hr_holidays/tests/__init__.py
similarity index 59%
rename from addons/marketing_campaign/res_partner.py
rename to addons/hr_holidays/tests/__init__.py
index b012cbb7181..f70a6277163 100644
--- a/addons/marketing_campaign/res_partner.py
+++ b/addons/hr_holidays/tests/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    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
@@ -19,23 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.addons.hr_holidays.tests import test_holidays_flow
 
-class res_partner(osv.osv):
-    _inherit = 'res.partner'
-
-    _columns = {
-        'workitem_ids': fields.one2many('marketing.campaign.workitem',
-                                        'partner_id', 'Workitems',
-                                        readonly=True),
-    }
-    
-    def copy(self, cr, uid, id, default={}, context=None):
-        default.update({
-            'workitem_ids': [],
-        })
-        return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
-    
+checks = [
+    test_holidays_flow,
+]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_holidays/tests/common.py b/addons/hr_holidays/tests/common.py
new file mode 100644
index 00000000000..2124a25ac39
--- /dev/null
+++ b/addons/hr_holidays/tests/common.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    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.tests import common
+
+
+class TestHrHolidaysBase(common.TransactionCase):
+
+    def setUp(self):
+        super(TestHrHolidaysBase, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.hr_employee = self.registry('hr.employee')
+        self.hr_holidays = self.registry('hr.holidays')
+        self.hr_holidays_status = self.registry('hr.holidays.status')
+        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 Hr User group
+        group_hr_user_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_hr_user')
+        self.group_hr_user_ref_id = group_hr_user_ref and group_hr_user_ref[1] or False
+
+        # Find Hr Manager group
+        group_hr_manager_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_hr_manager')
+        self.group_hr_manager_ref_id = group_hr_manager_ref and group_hr_manager_ref[1] or False
+
+        # Test partners to use through the various tests
+        self.hr_partner_id = self.res_partner.create(cr, uid, {
+            'name': 'Gertrude AgrolaitPartner',
+            'email': 'gertrude.partner@agrolait.com',
+        })
+        self.email_partner_id = self.res_partner.create(cr, uid, {
+            'name': 'Patrick Ratatouille',
+            'email': 'patrick.ratatouille@agrolait.com',
+        })
+
+        # Test users to use through the various tests
+        self.user_hruser_id = self.res_users.create(cr, uid, {
+            'name': 'Armande HrUser',
+            'login': 'Armande',
+            'alias_name': 'armande',
+            'email': 'armande.hruser@example.com',
+            'groups_id': [(6, 0, [self.group_employee_id, self.group_hr_user_ref_id])]
+        }, {'no_reset_password': True})
+        self.user_hrmanager_id = self.res_users.create(cr, uid, {
+            'name': 'Bastien HrManager',
+            'login': 'bastien',
+            'alias_name': 'bastien',
+            'email': 'bastien.hrmanager@example.com',
+            'groups_id': [(6, 0, [self.group_employee_id, self.group_hr_manager_ref_id])]
+        }, {'no_reset_password': True})
+        self.user_none_id = self.res_users.create(cr, uid, {
+            'name': 'Charlie Avotbonkeur',
+            'login': 'charlie',
+            'alias_name': 'charlie',
+            'email': 'charlie.noone@example.com',
+            'groups_id': [(6, 0, [])]
+        }, {'no_reset_password': True})
+        self.user_employee_id = self.res_users.create(cr, uid, {
+            'name': 'David Employee',
+            'login': 'david',
+            'alias_name': 'david',
+            'email': 'david.employee@example.com',
+            'groups_id': [(6, 0, [self.group_employee_id])]
+        }, {'no_reset_password': True})
+
+        # Hr Data
+        self.employee_emp_id = self.hr_employee.create(cr, uid, {
+            'name': 'David Employee',
+            'user_id': self.user_employee_id,
+        })
+        self.employee_hruser_id = self.hr_employee.create(cr, uid, {
+            'name': 'Armande HrUser',
+            'user_id': self.user_hruser_id,
+        })
diff --git a/addons/hr_holidays/tests/test_holidays_flow.py b/addons/hr_holidays/tests/test_holidays_flow.py
new file mode 100644
index 00000000000..caa6e14f2db
--- /dev/null
+++ b/addons/hr_holidays/tests/test_holidays_flow.py
@@ -0,0 +1,207 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    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 datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+from openerp.addons.hr_holidays.tests.common import TestHrHolidaysBase
+from openerp.osv.orm import except_orm
+from openerp.tools import mute_logger
+
+
+class TestHolidaysFlow(TestHrHolidaysBase):
+
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    def test_00_leave_request_flow(self):
+        """ Testing leave request flow """
+        cr, uid = self.cr, self.uid
+
+        def _check_holidays_status(holiday_status, ml, lt, rl, vrl):
+            self.assertEqual(holiday_status.max_leaves, ml,
+                             'hr_holidays: wrong type days computation')
+            self.assertEqual(holiday_status.leaves_taken, lt,
+                             'hr_holidays: wrong type days computation')
+            self.assertEqual(holiday_status.remaining_leaves, rl,
+                             'hr_holidays: wrong type days computation')
+            self.assertEqual(holiday_status.virtual_remaining_leaves, vrl,
+                             'hr_holidays: wrong type days computation')
+
+        # HrUser creates some holiday statuses -> crash because only HrManagers should do this
+        with self.assertRaises(except_orm):
+            self.holidays_status_dummy = self.hr_holidays_status.create(cr, self.user_hruser_id, {
+                'name': 'UserCheats',
+                'limit': True,
+            })
+
+        # HrManager creates some holiday statuses
+        self.holidays_status_0 = self.hr_holidays_status.create(cr, self.user_hrmanager_id, {
+            'name': 'WithMeetingType',
+            'limit': True,
+            'categ_id': self.registry('crm.meeting.type').create(cr, self.user_hrmanager_id, {'name': 'NotLimitedMeetingType'}),
+        })
+        self.holidays_status_1 = self.hr_holidays_status.create(cr, self.user_hrmanager_id, {
+            'name': 'NotLimited',
+            'limit': True,
+        })
+        self.holidays_status_2 = self.hr_holidays_status.create(cr, self.user_hrmanager_id, {
+            'name': 'Limited',
+            'limit': False,
+            'double_validation': True,
+        })
+
+        # --------------------------------------------------
+        # Case1: unlimited type of leave request
+        # --------------------------------------------------
+
+        # Employee creates a leave request for another employee -> should crash
+        with self.assertRaises(except_orm):
+            self.hr_holidays.create(cr, self.user_employee_id, {
+                'name': 'Hol10',
+                'employee_id': self.employee_hruser_id,
+                'holiday_status_id': self.holidays_status_1,
+                'date_from': (datetime.today() - relativedelta(days=1)),
+                'date_to': datetime.today(),
+                'number_of_days_temp': 1,
+            })
+
+        # Employee creates a leave request in a no-limit category
+        hol1_id = self.hr_holidays.create(cr, self.user_employee_id, {
+            'name': 'Hol11',
+            'employee_id': self.employee_emp_id,
+            'holiday_status_id': self.holidays_status_1,
+            'date_from': (datetime.today() - relativedelta(days=1)),
+            'date_to': datetime.today(),
+            'number_of_days_temp': 1,
+        })
+        hol1 = self.hr_holidays.browse(cr, self.user_hruser_id, hol1_id)
+        self.assertEqual(hol1.state, 'confirm', 'hr_holidays: newly created leave request should be in confirm state')
+
+        # Employee validates its leave request -> should not work
+        self.hr_holidays.signal_validate(cr, self.user_employee_id, [hol1_id])
+        hol1.refresh()
+        self.assertEqual(hol1.state, 'confirm', 'hr_holidays: employee should not be able to validate its own leave request')
+
+        # HrUser validates the employee leave request
+        self.hr_holidays.signal_validate(cr, self.user_hrmanager_id, [hol1_id])
+        hol1.refresh()
+        self.assertEqual(hol1.state, 'validate', 'hr_holidays: validates leave request should be in validate state')
+
+        # --------------------------------------------------
+        # Case2: limited type of leave request
+        # --------------------------------------------------
+
+        # Employee creates a new leave request at the same time -> crash, avoid interlapping
+        with self.assertRaises(except_orm):
+            self.hr_holidays.create(cr, self.user_employee_id, {
+                'name': 'Hol21',
+                'employee_id': self.employee_emp_id,
+                'holiday_status_id': self.holidays_status_1,
+                'date_from': (datetime.today() - relativedelta(days=1)).strftime('%Y-%m-%d %H:%M'),
+                'date_to': datetime.today(),
+                'number_of_days_temp': 1,
+            })
+
+        # Employee creates a leave request in a limited category -> crash, not enough days left
+        with self.assertRaises(except_orm):
+            self.hr_holidays.create(cr, self.user_employee_id, {
+                'name': 'Hol22',
+                'employee_id': self.employee_emp_id,
+                'holiday_status_id': self.holidays_status_2,
+                'date_from': (datetime.today() + relativedelta(days=0)).strftime('%Y-%m-%d %H:%M'),
+                'date_to': (datetime.today() + relativedelta(days=1)),
+                'number_of_days_temp': 1,
+            })
+
+        # Clean transaction
+        self.hr_holidays.unlink(cr, uid, self.hr_holidays.search(cr, uid, [('name', 'in', ['Hol21', 'Hol22'])]))
+
+        # HrUser allocates some leaves to the employee
+        aloc1_id = self.hr_holidays.create(cr, self.user_hruser_id, {
+            'name': 'Days for limited category',
+            'employee_id': self.employee_emp_id,
+            'holiday_status_id': self.holidays_status_2,
+            'type': 'add',
+            'number_of_days_temp': 2,
+        })
+        # HrUser validates the allocation request
+        self.hr_holidays.signal_validate(cr, self.user_hruser_id, [aloc1_id])
+        self.hr_holidays.signal_second_validate(cr, self.user_hruser_id, [aloc1_id])
+        # Checks Employee has effectively some days left
+        hol_status_2 = self.hr_holidays_status.browse(cr, self.user_employee_id, self.holidays_status_2)
+        _check_holidays_status(hol_status_2, 2.0, 0.0, 2.0, 2.0)
+
+        # Employee creates a leave request in the limited category, now that he has some days left
+        hol2_id = self.hr_holidays.create(cr, self.user_employee_id, {
+            'name': 'Hol22',
+            'employee_id': self.employee_emp_id,
+            'holiday_status_id': self.holidays_status_2,
+            'date_from': (datetime.today() + relativedelta(days=2)).strftime('%Y-%m-%d %H:%M'),
+            'date_to': (datetime.today() + relativedelta(days=3)),
+            'number_of_days_temp': 1,
+        })
+        hol2 = self.hr_holidays.browse(cr, self.user_hruser_id, hol2_id)
+        # Check left days: - 1 virtual remaining day
+        hol_status_2.refresh()
+        _check_holidays_status(hol_status_2, 2.0, 0.0, 2.0, 1.0)
+
+        # HrUser validates the first step
+        self.hr_holidays.signal_validate(cr, self.user_hruser_id, [hol2_id])
+        hol2.refresh()
+        self.assertEqual(hol2.state, 'validate1',
+                         'hr_holidays: first validation should lead to validate1 state')
+
+        # HrUser validates the second step
+        self.hr_holidays.signal_second_validate(cr, self.user_hruser_id, [hol2_id])
+        hol2.refresh()
+        self.assertEqual(hol2.state, 'validate',
+                         'hr_holidays: second validation should lead to validate state')
+        # Check left days: - 1 day taken
+        hol_status_2.refresh()
+        _check_holidays_status(hol_status_2, 2.0, 1.0, 1.0, 1.0)
+
+        # HrManager finds an error: he refuses the leave request
+        self.hr_holidays.signal_refuse(cr, self.user_hrmanager_id, [hol2_id])
+        hol2.refresh()
+        self.assertEqual(hol2.state, 'refuse',
+                         'hr_holidays: refuse should lead to refuse state')
+        # Check left days: 2 days left again
+        hol_status_2.refresh()
+        _check_holidays_status(hol_status_2, 2.0, 0.0, 2.0, 2.0)
+
+        # Annoyed, HrUser tries to fix its error and tries to reset the leave request -> does not work, only HrManager
+        self.hr_holidays.signal_reset(cr, self.user_hruser_id, [hol2_id])
+        self.assertEqual(hol2.state, 'refuse',
+                         'hr_holidays: hr_user should not be able to reset a refused leave request')
+
+        # HrManager resets the request
+        self.hr_holidays.signal_reset(cr, self.user_hrmanager_id, [hol2_id])
+        hol2.refresh()
+        self.assertEqual(hol2.state, 'draft',
+                         'hr_holidays: resetting should lead to draft state')
+
+        # HrManager changes the date and put too much days -> crash when confirming
+        self.hr_holidays.write(cr, self.user_hrmanager_id, [hol2_id], {
+            'date_from': (datetime.today() + relativedelta(days=4)).strftime('%Y-%m-%d %H:%M'),
+            'date_to': (datetime.today() + relativedelta(days=7)),
+            'number_of_days_temp': 4,
+        })
+        with self.assertRaises(except_orm):
+            self.hr_holidays.signal_confirm(cr, self.user_hrmanager_id, [hol2_id])
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index ccd87ba2616..4410784c63c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -70,8 +70,8 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         <field name="parent_id"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                          <page string="Salary Rules">
@@ -227,13 +227,12 @@
                     <div class="oe_title">
                         <label for="employee_id" class="oe_edit_only"/>
                         <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
-                        <label for="date_from" class="oe_edit_only" string="Period"/>
-                        <h2>
-                            From <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
-                            to <field name="date_to"/>
-                        </h2>
                     </div>
                     <group col="4">
+                        <label for="date_from" string="Period"/>
+                        <div>
+                            <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)" class="oe_inline"/> - <field name="date_to" class="oe_inline"/>
+                        </div>
                         <field name="contract_id" domain="[('employee_id','=',employee_id),('date_start','&lt;=',date_to),'|',('date_end','&gt;=',date_from),('date_end','=',False)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)" context="{'default_employee_id': employee_id}"/>
                         <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
@@ -322,7 +321,7 @@
                                 </tree>
                             </field>
                        </page>
-                       <page string="Other Information">
+                       <page string="Accounting Information">
                             <group>
                                 <group string="Miscellaneous">
                                     <field name="company_id" groups="base.group_multi_company"/>
@@ -592,8 +591,8 @@
                                 <field name="amount_percentage_base" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required': [('amount_select','=','percentage')]}"/><newline/>
                                 <field name="quantity" attrs="{'invisible':[('amount_select','=','code')], 'required':[('amount_select','!=','code')]}"/><newline/>
                                 <field name="amount_fix"  attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/><newline/>
-                                <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
                                 <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
+                                <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
                                 <separator colspan="4" string="Company Contribution"/>
                                 <field name="register_id"/>
                             </group>
@@ -699,13 +698,11 @@
                     <h1>
                         <field name="name"/>
                     </h1>
-                    <h2>
-                        Period from 
-                        <field name="date_start"/> 
-                        to 
-                        <field name="date_end"/>
-                    </h2>
                     <group col="4">
+                        <label for="date_start" string="Period"/>
+                         <div>
+                               <field name="date_start" class="oe_inline"/> - <field name="date_end" class="oe_inline"/>
+                         </div>
                         <field name="credit_note"/>
                     </group>
                     <separator string="Payslips"/>
diff --git a/addons/hr_payroll/static/src/img/icon.png b/addons/hr_payroll/static/description/icon.png
similarity index 100%
rename from addons/hr_payroll/static/src/img/icon.png
rename to addons/hr_payroll/static/description/icon.png
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
index 8cfaa85518a..7600733c67a 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
@@ -7,14 +7,16 @@
             <field name="model">payslip.lines.contribution.register</field>
             <field name="arch" type="xml">
             <form string="Contribution Register's Payslip Lines" version="7.0">
-                <header>
-                    <button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_highlight"/>
-                </header>
                 <group col="4" colspan="6">
                     <field name="date_from"/>
                     <newline/>
                     <field name="date_to"/>
                 </group>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel"/>
+                </footer>
             </form>
             </field>
         </record>
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 5837472be5f..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 = {
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index e83c546af04..d76f682d9b6 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -39,7 +39,6 @@ You can define the different phases of interviews and easily rate the applicant
     'website': 'http://www.openerp.com',
     'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'],
     'depends': [
-        'base_status',
         'decimal_precision',
         'hr',
         'survey',
@@ -47,7 +46,6 @@ You can define the different phases of interviews and easily rate the applicant
         'fetchmail',
     ],
     'data': [
-        'wizard/hr_recruitment_employee_hired.xml',
         'wizard/hr_recruitment_create_partner_job_view.xml',
         'hr_recruitment_view.xml',
         'hr_recruitment_menu.xml',
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 79e09937705..2bec80858a5 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -22,7 +22,7 @@
         <field name="res_model">hr.applicant</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','in',('draft','open'))]</field>
+        <field name="domain">[('stage_id.fold', '!=', True)]</field>
         <field name="view_id" ref="view_applicants_status_tree"/>
     </record>
 
diff --git a/addons/hr_recruitment/doc/changelog.rst b/addons/hr_recruitment/doc/changelog.rst
new file mode 100644
index 00000000000..404b94ee6d1
--- /dev/null
+++ b/addons/hr_recruitment/doc/changelog.rst
@@ -0,0 +1,16 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- Stage/state update
+
+  - ``hr.applicant``: removed inheritance from ``base_stage`` class and removed
+    ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
+    modification. Removed ``date`` field not used anywhere. Updated reports.
+  - ``hr.recruitment.stage``: removed ``state`` field.
+
+- Removed ``hired.employee`` wizard.
diff --git a/addons/hr_recruitment/doc/index.rst b/addons/hr_recruitment/doc/index.rst
new file mode 100644
index 00000000000..d9e83fc9c10
--- /dev/null
+++ b/addons/hr_recruitment/doc/index.rst
@@ -0,0 +1,22 @@
+=====================
+HR Recruitment DevDoc
+=====================
+
+Hr Recruitment module documentation
+===================================
+
+Documentation topics
+''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/hr_recruitment/doc/stage_status.rst b/addons/hr_recruitment/doc/stage_status.rst
new file mode 100644
index 00000000000..111c43db250
--- /dev/null
+++ b/addons/hr_recruitment/doc/stage_status.rst
@@ -0,0 +1,54 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+Stage
++++++
+
+This revision removed the concept of state on hr.applicant objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
+
+ - ``hr.applicant`` now use only stages. However a convention still exists about
+   'New' stage. An applicant is consdered as ``new`` when it has the following
+   properties:
+
+   - ``stage_id and stage_id.sequence = 1``
+
+ - ``hr.recruitment.stage`` do not have any ``state`` field anymore. 
+ - ``hr.recruitment.report`` do not have any ``state`` field anymore. 
+
+By default a newly created applicant be in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+Employee creation is still feasible directly from a link button in the form view.
+
+Stage analysis
+++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``hr.recruitment.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
++++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
+++++++++
+
+The following subtypes are triggered on ``hr.applicant``:
+
+ - ``mt_applicant_new``: new applicants. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
+ - ``mt_applicant_stage_changed``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
+
+The following subtype is trigerred on ``hr.job``:
+
+ - ``mt_job_new_applicant``: new applicant in the job.
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index e26c96d41d9..b0db9232bd9 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -19,23 +19,13 @@
 #
 ##############################################################################
 
-import time
 from openerp import tools
 
-from openerp.addons.base_status.base_stage import base_stage
 from datetime import datetime
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 from openerp.tools import html2plaintext
 
-AVAILABLE_STATES = [
-    ('draft', 'New'),
-    ('cancel', 'Refused'),
-    ('open', 'In Progress'),
-    ('pending', 'Pending'),
-    ('done', 'Hired')
-]
-
 AVAILABLE_PRIORITIES = [
     ('', ''),
     ('5', 'Not Good'),
@@ -62,13 +52,11 @@ class hr_recruitment_stage(osv.osv):
         'name': fields.char('Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
         'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."),
         'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
         'requirements': fields.text('Requirements'),
     }
     _defaults = {
         'sequence': 1,
-        'state': 'draft',
         'fold': False,
     }
 
@@ -87,18 +75,15 @@ class hr_recruitment_degree(osv.osv):
         ('name_uniq', 'unique (name)', 'The name of the Degree of Recruitment must be unique!')
     ]
 
-class hr_applicant(base_stage, osv.Model):
+class hr_applicant(osv.Model):
     _name = "hr.applicant"
     _description = "Applicant"
     _order = "id desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _track = {
-        'state': {
-            'hr_recruitment.mt_applicant_hired': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'hr_recruitment.mt_applicant_refused': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
-        },
         'stage_id': {
-            'hr_recruitment.mt_stage_changed': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['done', 'cancel'],
+            'hr_recruitment.mt_applicant_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
+            'hr_recruitment.mt_applicant_stage_changed': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
         },
     }
 
@@ -109,7 +94,7 @@ class hr_applicant(base_stage, osv.Model):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         department_id = self._get_default_department_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], department_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
 
     def _resolve_department_id_from_context(self, cr, uid, context=None):
         """ Returns ID of department based on the value of 'default_department_id'
@@ -197,20 +182,12 @@ class hr_applicant(base_stage, osv.Model):
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage', track_visibility='onchange',
                         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.\
-                      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\'.'),
         'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible', track_visibility='onchange'),
-        # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True, select=True),
-        'date_open': fields.datetime('Opened', readonly=True, select=True),
-        'date': fields.datetime('Date'),
+        'date_open': fields.datetime('Assigned', readonly=True, select=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
         'date_action': fields.date('Next Action Date'),
         'title_action': fields.char('Next Action', size=64),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Appreciation'),
@@ -234,37 +211,35 @@ class hr_applicant(base_stage, osv.Model):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
         'color': fields.integer('Color Index'),
-        'emp_id': fields.many2one('hr.employee', 'employee'),
+        'emp_id': fields.many2one('hr.employee', string='Employee',
+            help='Employee linked to the applicant.'),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
 
     _defaults = {
         'active': lambda *a: 1,
-        'user_id':  lambda s, cr, uid, c: uid,
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
+        'user_id': lambda s, cr, uid, c: uid,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
         'color': 0,
+        'date_last_stage_update': fields.datetime.now(),
     }
 
     _group_by_full = {
         'stage_id': _read_group_stage_ids
     }
 
-    def onchange_job(self, cr, uid, ids, job, context=None):
-        result = {}
+    def onchange_job(self, cr, uid, ids, job_id=False, context=None):
+        if job_id:
+            job_record = self.pool.get('hr.job').browse(cr, uid, job_id, context=context)
+            if job_record and job_record.department_id:
+                return {'value': {'department_id': job_record.department_id.id}}
+        return {}
 
-        if job:
-            job_obj = self.pool.get('hr.job')
-            result['department_id'] = job_obj.browse(cr, uid, job, context=context).department_id.id
-            return {'value': result}
-        return {'value': {'department_id': False}}
-
-    def onchange_department_id(self, cr, uid, ids, department_id=False, context=None):
-        obj_recru_stage = self.pool.get('hr.recruitment.stage')
-        stage_ids = obj_recru_stage.search(cr, uid, ['|',('department_id','=',department_id),('department_id','=',False)], context=context)
-        stage_id = stage_ids and stage_ids[0] or False
+    def onchange_department_id(self, cr, uid, ids, department_id=False, stage_id=False, context=None):
+        if not stage_id:
+            stage_id = self.stage_find(cr, uid, [], department_id, [('sequence', '=', '1')], context=context)
         return {'value': {'stage_id': stage_id}}
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
@@ -356,10 +331,8 @@ class hr_applicant(base_stage, osv.Model):
         """
         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'),
@@ -403,27 +376,31 @@ class hr_applicant(base_stage, osv.Model):
         return super(hr_applicant, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('department_id') and not context.get('default_department_id'):
+            context['default_department_id'] = vals.get('department_id')
+
         obj_id = super(hr_applicant, self).create(cr, uid, vals, context=context)
         applicant = self.browse(cr, uid, obj_id, context=context)
         if applicant.job_id:
             self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('Applicant <b>created</b>'), subtype="hr_recruitment.mt_job_new_applicant", context=context)
         return obj_id
 
-    def case_open(self, cr, uid, ids, context=None):
-        """
-            open Request of the applicant for the hr_recruitment
-        """
-        res = super(hr_applicant, self).case_open(cr, uid, ids, context)
-        date = self.read(cr, uid, ids, ['date_open'])[0]
-        if not date['date_open']:
-            self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),})
-        return res
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        # stage change: update date_last_stage_update
+        if 'stage_id' in vals:
+            vals['date_last_stage_update'] = fields.datetime.now()
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
 
-    def case_close(self, cr, uid, ids, context=None):
-        res = super(hr_applicant, self).case_close(cr, uid, ids, context)
-        return res
+        return super(hr_applicant, self).write(cr, uid, ids, vals, context=context)
 
-    def case_close_with_emp(self, cr, uid, ids, context=None):
+    def create_employee_from_applicant(self, cr, uid, ids, context=None):
+        """ Create an hr.employee from the hr.applicants """
         if context is None:
             context = {}
         hr_employee = self.pool.get('hr.employee')
@@ -433,17 +410,16 @@ class hr_applicant(base_stage, osv.Model):
         for applicant in self.browse(cr, uid, ids, context=context):
             address_id = contact_name = False
             if applicant.partner_id:
-                address_id = self.pool.get('res.partner').address_get(cr,uid,[applicant.partner_id.id],['contact'])['contact']
-                contact_name = self.pool.get('res.partner').name_get(cr,uid,[applicant.partner_id.id])[0][1]
+                address_id = self.pool.get('res.partner').address_get(cr, uid, [applicant.partner_id.id], ['contact'])['contact']
+                contact_name = self.pool.get('res.partner').name_get(cr, uid, [applicant.partner_id.id])[0][1]
             if applicant.job_id and (applicant.partner_name or contact_name):
                 applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
-                emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or contact_name,
+                emp_id = hr_employee.create(cr, uid, {'name': applicant.partner_name or contact_name,
                                                      'job_id': applicant.job_id.id,
                                                      'address_home_id': address_id,
                                                      'department_id': applicant.department_id.id
                                                      })
                 self.write(cr, uid, [applicant.id], {'emp_id': emp_id}, context=context)
-                self.case_close(cr, uid, [applicant.id], context)
             else:
                 raise osv.except_osv(_('Warning!'), _('You must define an Applied Job and a Contact Name for this applicant.'))
 
@@ -454,26 +430,6 @@ class hr_applicant(base_stage, osv.Model):
         dict_act_window['view_mode'] = 'form,tree'
         return dict_act_window
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """Overrides cancel for crm_case for setting probability
-        """
-        res = super(hr_applicant, self).case_cancel(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_pending(self, cr, uid, ids, context=None):
-        """Marks case as pending"""
-        res = super(hr_applicant, self).case_pending(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'probability': 0.0})
-        return res
-
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as draft
-        """
-        res = super(hr_applicant, self).case_reset(cr, uid, ids, context)
-        self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
-        return res
-
     def set_priority(self, cr, uid, ids, priority, *args):
         """Set applicant priority
         """
@@ -506,33 +462,18 @@ class hr_job(osv.osv):
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
     }
-    _defaults = {
-        'alias_domain': False, # always hide alias during creation
-    }
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
-        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
+        return self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job, self)._auto_init,
+            'hr.applicant', self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
 
     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_id = mail_alias.create_unique_alias(cr, uid,
-                          # Using '+' allows using subaddressing for those who don't
-                          # have a catchall domain setup.
-                          {'alias_name': 'jobs+'+vals['name']},
-                          model_name="hr.applicant",
-                          context=context)
-            vals['alias_id'] = alias_id
-        res = super(hr_job, self).create(cr, uid, vals, context)
-        mail_alias.write(cr, uid, [vals['alias_id']], {"alias_defaults": {'job_id': res}}, context)
-        return res
+        alias_context = dict(context, alias_model_name='hr.applicant', alias_parent_model_name=self._name)
+        job_id = super(hr_job, self).create(cr, uid, vals, context=alias_context)
+        job = self.browse(cr, uid, job_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [job.alias_id.id], {'alias_parent_thread_id': job_id, "alias_defaults": {'job_id': job_id}}, context)
+        return job_id
 
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the job position.
@@ -550,15 +491,16 @@ class hr_job(osv.osv):
         if record.survey_id:
             datas['ids'] = [record.survey_id.id]
         datas['model'] = 'survey.print'
-        context.update({'response_id': [0], 'response_no': 0,})
+        context.update({'response_id': [0], 'response_no': 0})
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'survey.form',
             'datas': datas,
-            'context' : context,
-            'nodestroy':True,
+            'context': context,
+            'nodestroy': True,
         }
 
+
 class applicant_category(osv.osv):
     """ Category of applicant """
     _name = "hr.applicant_category"
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index f3f1b3e712d..854dea0548f 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -51,34 +51,29 @@
         <field name="name">Doctoral Degree</field>
         <field name="sequence">4</field>
     </record>
+
     <record model="hr.recruitment.stage" id="stage_job1">
         <field name="name">Initial Qualification</field>
-        <field name="state">draft</field>
         <field name="sequence">1</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
-        <field name="state">open</field>
         <field name="sequence">2</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
         <field name="name">Second Interview</field>
-        <field name="state">open</field>
         <field name="sequence">3</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job4">
         <field name="name">Contract Proposed</field>
-        <field name="state">pending</field>
         <field name="sequence">4</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
-        <field name="state">done</field>
         <field name="sequence">5</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
-        <field name="state">cancel</field>
         <field name="sequence">6</field>
         <field name="fold" eval="True"/>
     </record>
@@ -467,24 +462,24 @@
         <field name="res_model">hr.job</field>
     </record>
     <!-- Applicant-related subtypes for messaging / Chatter -->
-    <record id="mt_stage_changed" model="mail.message.subtype">
+    <record id="mt_applicant_new" model="mail.message.subtype">
+        <field name="name">New Applicant</field>
+        <field name="res_model">hr.applicant</field>
+        <field name="default" eval="False"/>
+        <field name="description">Applicant created</field>
+    </record>
+    <record id="mt_applicant_stage_changed" model="mail.message.subtype">
         <field name="name">Stage Changed</field>
         <field name="res_model">hr.applicant</field>
         <field name="default" eval="False"/>
         <field name="description">Stage changed</field>
     </record>
-    <record id="mt_applicant_hired" model="mail.message.subtype">
+    <record id="mt_applicant_employee" model="mail.message.subtype">
         <field name="name">Applicant Hired</field>
         <field name="res_model">hr.applicant</field>
         <field name="default" eval="False"/>
         <field name="description">Applicant hired</field>
     </record>
-    <record id="mt_applicant_refused" model="mail.message.subtype">
-        <field name="name">Applicant Refused</field>
-        <field name="res_model">hr.applicant</field>
-        <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>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index f6fb202252c..e95976a6a31 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -12,7 +12,7 @@
         name="Meetings"
         res_model="crm.meeting"
         src_model="hr.applicant"
-        view_mode="tree,form,calendar,graph"
+        view_mode="calendar,tree,form,graph"
         view_type="form"/>
 
     <!-- Stage -->
@@ -39,9 +39,10 @@
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+            <tree string="Applicants" fonts="bold:message_unread==True">
                 <field name="message_unread" invisible="1"/>
                 <field name="create_date"/>
+                <field name="date_last_stage_update" invisible="1"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
                 <field name="email_from"/>
@@ -58,7 +59,6 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -69,13 +69,7 @@
         <field name="arch" type="xml">
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
-                <button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object"
-                        class="oe_highlight"
-                        attrs="{'invisible':['|', ('emp_id','!=',False), ('state','=','cancel')]}"/>
-                <button name="case_cancel" string="Refuse" type="object"
-                        states="draft,open,pending" class="oe_highlight"/>
                 <field name="stage_id" widget="statusbar" clickable="True"/>
-                <field name="emp_id" invisible="1"/>
             </header>
             <sheet>
                 <div class="oe_right oe_button_box">
@@ -93,9 +87,12 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2>
+                    <h2 style="display: inline-block;">
                         <field name="partner_name" class="oe_inline"/>
                     </h2>
+                    <button string="Create Employee" name="create_employee_from_applicant" type="object"
+                                    class="oe_link oe_inline" style="margin-left: 8px;"
+                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/> 
                 </div>
                 <group>
                     <group>
@@ -115,7 +112,6 @@
                             <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
                         </div>
                         <field name="priority"/>
-                        <field name="state" invisible="1"/>
                         <field name="source_id"/>
                         <field name="reference"/>
                     </group>
@@ -123,7 +119,7 @@
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="job_id" on_change="onchange_job(job_id)"/>
-                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id, stage_id)"/>
                         <label for="availability"/>
                         <div>
                             <field name="availability" class="oe_inline"/> <label string="Day(s)" class="oe_inline"/>
@@ -142,6 +138,7 @@
                             <span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}"> + </span>
                             <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
                         </div>
+                        <field name="emp_id" readonly="1"/>
                     </group>
                 </group>
                 <group>
@@ -165,7 +162,7 @@
               <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
                 <field name="job_id"/>
                 <field name="salary_expected" operator="+"/>
-                <field name="state" group="True"/>
+                <field name="stage_id" group="True"/>
             </graph>
         </field>
     </record>
@@ -174,22 +171,22 @@
         <field name="name">Jobs - Recruitment Search</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <search string="Search Jobs">
+            <search string="Search Applicants">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
+                <filter string="Unassigned" domain="[('user_id', '=', False)]"/>
+                <filter string="My" domain="[('user_id', '=', uid)]"/>
+                <separator/>
                 <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
-                <filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
-                <filter string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
-                <separator/>
-                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/>
-                <separator/>
                 <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
                 <field name="job_id"/>
+                <field name="department_id"/>
                 <field name="user_id"/>
+                <field name="stage_id" domain="[]"/>
                 <separator/>
                 <field name="categ_ids"/>
+                <separator/>
                 <group expand="0" string="Group By...">
                     <filter string="Responsible" domain="[]"  context="{'group_by':'user_id'}"/>
                     <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
@@ -200,6 +197,7 @@
                     <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'}"/>
+                    <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}"/>
                 </group>
            </search>
         </field>
@@ -316,18 +314,19 @@
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="//div[@class='oe_title']//h1" position="after">
-                <div name="group_alias"
+            <xpath expr="//group[@name='job_data']" position="after">
+                <group 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>
+                    <label for="alias_name" string="Email Alias"/>
+                    <div name="alias_def">
+                        <field name="alias_id" class="oe_read_only oe_inline"
+                                string="Email Alias" required="0"/>
+                        <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                            <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                        </div>
+                    </div>
+                    <field name="alias_contact" class="oe_inline" string="Accept Emails From"/>
+                </group>
             </xpath>
         </field>
     </record>
@@ -341,7 +340,6 @@
                 <field name="sequence" invisible="1"/>
                 <field name="name"/>
                 <field name="department_id"/>
-                <field name="state"/>
             </tree>
         </field>
     </record>
@@ -359,7 +357,6 @@
                         <field name="department_id"/>
                     </group>
                     <group>
-                        <field name="state"/>
                         <field name="sequence"/>
                         <field name="fold"/>
                     </group>
diff --git a/addons/hr_recruitment/i18n/th.po b/addons/hr_recruitment/i18n/th.po
new file mode 100644
index 00000000000..fb80cbf4ca7
--- /dev/null
+++ b/addons/hr_recruitment/i18n/th.po
@@ -0,0 +1,1261 @@
+# 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-06-20 01:58+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-06-21 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "ความต้องการ"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Application Summary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Start Interview"
+msgstr "เริ่มสัมภาษณ์"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Mobile:"
+msgstr "มือถือ:"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,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: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Filter and view on next actions and date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+msgid "Department"
+msgstr "แผนก"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected_extra:0
+msgid "Expected Salary Extra"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "งาน"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Pending Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,message_unread:0
+msgid "Unread Messages"
+msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "บริษัท"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.source:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_source_action
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_source
+msgid "Sources of Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:445
+#, python-format
+msgid "You must define Applied Job for this applicant."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr "งาน"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a new job applicant.\n"
+"              </p><p>\n"
+"                OpenERP helps you track applicants in the recruitment\n"
+"                process and follow up all operations: meetings, interviews, "
+"etc.\n"
+"              </p><p>\n"
+"                If you setup the email gateway, applicants and their "
+"attached\n"
+"                CV are created automatically when an email is sent to\n"
+"                jobs@yourcompany.com. If you install the document "
+"management\n"
+"                modules, all resumes are indexed automatically, so that you "
+"can\n"
+"                easily search through their content.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applications"
+msgstr "โปรแกรม"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,emp_id:0
+msgid "employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.config.settings,fetchmail_applicants:0
+msgid "Create applicants from an incoming email account"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "วัน"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Contact"
+msgstr "สร้างผู้ติดต่อ"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Refuse"
+msgstr "ปฏิเสธ"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Master Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "มือถือ"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "ข้อความ"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
+#, python-format
+msgid "Error!"
+msgstr "ผิดพลาด!"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid "Doctoral Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,department_id:0
+msgid ""
+"Stages of the recruitment process may be different per department. If this "
+"stage is common to all departments, keep this field empty."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "ถ้าการตรวจสอบข้อความใหม่ให้ระบุความสนใจของคุณ"
+
+#. module: hr_recruitment
+#: field:hr.applicant,color:0
+msgid "Color Index"
+msgstr "ดัชนีสี"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.act_hr_applicant_to_meeting
+msgid "Meetings"
+msgstr "การประชุม"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.job,survey_id:0
+msgid "Interview Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.job,survey_id:0
+msgid ""
+"Choose an interview form for this job position and you will be able to "
+"print/answer this interview from all applicants who apply for this job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "รับสมัครงาน"
+
+#. module: hr_recruitment
+#: help:hr.applicant,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: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:445
+#, python-format
+msgid "Warning!"
+msgstr "คำเตือน!"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "คู่ค้า"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,availability:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr "ที่มีอยู่"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Print interview report"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Hired employees"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr "รายละเอียดงาน"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr "ที่มา"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr "ติดตาม"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr "อีเมล์"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a new stage in the recruitment process.\n"
+"          </p><p>\n"
+"            Define here your stages of the recruitment process, for "
+"example:\n"
+"            qualification call, first interview, second interview, refused,\n"
+"            hired.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr "เหลืออยู่"
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.job,alias_id:0
+msgid ""
+"Email alias for this job position. New emails will automatically create new "
+"applicants for this job position."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr "ดี"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "สิงหาคม"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr "วันที่สร้าง"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_hired_employee
+#: model:ir.model,name:hr_recruitment.model_hired_employee
+msgid "Create Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Print Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr "สัมภาษณ์ครั้งที่สอง"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Recruitment / Applicants Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "กรกฎาคม"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:360
+#, python-format
+msgid "No Subject"
+msgstr "ไม่มีชื่อเรื่อง"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:347
+#: field:hr.applicant,partner_id:0
+#, python-format
+msgid "Contact"
+msgstr "ที่อยู่ติดต่อ"
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected_extra:0
+msgid "Salary Expected by Applicant, extra advantages"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,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: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr "มีนาคม"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Draft recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Delete"
+msgstr "ลบ"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr "อยู่ระหว่างดำเนินการ"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Hire & Create Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "เมษายน"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr "กันยายน"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr "ธันวาคม"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A contact is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,categ_ids:0
+msgid "Tags"
+msgstr "แท็ก"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant_category
+msgid "Category of applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr "เดือน"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer related job question"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr "วันที่ปรับปรุง"
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Yes"
+msgstr "ใช่"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,name:0
+msgid "Subject"
+msgstr "ชื่อเรื่อง"
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+#: view:hr.recruitment.partner.create:0
+msgid "or"
+msgstr "หรือ"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr "เปิดแล้ว"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "No"
+msgstr "ไม่"
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "All Initial Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,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: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_degree
+msgid "Degrees"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr "ปิดแล้ว"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "Pending"
+msgstr "รอดำเนินการ"
+
+#. module: hr_recruitment
+#: field:hr.applicant,state:0
+#: field:hr.recruitment.report,state:0
+#: field:hr.recruitment.stage,state:0
+msgid "Status"
+msgstr "สถานะ"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule interview with this applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:407
+#, python-format
+msgid "Applicant <b>created</b>"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "โทรศัพท์"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr "มิถุนายน"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_is_follower:0
+msgid "Is a Follower"
+msgstr "เป็นผู้ติดตาม"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr "ผู้ใช้งาน"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr "ดีเยี่ยม"
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr "เปิดใช้งาน"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Applications"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a new stage in the recruitment process.\n"
+"          </p><p>\n"
+"            Don't forget to specify the department if your recruitment "
+"process\n"
+"            is different according to the job position.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr "การตอบรับ"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr "ตุลาคม"
+
+#. module: hr_recruitment
+#: field:hr.config.settings,module_document_ftp:0
+msgid "Allow the automatic indexation of resumes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed_extra:0
+msgid "Proposed Salary Extra"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
+#, python-format
+msgid "A contact is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact:"
+msgstr "การติดต่อ:"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "ค้นหา งาน"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr "วันที่"
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+msgid "Survey"
+msgstr "สำรวจ"
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Would you like to create an employee ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Degree:"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_form_installer
+msgid ""
+"Check if the following stages are matching your recruitment process. Don't "
+"forget to specify the department if your recruitment process is different "
+"according to the job position."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.config.settings:0
+msgid "Configure"
+msgstr "ตั้งค่า"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_website_company
+msgid "Company Website"
+msgstr "เวปไซต์ บริษัท"
+
+#. module: hr_recruitment
+#: sql_constraint:hr.recruitment.degree:0
+msgid "The name of the Degree of Recruitment must be unique!"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr "ปี"
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a contact based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.config.settings,fetchmail_applicants:0
+msgid ""
+"Allow applicants to send their job application to an email address "
+"(jobs@mycompany.com),\n"
+"                and create automatically application documents in the system."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "In Progress"
+msgstr "อยู่ระหว่างทำงาน"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject / Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr "รับผิดชอบ"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Create New Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_linkedin
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
+msgid "New Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr "ใหม่"
+
+#. module: hr_recruitment
+#: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
+#: view:hr.job:0
+msgid "Interview"
+msgstr "บทสัมภาษณ์"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.source,name:0
+msgid "Source Name"
+msgstr "ชื่อแหล่ง"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Day(s)"
+msgstr "วัน"
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr "รายละเอียด"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr "พฤษภาคม"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_word
+msgid "Word of Mouth"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.stage,fold:0
+msgid "Hide in views if empty"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.config.settings,module_document_ftp:0
+msgid ""
+"Manage your CV's and motivation letter related to all applicants.\n"
+"                This installs the module document_ftp. This will install the "
+"knowledge management  module in order to allow you to search using specific "
+"keywords through  the content of all documents (PDF, .DOCx...)"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+#: selection:hr.recruitment.stage,state:0
+msgid "Refused"
+msgstr "ถูกปฏิเสธ"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Referred By"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Departement:"
+msgstr "แผนก:"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg. Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Open Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr "กุมภาพันธ์"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr "ไม่ดี"
+
+#. module: hr_recruitment
+#: field:hr.applicant_category,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr "ชื่อ"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr "พฤศจิกายน"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp_avg:0
+msgid "Avg. Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr "คนเหล่านี้จะได้รับอีเมล์"
+
+#. module: hr_recruitment
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr "นามแฝง"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Pending recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract"
+msgstr "สัญญา"
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr "สรุป"
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_ids:0
+msgid "Messages and communication history"
+msgstr "ข้อความและประวัติการสื่อสาร"
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.stage,department_id:0
+msgid "Specific to a Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr "ลำดับ"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
+msgid "Bachelor Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr "hr.config.settings"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,state:0
+msgid ""
+"The related status for the stage. The status of your document will "
+"automatically change according to the selected stage. Example, a stage is "
+"related to the status 'Close', when your document reach this stage, it will "
+"be automatically closed."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed_extra:0
+msgid "Salary Proposed by the Organisation, extra advantages"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr "เปิด"
+
+#. module: hr_recruitment
+#: view:board.board:0
+msgid "Applications to be Processed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule Interview"
+msgstr "ตารางเวลาสัมภาษณ์"
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 8c365b10070..93384c95ed4 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -18,30 +18,24 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from .. import hr_recruitment
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 
-AVAILABLE_STATES = [
-    ('draft','New'),
-    ('open','Open'),
-    ('cancel', 'Refused'),
-    ('done', 'Hired'),
-    ('pending','Pending')
-]
-
-class hr_recruitment_report(osv.osv):
+class hr_recruitment_report(osv.Model):
     _name = "hr.recruitment.report"
     _description = "Recruitments Statistics"
     _auto = False
-    _rec_name = 'date'
+    _rec_name = 'date_create'
+    _order = 'date_create desc'
 
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'nbr': fields.integer('# of Applications', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
+        # TDE TODO: use MONTHS
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
@@ -51,7 +45,8 @@ class hr_recruitment_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
-        'date': fields.date('Date', readonly=True),
+        'date_create': fields.date('Create Date', readonly=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', readonly=True),
         'date_closed': fields.date('Closed', readonly=True),
         'job_id': fields.many2one('hr.job', 'Applied Job',readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
@@ -67,19 +62,19 @@ class hr_recruitment_report(osv.osv):
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
     }
-    _order = 'date desc'
+    
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'hr_recruitment_report')
         cr.execute("""
             create or replace view hr_recruitment_report as (
                  select
                      min(s.id) as id,
-                     date_trunc('day',s.create_date) as date,
+                     date_trunc('day',s.create_date) as date_create,
                      date_trunc('day',s.date_closed) as date_closed,
+                     date_trunc('day',s.date_last_stage_update) as date_last_stage_update,
                      to_char(s.create_date, 'YYYY') as year,
                      to_char(s.create_date, 'MM') as month,
                      to_char(s.create_date, 'YYYY-MM-DD') as day,
-                     s.state,
                      s.partner_id,
                      s.company_id,
                      s.user_id,
@@ -93,7 +88,7 @@ class hr_recruitment_report(osv.osv):
                      (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
                      (sum(salary_expected)/count(*)) as salary_exp_avg,
-                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
+                     extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as delay_close,
                      count(*) as nbr
                  from hr_applicant s
                  group by
@@ -105,7 +100,7 @@ class hr_recruitment_report(osv.osv):
                      s.date_open,
                      s.create_date,
                      s.date_closed,
-                     s.state,
+                     s.date_last_stage_update,
                      s.partner_id,
                      s.company_id,
                      s.user_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index b33b2eaa053..d75c29c17a2 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -6,7 +6,7 @@
         <field name="model">hr.recruitment.report</field>
         <field name="arch" type="xml">
             <tree string="Recruitment Analysis" create="false">
-                <field name="date" invisible="1"/>
+                <field name="date_create" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="job_id"/>
                 <field name="stage_id" invisible="1" />
@@ -14,10 +14,10 @@
                 <field name="type_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="company_id" groups="base.group_multi_company" invisible="1"/>
-                <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
+                <field name="date_last_stage_update" invisible="1"/>
                 <field name="nbr" sum="# of Applications"/>
                 <field name="available" sum="Available"/>
                 <field name="salary_exp" sum="Expected Salary"/>
@@ -46,34 +46,33 @@
         <field name="model">hr.recruitment.report</field>
         <field name="arch" type="xml">
             <search string="Recruitment Analysis">
-                <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft recruitment"/>
-                <filter string="In progress" icon="terp-camera_test" domain="[('state', '=' ,'open')]" help = "In progress recruitment"/>
-                <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending recruitment"/>
-                <filter string="Hired" icon="terp-camera_test" domain="[('state','=','done')]" help = "Hired employees"/>
-                <separator/>
-                <filter icon="terp-personal" string="My Recruitment" help="My Recruitment" domain="[('user_id','=',uid)]"/>
                 <field name="job_id"/>
                 <field name="department_id"/>
-                <field name="user_id" string="Responsible"/>
+                <field name="user_id"/>
+                <filter string="New" domain="[('sequence', '=', 1)]"/>
+                <separator/>
+                <filter string="Unassigned" domain="[('user_id', '=', False)]"/>
+                <filter string="My" domain="[('user_id', '=', uid)]"/>
+                <separator/>
                 <group expand="0" string="Extended Filters...">
-                    <!--field name="job_id"/-->
                     <field name="priority"/>
                     <field name="stage_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="date" string="Creation Date"/>
+                    <field name="date_create"/>
                     <field name="date_closed"/>
                 </group>
                 <group expand="1" string="Group By ...">
-                   <filter string="Responsible" name='User' icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                   <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
-                   <filter string="Jobs" name="job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                   <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                   <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-                   <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                   <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
-                   <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
-                   <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
+                   <filter string="Responsible" name='User' context="{'group_by':'user_id'}"/>
+                   <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                   <filter string="Partner" context="{'group_by':'partner_id'}" />
+                   <filter string="Jobs" name="job" context="{'group_by':'job_id'}"/>
+                   <filter string="Department" name="department" context="{'group_by':'department_id'}"/>
+                   <filter string="Degree" name="degree" context="{'group_by':'type_id'}"/>
+                   <filter string="Stage" context="{'group_by':'stage_id'}" />
+                   <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" />
+                   <filter string="Day" name="day" context="{'group_by':'day'}" help="Creation Date"/>
+                   <filter string="Month" context="{'group_by':'month'}" help="Creation Date"/>
+                   <filter string="Year" context="{'group_by':'year'}" help="Creation Date"/>
                 </group>
             </search>
         </field>
diff --git a/addons/hr_recruitment/static/src/img/icon.png b/addons/hr_recruitment/static/description/icon.png
similarity index 100%
rename from addons/hr_recruitment/static/src/img/icon.png
rename to addons/hr_recruitment/static/description/icon.png
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 335edc71892..a48b70a5683 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -17,33 +17,8 @@
     resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.pdf'),('res_model','=',self._name),('res_id','=',applicant.id)])
     assert applicant.name == "Application for the post of Jr.application Programmer.", "Applicant name does not match."
     assert applicant.stage_id.id == ref('hr_recruitment.stage_job1'), "Stage should be 'Initial qualification' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "draft", "Applicant state should be 'draft'."
+    assert applicant.stage_id.sequence == 1, "Applicant stage sequence should be 1."
     assert len(resume_ids), "Resume is not attached."
--
-  I refuse the applicant (hr_case_programmer)
--
-  !python {model: hr.applicant}: |
-    self.case_cancel(cr, uid, [ref("hr_case_programmer")])
--
-  I check the details of the refused applicant.
--
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job6'), "Stage should be 'Refused' and is %s." % (applicant.stage_id.name)
-    assert applicant.state == 'cancel', "Applicant is not in 'cancel' state."
--
-  I reset and re-open the previously refused applicant.
--
-  !python {model: hr.applicant}: |
-    self.case_reset(cr, uid, [ref("hr_case_programmer")])
-    self.case_open(cr, uid, [ref("hr_case_programmer")])
--
-  I check the details of the re-opened applicant.
--
-  !python {model: hr.applicant}: |
-    applicant = self.browse(cr, uid, ref("hr_case_programmer"), context=context)
-    assert applicant.stage_id.id == ref('hr_recruitment.stage_job2'), "Stage should be 'First interview' and is '%s'." % (applicant.stage_id.name)
-    assert applicant.state == "open", "Applicant state should be 'open'."
 -
   I assign the Job position to the applicant
 -
@@ -54,21 +29,6 @@
 -
   !python {model: hr.applicant}: |
      self.action_makeMeeting(cr, uid, [ref('hr_case_programmer')])
--
-  I check Initial Qualification of applicant.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
--
-  I schedule First Interview of applicant.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
--
-  On a successful First Interview of applicant, I schedule Second Interview.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
 -
   Applicant fillup the answer of the interview quetion.
 -
@@ -83,40 +43,8 @@
   I print Applicant fill up the interview quetion
 -
   !python {model: hr.applicant}: |
-    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
--
-  On a successful Second Interview of applicant Contract is Proposed to applicant.
--
-  !python {model: hr.applicant}: |
-     self.stage_next(cr, uid, [ref('hr_case_programmer')])
-     self.stage_previous(cr, uid, [ref('hr_case_programmer')])
--
-  I Hired Applicant.
--
-  !python {model: hr.applicant}: |
-     self.case_close_with_emp(cr, uid, [ref('hr_case_programmer')])
--
-  I check that applicant is "Hired".
--
-  !assert {model: hr.applicant, id: hr_case_programmer, string: Applicant state is done}:
-    - state == 'done'
--
-  I do not give employment to the hired the applicant.
--
-  !python {model: hired.employee}: |
     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
-    emp_id = self.create(cr, uid, {}, context=context)
-    self.case_close(cr, uid, [emp_id], context=context)
--
-  Now I give employment to hired applicant .
--
-  !python {model: hr.applicant}: |
-     hired_emp_obj = self.pool.get('hired.employee')
-     self.case_reset(cr, uid, [ref("hr_case_programmer")])
-     self.case_open(cr, uid, [ref("hr_case_programmer")])
-     context.update({'active_model': 'hr.applicant', 'active_ids': [ref("hr_recruitment.hr_case_programmer")], 'active_id': ref("hr_recruitment.hr_case_programmer")})
-     emp_hr_id = hired_emp_obj.create(cr, uid, {}, context=context)
-     hired_emp_obj.case_close_with_emp(cr, uid, [emp_hr_id], context=context)
+    self.action_print_survey(cr, uid, [ref('hr_case_programmer')])
 -
   Now hired employee want to be a partner of company.
 -
diff --git a/addons/hr_recruitment/wizard/__init__.py b/addons/hr_recruitment/wizard/__init__.py
index fde7df63456..d52c7a9113a 100644
--- a/addons/hr_recruitment/wizard/__init__.py
+++ b/addons/hr_recruitment/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-Today OpenERP (<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
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-
 import hr_recruitment_create_partner_job
-import hr_recruitment_employee_hired
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
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 b0d4aebe09a..d2e778c38a4 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -66,8 +66,6 @@ class hr_recruitment_partner_create(osv.osv_memory):
             case_obj.write(cr, uid, [case.id], {
                 'partner_id': partner_id,
             }, context=context)
-        if data['close']:
-            case_obj.case_close(cr, uid, context['active_ids'])
 
         return {
             'domain': "[]",
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
deleted file mode 100644
index 60d31e74eee..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 fields, osv
-from openerp.tools.translate import _
-
-class hired_employee(osv.osv_memory):
-    _name = 'hired.employee'
-    _description = 'Create Employee'
-
-    def case_close(self, cr, uid, ids, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        @param *args: Give Tuple Value
-        """
-        if context is None:
-            context = {}
-        self.pool.get('hr.applicant').case_close(cr, uid,context.get('active_ids',[]))
-        return {}
-
-    def case_close_with_emp(self, cr, uid, ids, context=None):
-        """
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of case's Ids
-        """
-        if context is None:
-            context = {}
-        return self.pool.get('hr.applicant').case_close_with_emp(cr, uid,context.get('active_ids', []))
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
deleted file mode 100644
index d014bd54aa8..00000000000
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_hr_recruitment_hired_employee" model="ir.ui.view">
-            <field name="name">hr.recruitment.hired2employee.form</field>
-            <field name="model">hired.employee</field>
-            <field name="arch" type="xml">
-                <form string="Create New Employee" version="7.0">
-                    <header>
-                        <button name="case_close_with_emp" string="Yes" type="object" class="oe_highlight" />
-                        <button name="case_close" string="No" type="object"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <label string="Would you like to create an employee ?"/>
-                </form>
-            </field>
-        </record>
-        <record id="action_hr_recruitment_hired_employee" model="ir.actions.act_window">
-            <field name="name">Create Employee</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hired.employee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index f49ad05f7a9..5baf8ec262b 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -29,7 +29,7 @@ class hr_employee(osv.osv):
     _name = "hr.employee"
     _inherit = "hr.employee"
     _columns = {
-        'product_id': fields.many2one('product.product', 'Product', help="Specifies employee's designation as a product with type 'service'."),
+        'product_id': fields.many2one('product.product', 'Product', help="If you want to reinvoice working time of employees, link this employee to a service to determinate the cost price of the job."),
         'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
         'uom_id': fields.related('product_id', 'uom_id', type='many2one', relation='product.uom', string='Unit of Measure', store=True, readonly=True)
     }
diff --git a/addons/hr_timesheet/i18n/th.po b/addons/hr_timesheet/i18n/th.po
new file mode 100644
index 00000000000..146c1df4146
--- /dev/null
+++ b/addons/hr_timesheet/i18n/th.po
@@ -0,0 +1,669 @@
+# 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-06-17 06:13+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-06-18 05:46+0000\n"
+"X-Generator: Launchpad (build 16673)\n"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
+msgid ""
+"<p>\n"
+"                No activity yet on this contract.\n"
+"              </p><p>\n"
+"                In OpenERP, contracts and projects are implemented using\n"
+"                analytic account. So, you can track costs and revenues to "
+"analyse\n"
+"                your margins easily.\n"
+"              </p><p>\n"
+"                Costs will be created automatically when you register "
+"supplier\n"
+"                invoices, expenses or timesheets.\n"
+"              </p><p>\n"
+"                Revenues will be created automatically when you create "
+"customer\n"
+"                invoices. Customer invoices can be created based on sale "
+"orders\n"
+"                (fixed price invoices), on timesheets (based on the work "
+"done) or\n"
+"                on expenses (e.g. reinvoicing of travel costs).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:44
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Wed"
+msgstr "พุธ"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
+msgid ""
+"Employees can encode their time spent on the different projects. A project "
+"is an analytic account and the time spent on a project generate costs on the "
+"analytic account. This feature allows to record at the same time the "
+"attendance and the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.employee,uom_id:0
+msgid "Unit of Measure"
+msgstr "หน่วยของการวัด"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr "หยุดทำงาน"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr "เวลาทำงาน พนักงาน"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_reports
+msgid "Timesheet"
+msgstr "เวลาทำงาน"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
+#, python-format
+msgid "Please define employee for this user!"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:44
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Mon"
+msgstr "จัน"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "ลงชื่อเข้าใช้"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:44
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Fri"
+msgstr "ศุกร์"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+msgid "Timesheet Activities"
+msgstr "กิจกรรม เวลาทำงาน"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr "รายเดือน เวลาทำงานพนักงาน"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr "งานที่ทำทั้งหมดในระยะเวลาสุดท้าย"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "ชื่อพนักงาน"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Project / Analytic Account"
+msgstr "โครงการ /วิเคราะห์ บัญชี"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr "พิมพ์ เวลาทำงาน พนักงาน"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "Please define employee for your user."
+msgstr "กรุณากำหนดพนักงานสำหรับผู้ใช้ของคุณ"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.act_analytic_cost_revenue
+msgid "Costs & Revenues"
+msgstr "ค่าใช้จ่ายและรายได้"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:44
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Tue"
+msgstr "อังคาร"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "วิเคราะห์บัญชี"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Costs and Revenues"
+msgstr "ค่าใช้จ่ายและรายได้"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:150
+#: code:addons/hr_timesheet/hr_timesheet.py:155
+#: code:addons/hr_timesheet/hr_timesheet.py:186
+#: code:addons/hr_timesheet/hr_timesheet.py:188
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
+#, python-format
+msgid "Warning!"
+msgstr "คำเตือน!"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner"
+msgstr "พาร์ทเนอร์"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:44
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sat"
+msgstr "เสาร์"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:44
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sun"
+msgstr "อาทิตย์"
+
+#. module: hr_timesheet
+#: xsl:hr.analytical.timesheet:0
+msgid "Sum"
+msgstr "ผลรวม"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Analytic account"
+msgstr "วิเคราะห์บัญชี"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to record activities.\n"
+"              </p><p>\n"
+"                You can register and track your workings hours by project "
+"every\n"
+"                day. Every time spent on a project will become a cost in "
+"the\n"
+"                analytic accounting/contract and can be re-invoiced to\n"
+"                customers if required.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "พิมพ์"
+
+#. module: hr_timesheet
+#: help:account.analytic.account,use_timesheets:0
+msgid "Check this field if this project manages timesheets"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "July"
+msgstr "กรกฎาคม"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "วันที่เริ่ม"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#, python-format
+msgid "Please define cost unit for this employee."
+msgstr ""
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:188
+#, python-format
+msgid ""
+"No analytic account is defined on the project.\n"
+"Please set one or we cannot automatically fill the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr "รวมค่าใช้จ่าย"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:186
+#, python-format
+msgid ""
+"No 'Analytic Journal' is defined for employee %s \n"
+"Define an employee for the selected user and assign an 'Analytic Journal'!"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "September"
+msgstr "กันยายน"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "December"
+msgstr "ธันวาคม"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr "พนักงาน"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "เดือน"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr "รายละเอียดการทำงาน"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "or"
+msgstr "หรือ"
+
+#. module: hr_timesheet
+#: xsl:hr.analytical.timesheet:0
+msgid "Timesheet by Employee"
+msgstr "บันทึกเวลา โดยพนักงาน"
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr "บันทึกเวลาของพนักงาน"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+msgid "Sign in / Sign out by project"
+msgstr "เข้าสู่ระบบ / ออกจากระบบ โดยโครงการ"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
+msgid "Define your Analytic Structure"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
+#: view:hr.sign.in.project:0
+#, python-format
+msgid "Sign in / Sign out"
+msgstr "เข้าสู่ระบบ / ออกจากระบบ"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:account.analytic.account,use_timesheets:0
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr "ตารางเวลา"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
+msgid ""
+"You should create an analytic account structure depending on your needs to "
+"analyse costs and revenues. In OpenERP, analytic accounts are also used to "
+"track customer contracts."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic Line"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "August"
+msgstr "สิงหาคม"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:155
+#, python-format
+msgid ""
+"No analytic journal defined for '%s'.\n"
+"You should assign an analytic journal on the employee form."
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "June"
+msgstr "มิถุนายน"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current Status"
+msgstr "สถานะปัจจุบัน"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "วันที่"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "November"
+msgstr "พฤศจิกายน"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr "ปิดวันที่"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "October"
+msgstr "ตุลาคม"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "January"
+msgstr "มกราคม"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:44
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Thu"
+msgstr "พฤหัสบดี"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out by Project"
+msgstr "ลงซื่อ เข้า/ออก ตามโครงการ"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "หมายเลข พนักงาน"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Period"
+msgstr "คาบ"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "ข้อมูลทั่วไป"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: hr_timesheet
+#: xsl:hr.analytical.timesheet_users:0
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr "เวลาทำงาน พนักงาน"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "รายละเอียด"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "พนักงาน"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid ""
+"Employees can encode their time spent on the different projects they are "
+"assigned on. A  project is an analytic account and the time spent on a "
+"project generates costs on the analytic account. This feature allows to "
+"record at the same time the attendance and the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "วันที่ปัจจุบัน"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "ผลิตภัณฑ์"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "ผู้ใช้"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "May"
+msgstr "พฤษภาคม"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "เวลารวม"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr "เข้าสู่ระบบตามโครงการ"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "February"
+msgstr "กุมภาพันธ์"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr "ลงชื่อออก ตามโครงการ"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:150
+#, python-format
+msgid ""
+"Please create an employee for this user, using the menu: Human Resources > "
+"Employees."
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "พนักงาน"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "March"
+msgstr "มีนาคม"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:41
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "April"
+msgstr "เมษายน"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr "เริ่มทำงาน"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "ปี"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Duration"
+msgstr "ระยะเวลา"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr "บัญชี"
+
+#. module: hr_timesheet
+#: xsl:hr.analytical.timesheet:0
+#: xsl:hr.analytical.timesheet_users:0
+msgid "Total"
+msgstr "รวม"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr "เปลี่ยนงาน"
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index 59d688f183b..2a2101ff186 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -35,7 +35,7 @@
     new_id = self.create(cr, uid, {'account_id': ref('account.analytic_nebula'),'analytic_amount': 7.0,
     'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S') ,
     'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module',
-    'name': 'Quentin Paolino', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'action'})
+    'name': 'Quentin Paolino', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'present'})
     self.sign_out_result(cr, uid, [new_id], context)
 -
   My work for this project "Sednacom" is over and I stop working by clicking on "Stop Work" button of this wizard.
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 9079735aaae..3603809990b 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -11,7 +11,7 @@
                     <group colspan="4">
                         <field name="month"/>
                         <field name="year"/>
-                        <field name="employee_id" colspan="3"/>
+                        <field name="employee_id" />
                     </group>
                     <footer>
                         <button string="Print" name="print_report" type="object" class="oe_highlight"/>
@@ -33,7 +33,7 @@
 
         <menuitem action="action_hr_timesheet_employee"
             id="menu_hr_timesheet_employee"
-            parent="hr.menu_hr_reporting"
+            parent="hr.menu_hr_reporting_timesheet"
             sequence="2" icon="STOCK_PRINT"/>
 
     </data>
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 d0cbdc78c31..87425b9cb3f 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -32,8 +32,8 @@ class hr_so_project(osv.osv_memory):
         'date_start': fields.datetime('Starting Date', readonly=True),
         'date': fields.datetime('Closing Date'),
         'analytic_amount': fields.float('Minimum Analytic Amount'),
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
+        'name': fields.char('Employee\'s Name', size=32, required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
@@ -109,8 +109,8 @@ class hr_si_project(osv.osv_memory):
     _name = 'hr.sign.in.project'
     _description = 'Sign In By Project'
     _columns = {
-        'name': fields.char('Employees name', size=32,  readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
+        'name': fields.char('Employee\'s Name', size=32,  readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='selection', selection=[('present', 'Present'), ('absent', 'Absent')], required=True, readonly=True),
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index ea8d37ad454..c91b794b1f1 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -43,7 +43,7 @@
         </record>
 
         <record id="action_hr_timesheet_sign_in" model="ir.actions.act_window">
-            <field name="name">Sign in / Sign out by project</field>
+            <field name="name">Sign in / Sign out by Project</field>
             <field name="res_model">hr.sign.in.project</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -67,7 +67,7 @@
                         <field name="account_id" colspan="2"/>
                         <field name="info" colspan="2"/>
                         <field name="date"/>
-                        <label string="(Keep empty for current_time)" colspan="2"/>
+                        <label string="(Keep empty for current time)" colspan="2"/>
                         <field name="analytic_amount"/>
                     </group>
 
@@ -82,7 +82,7 @@
         </record>
 
         <record id="action_hr_timesheet_sign_out" model="ir.actions.act_window">
-            <field name="name">Sign in / Sign out by project</field>
+            <field name="name">Sign in / Sign out by Project</field>
             <field name="res_model">hr.sign.out.project</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index f8c27bded5e..ecfe9a1ead3 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -173,6 +173,8 @@ class account_analytic_line(osv.osv):
             data = {}
 
         journal_types = {}
+
+        # prepare for iteration on journal and accounts
         for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
             if line.journal_id.type not in journal_types:
                 journal_types[line.journal_id.type] = set()
@@ -181,7 +183,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
@@ -204,7 +206,6 @@ class account_analytic_line(osv.osv):
                     'date_due': date_due,
                     'fiscal_position': account.partner_id.property_account_position.id
                 }
-
                 context2 = context.copy()
                 context2['lang'] = partner.lang
                 # set company_id in context, so the correct default journal will be selected
@@ -215,47 +216,56 @@ class account_analytic_line(osv.osv):
                 last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
                 invoices.append(last_invoice)
 
-                cr.execute("""SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id
+                cr.execute("""SELECT product_id, user_id, to_invoice, sum(amount), sum(unit_amount), product_uom_id
                         FROM account_analytic_line as line LEFT JOIN account_analytic_journal journal ON (line.journal_id = journal.id)
                         WHERE account_id = %s
                             AND line.id IN %s AND journal.type = %s AND to_invoice IS NOT NULL
                         GROUP BY product_id, user_id, to_invoice, product_uom_id""", (account.id, tuple(ids), journal_type))
 
-                for product_id, user_id, factor_id, qty, uom in cr.fetchall():
+                for product_id, user_id, factor_id, total_price, qty, uom in cr.fetchall():
+                    context2.update({'uom': uom})
+
                     if data.get('product'):
+                        # force product, use its public price
                         product_id = data['product'][0]
-                    product = product_obj.browse(cr, uid, product_id, context=context2)
-                    if not product:
-                        raise osv.except_osv(_('Error!'), _('There is no product defined. Please select one or force the product through the wizard.'))
+                        unit_price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, context2)
+                    elif journal_type == 'general' and product_id:
+                        # timesheets, use sale price
+                        unit_price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, context2)
+                    else:
+                        # expenses, using price from amount field
+                        unit_price = total_price*-1.0 / qty
+
                     factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
-                    factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
-                    if factor.customer_name:
-                        factor_name += ' - ' + factor.customer_name
-
-                    ctx =  context.copy()
-                    ctx.update({'uom':uom})
-
-                    price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
-
-                    general_account = product.property_account_income or product.categ_id.property_account_income_categ
-                    if not general_account:
-                        raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
-                    taxes = product.taxes_id or general_account.tax_ids
-                    tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                    # factor_name = factor.customer_name and line_name + ' - ' + factor.customer_name or line_name
+                    factor_name = factor.customer_name
                     curr_line = {
-                        'price_unit': price,
+                        'price_unit': unit_price,
                         'quantity': qty,
-                        'discount':factor.factor,
-                        'invoice_line_tax_id': [(6,0,tax )],
+                        'product_id': product_id or False,
+                        'discount': factor.factor,
                         'invoice_id': last_invoice,
                         'name': factor_name,
-                        'product_id': product_id,
-                        'invoice_line_tax_id': [(6,0,tax)],
                         'uos_id': uom,
-                        'account_id': general_account.id,
                         'account_analytic_id': account.id,
                     }
+                    product = product_obj.browse(cr, uid, product_id, context=context2)
+                    if product:
+                        factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
+                        if factor.customer_name:
+                            factor_name += ' - ' + factor.customer_name
 
+                        general_account = product.property_account_income or product.categ_id.property_account_income_categ
+                        if not general_account:
+                            raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
+                        taxes = product.taxes_id or general_account.tax_ids
+                        tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                        curr_line.update({
+                            'invoice_line_tax_id': [(6,0,tax )],
+                            'name': factor_name,
+                            'invoice_line_tax_id': [(6,0,tax)],
+                            'account_id': general_account.id,
+                        })
                     #
                     # Compute for lines
                     #
@@ -276,7 +286,6 @@ class account_analytic_line(osv.osv):
                         if data.get('name', False):
                             details.append(line['name'])
                         note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
-
                     if note:
                         curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
                     invoice_line_obj.create(cr, uid, curr_line, context=context)
diff --git a/addons/hr_timesheet_sheet/i18n/th.po b/addons/hr_timesheet_sheet/i18n/th.po
new file mode 100644
index 00000000000..374870990b1
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/th.po
@@ -0,0 +1,1151 @@
+# 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-06-17 06:47+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-06-18 05:46+0000\n"
+"X-Generator: Launchpad (build 16673)\n"
+
+#. module: hr_timesheet_sheet
+#: field:hr.analytic.timesheet,sheet_id:0
+#: field:hr.attendance,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.account,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.day,sheet_id:0
+msgid "Sheet"
+msgstr "แผ่นงาน"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "บริการ"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+#: field:timesheet.report,quantity:0
+msgid "Time"
+msgstr "เวลา"
+
+#. module: hr_timesheet_sheet
+#: help:hr.config.settings,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet\n"
+"                computation for one sheet. Set this to 0 if you do not want "
+"any control."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_attendance:0
+msgid "Total Attendance"
+msgstr "รวม การทำงาน"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr "แผนก"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign an "
+"analytic journal to the employee, like 'Timesheet Journal'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "March"
+msgstr "มีนาคม"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr "#ต้นทุน"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,message_unread:0
+msgid "Unread Messages"
+msgstr "ข้อความที่ไม่ได้อ่าน"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr "บริษัท"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
+#: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
+#: view:timesheet.report:0
+msgid "Timesheet"
+msgstr "เวลาทำงาน"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "กำหนดให้เป็นแบบร่าง"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Timesheet Period"
+msgstr "ระยะเวลาทำงาน"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0
+#: field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr "ถึงวันที่"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "to"
+msgstr "ถึง"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:327
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Group by day of date"
+msgstr "กลุ่มโดย วัน ของวันที่"
+
+#. module: hr_timesheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+msgid "My Current Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "ตรวจสอบ"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Approved"
+msgstr "อนุมัติแล้ว"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "นำเสนอ"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr "ค่าใช้จ่ายทั้งหมด"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
+msgid "Refuse"
+msgstr "ปฏิเสธ"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Activities"
+msgstr "กิจกรรม เวลาทำงาน"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Please create an employee and associate it with this user."
+msgstr "โปรดสร้างพนักงานและเชื่อมโยงกับผู้ใช้นี้"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:402
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:422
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205
+#, python-format
+msgid "Week "
+msgstr "สัปดาห์ "
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,message_ids:0
+msgid "Messages"
+msgstr "ข้อความ"
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' status is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' status is used for to confirm the timesheet by user.       "
+"          \n"
+"* The 'Done' status is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:69
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:327
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:398
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:429
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error!"
+msgstr "ผิดพลาด!"
+
+#. module: hr_timesheet_sheet
+#: field:hr.config.settings,timesheet_max_difference:0
+msgid ""
+"Allow a difference of time between timesheets and attendances of (in hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,name:0
+msgid "Project / Analytic Account"
+msgstr "โครงการ / วิเคราะห์ บัญชี"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr "การรับรอง ความถูกต้อง"
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:69
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign it to a "
+"user."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
+#, python-format
+msgid "Invalid Action!"
+msgstr "การกระทำไม่ถูกต้อง!"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr "วิเคราะห์บัญชี"
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,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: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr "#Nbr"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr "จากวันที่"
+
+#. module: hr_timesheet_sheet
+#: view:hr.employee:0
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "เวลาทำงาน"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr "ยืนยันแล้ว"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr "เวลาเข้าออกงาน"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr "ยืนยัน"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,message_follower_ids:0
+msgid "Followers"
+msgstr "ติดตาม"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr "สถานะคือ 'ยืนยัน'"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr "พนักงาน"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr "สร้างใหม่"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr "เวลารวม"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+msgid "Timesheets to Validate"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Hours"
+msgstr "ชั่วโมง"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Group by month of date"
+msgstr "กลุ่ม โดย วันที่ของเดือน"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "July"
+msgstr "กรกฎาคม"
+
+#. module: hr_timesheet_sheet
+#: field:hr.config.settings,timesheet_range:0
+msgid "Validate timesheets every"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86
+#, python-format
+msgid "Configuration Error!"
+msgstr "การตั้งค่าผิดพลาด"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0
+#: view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "Status"
+msgstr "สถานะ"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Waiting Approval"
+msgstr "กำลังรอการอนุมัติ"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+msgid "#Quantity"
+msgstr "#ปริมาณ"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: view:hr_timesheet_sheet.sheet.day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "รวมเวลาทำงาน"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr "เข้าสู่ระบบ"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr "hr.timesheet.current.open"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product, like 'Consultant'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "September"
+msgstr "กันยายน"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "December"
+msgstr "ธันวาคม"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.config.settings,timesheet_range:0
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr "เดือน"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr "ลงชื่อ เข้า/ออก"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#. openerp-web
+#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:58
+#, python-format
+msgid ""
+"You will be able to register your working hours and\n"
+"                        activities."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "or"
+msgstr "หรือ"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,name:0
+msgid "Note"
+msgstr "บันทึกย่อ"
+
+#. module: hr_timesheet_sheet
+#. openerp-web
+#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:33
+#, python-format
+msgid "Add"
+msgstr "เพิ่ม"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Draft"
+msgstr "ฉบับร่าง"
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr "แบบร่าง บันทึกเวลา"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                New timesheet to approve.\n"
+"              </p><p>\n"
+"                You must record timesheets every day and confirm at the end\n"
+"                of the week. Once the timesheet is confirmed, it should be\n"
+"                validated by a manager.\n"
+"              </p><p>\n"
+"                Timesheets can also be invoiced to customers, depending on "
+"the\n"
+"                configuration of each project's related contract.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "August"
+msgstr "สิงหาคม"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Differences"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "June"
+msgstr "มิถุนายน"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr "สถานะปัจจุบัน"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.config.settings,timesheet_range:0
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr "สัปดาห์"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,message_is_follower:0
+msgid "Is a Follower"
+msgstr "เป็นผู้ติดตาม"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr "ผู้ใช้งาน"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0
+#: field:hr_timesheet_sheet.sheet.day,name:0
+#: field:timesheet.report,date:0
+msgid "Date"
+msgstr "วันที่"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "November"
+msgstr "พฤศจิกายน"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "October"
+msgstr "ตุลาคม"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:60
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain an equal number of "
+"sign ins and sign outs."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "January"
+msgstr "มกราคม"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr "พนักงาน ลงชื่อเข้า และออก"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr "บริษัท"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,message_summary:0
+msgid "Summary"
+msgstr "สรุป"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
+#, python-format
+msgid "You cannot delete a timesheet which have attendance entries."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Unvalidated Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
+#, python-format
+msgid ""
+"You cannot have 2 timesheets that overlap!\n"
+"You should use the menu 'My Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Submit to Manager"
+msgstr "ส่งไปยังผู้จัดการ"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr "บัญชีทั่วไป"
+
+#. module: hr_timesheet_sheet
+#: help:hr.config.settings,timesheet_range:0
+#: help:res.company,timesheet_range:0
+msgid "Periodicity on which you validate your timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Search Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:429
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,period_ids:0
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Period"
+msgstr "ระยะเวลา"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.config.settings,timesheet_range:0
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0
+#: view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr "วัน"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid ""
+"You cannot have 2 timesheets that overlap!\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+msgid "My Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: selection:timesheet.report,state:0
+msgid "Done"
+msgstr "เสร็จสมบูรณ์"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr "สถานะคือ 'แบบร่าง'"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr "ผ่านการตรวจสอบแล้ว"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:50
+#, python-format
+msgid "Open Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: view:timesheet.report:0
+msgid "Group by year of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#. openerp-web
+#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:56
+#, python-format
+msgid "Click to add projects, contracts or analytic accounts."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr "hr.config.settings"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Confirmed Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Details"
+msgstr "รายละเอียด"
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213
+#, python-format
+msgid "You cannot delete a timesheet which is already confirmed."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0
+#: field:timesheet.report,product_id:0
+msgid "Product"
+msgstr "ผลิตภัณฑ์"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,attendances_ids:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0
+#: field:timesheet.report,name:0
+msgid "Description"
+msgstr "รายละเอียด"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "May"
+msgstr "พฤษภาคม"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr "ออกจากระบบ"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Attendances"
+msgstr "รวมเวลาทำงาน"
+
+#. module: hr_timesheet_sheet
+#. openerp-web
+#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:39
+#, python-format
+msgid "Add a Line"
+msgstr "เพิ่มบรรทัด"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_difference:0
+#: field:hr_timesheet_sheet.sheet.day,total_difference:0
+msgid "Difference"
+msgstr "ความแตกต่าง"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
+#, python-format
+msgid "You cannot duplicate a timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr "ขาด"
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "February"
+msgstr "กุมภาพันธ์"
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"<p>\n"
+"                This report performs analysis on timesheets created by your\n"
+"                human resources in the system. It allows you to have a full\n"
+"                overview of  entries done by your employees. You can group "
+"them\n"
+"                by specific selection criteria thanks to the search tool.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr "พนักงาน"
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0
+#: selection:timesheet.report,month:0
+msgid "April"
+msgstr "เมษายน"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr "ยืนยัน"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99
+#, python-format
+msgid "Warning!"
+msgstr "คำเตือน!"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:402
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:422
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Difference"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr "อนุมัติ"
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,message_ids:0
+msgid "Messages and communication history"
+msgstr "ข้อความและประวัติการสื่อสาร"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+#: field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr "ต้นทุน"
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr "วันที่ปัจจุบัน"
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr "บันทึกเวลา Hr"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: field:hr.timesheet.report,year:0
+#: view:timesheet.report:0
+#: field:timesheet.report,year:0
+msgid "Year"
+msgstr "ปี"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Open"
+msgstr "เปิด"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr "ให้การอนุมัติ"
+
+#. module: hr_timesheet_sheet
+#. openerp-web
+#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:15
+#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:40
+#: view:hr_timesheet_sheet.sheet.account:0
+#, python-format
+msgid "Total"
+msgstr "รวม"
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Day"
+msgstr ""
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index aee07fc23b6..ddc66260cf0 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -16,7 +16,7 @@
             <field name="name">timesheet.report.tree</field>
             <field name="model">timesheet.report</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet">
+                <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet" create="false">
                     <field name="date" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="user_id" invisible="1"/>
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 8b9414d9b9d..3feb9cf1a92 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -3,7 +3,7 @@ access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_time
 access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0
 access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1
 access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1
-access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,1,1
+access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,0,0
 access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0
 access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0
-access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,1,1
+access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,0,0
diff --git a/addons/hr_timesheet_sheet/static/src/img/icon.png b/addons/hr_timesheet_sheet/static/description/icon.png
similarity index 100%
rename from addons/hr_timesheet_sheet/static/src/img/icon.png
rename to addons/hr_timesheet_sheet/static/description/icon.png
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index e7d13c425b6..461d8c73803 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -190,8 +190,13 @@ openerp.hr_timesheet_sheet = function(instance) {
                                 $(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();
+                                var product = (account.days[day_count].lines[0].product_id instanceof Array) ? account.days[day_count].lines[0].product_id[0] : account.days[day_count].lines[0].product_id
+                                var journal = (account.days[day_count].lines[0].journal_id instanceof Array) ? account.days[day_count].lines[0].journal_id[0] : account.days[day_count].lines[0].journal_id
+                                new instance.web.Model("hr.analytic.timesheet").call("on_change_unit_amount", [[], product, account.days[day_count].lines[0].unit_amount, false, false, journal]).then(function(res) {
+                                    account.days[day_count].lines[0]['amount'] = res.value.amount || 0;
+                                    self.display_totals();
+                                    self.sync();
+                                });
                                 if(!isNaN($(this).val())){
                                     $(this).val(self.sum_box(account, day_count, true));
                                 }
@@ -308,10 +313,10 @@ openerp.hr_timesheet_sheet = function(instance) {
         generate_o2m_value: function() {
             var self = this;
             var ops = [];
-
+            
             _.each(self.accounts, function(account) {
                 var auth_keys = _.extend(_.clone(account.account_defaults), {
-                    name: true, unit_amount: true, date: true, account_id:true,
+                    name: true, amount:true, unit_amount: true, date: true, account_id:true,
                 });
                 _.each(account.days, function(day) {
                     _.each(day.lines, function(line) {
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 77f722ecdc2..67e32c30fc4 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -61,12 +61,13 @@
   !python {model: hr_timesheet_sheet.sheet}: |
     uid = ref('base.user_root')
     from openerp import netsvc
+    from openerp.osv import osv
     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:
+        assert False, "The validation of the timesheet was unexpectedly accepted despite the 2:30 hours of difference"
+    except osv.except_osv:
         pass
 -
   I Modified the timesheet record and make the difference less than 1 hour.
diff --git a/addons/idea/__init__.py b/addons/idea/__init__.py
index e6f7333e055..2b8966f9e7a 100644
--- a/addons/idea/__init__.py
+++ b/addons/idea/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -19,5 +19,4 @@
 #
 ##############################################################################
 
-import idea
-
+import models
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 8f32e1e91c4..7d8560a2cf4 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    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
@@ -22,29 +22,39 @@
 
 {
     'name': 'Ideas',
-    'version': '0.1',
+    'summary': 'Share and Discuss your Ideas',
+    'version': '1.0',
     'category': 'Tools',
     'description': """
-This module allows user to easily and efficiently participate in enterprise innovation.
-=======================================================================================
+Share your ideas and participate in enterprise innovation
+=========================================================
 
-It allows everybody to express ideas about different subjects.
-Then, other users can comment on these ideas and vote for particular ideas.
-Each idea has a score based on the different votes.
+The Ideas module give users a way to express and discuss ideas, allowing everybody
+to participate in enterprise innovation. Every user can suggest, comment ideas.
 The managers can obtain an easy view of best ideas from all the users.
 Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
     'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
+    'website': 'http://www.openerp.com',
     'depends': ['mail'],
     'data': [
-        'security/idea_security.xml',
+        'security/idea.xml',
         'security/ir.model.access.csv',
-        'idea_view.xml',
-        'idea_workflow.xml',
+        'views/idea.xml',
+        'views/category.xml',
+        'data/idea.xml',
+        'data/idea_workflow.xml',
+    ],
+    'demo': [
+        'demo/idea.xml',
     ],
-    'demo': ['idea_data.xml'],
-    'test':[],
     'installable': True,
+    'application': True,
     'images': [],
+    'css': [
+        'static/src/css/idea_idea.css',
+    ],
+    'js': [],
+    'qweb': [],
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/data/idea.xml b/addons/idea/data/idea.xml
new file mode 100644
index 00000000000..c057868d6de
--- /dev/null
+++ b/addons/idea/data/idea.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/idea/data/idea_workflow.xml b/addons/idea/data/idea_workflow.xml
new file mode 100644
index 00000000000..b460c73a6ed
--- /dev/null
+++ b/addons/idea/data/idea_workflow.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="workflow" id="wkf_idea">
+            <field name="name">idea.wkf</field>
+            <field name="osv">idea.idea</field>
+            <field name="on_create">True</field>
+        </record>
+
+        <record model="workflow.activity" id="act_normal">
+            <field name="wkf_id" ref="wkf_idea" />
+            <field name="flow_start">True</field>
+            <field name="name">normal</field>
+            <field name="kind">function</field>
+            <field name="action">idea_set_normal_priority()</field>
+        </record>
+
+        <record model="workflow.activity" id="act_low">
+            <field name="wkf_id" ref="wkf_idea" />
+            <field name="name">low</field>
+            <field name="kind">function</field>
+            <field name="action">idea_set_low_priority()</field>
+        </record>
+
+        <record model="workflow.activity" id="act_high">
+            <field name="wkf_id" ref="wkf_idea" />
+            <field name="name">high</field>
+            <field name="kind">function</field>
+            <field name="action">idea_set_high_priority()</field>
+        </record>
+
+        <record model="workflow.transition" id="t1">
+            <field name="act_from" ref="act_normal" />
+            <field name="act_to" ref="act_low" />
+            <field name="signal">idea_set_low_priority</field>
+        </record>
+
+        <record model="workflow.transition" id="t2">
+            <field name="act_from" ref="act_low" />
+            <field name="act_to" ref="act_normal" />
+            <field name="signal">idea_set_normal_priority</field>
+        </record>
+
+        <record model="workflow.transition" id="t3">
+            <field name="act_from" ref="act_normal" />
+            <field name="act_to" ref="act_high" />
+            <field name="signal">idea_set_high_priority</field>
+        </record>
+
+        <record model="workflow.transition" id="t4">
+            <field name="act_from" ref="act_high" />
+            <field name="act_to" ref="act_normal" />
+            <field name="signal">idea_set_normal_priority</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/idea/demo/idea.xml b/addons/idea/demo/idea.xml
new file mode 100644
index 00000000000..2b4ff58b973
--- /dev/null
+++ b/addons/idea/demo/idea.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="idea.category" id="idea_cat_0">
+            <field name="name">Sales</field>
+        </record>
+        <record model="idea.category" id="idea_cat_1">
+            <field name="name">Organization</field>
+        </record>
+        <record model="idea.category" id="idea_cat_2">
+            <field name="name">Technical</field>
+        </record>
+
+        <record model="idea.idea" id="idea_idea_0">
+            <field name="name">Docking station along with tablet PC</field>
+            <field name="description">When you sell a tablet PC, maybe we could propose a docking station with it. I offer 20% on the docking stating (not the tablet).</field>
+            <field name="user_id" eval="ref('base.user_demo')"/>
+            <field name="category_ids" eval="[(6, 0, [ref('idea.idea_cat_0')])]"/>
+        </record>
+
+        <record model="idea.idea" id="idea_idea_1">
+            <field name="name">Communicate using emails</field>
+            <field name="description">I start communicating with prospects more by email than phonecalls. I send an email to create a sense of emergency, like "can I call you this week about our quote?" and I call only those that answer this email.</field>
+            <field name="user_id" eval="ref('base.user_demo')"/>
+            <field name="state">open</field>
+            <field name="category_ids" eval="[(6, 0, [ref('idea.idea_cat_0'), ref('idea.idea_cat_1')])]"/>
+        </record>
+        <workflow action="idea_set_high_priority" model="idea.idea" ref="idea_idea_1"/>
+
+        <record model="idea.idea" id="idea_idea_2">
+            <field name="name">Use a two-stages testing phase</field>
+            <field name="description">We should perform testing using two levels of validation.</field>
+            <field name="user_id" eval="ref('base.user_root')"/>
+            <field name="state">open</field>
+            <field name="category_ids" eval="[(6, 0, [ref('idea.idea_cat_1'), ref('idea.idea_cat_2')])]"/>
+        </record>
+        <workflow action="idea_set_high_priority" model="idea.idea" ref="idea_idea_2"/>
+
+        <record model="idea.idea" id="idea_idea_3">
+            <field name="name">Write some functional documentation about procurements</field>
+            <field name="description">We receive many questions about OpenChatter. Maybe some functional doc could save us some time.</field>
+            <field name="user_id" eval="ref('base.user_demo')"/>
+            <field name="state">open</field>
+            <field name="category_ids" eval="[(6, 0, [ref('idea.idea_cat_0'), ref('idea.idea_cat_1')])]"/>
+        </record>
+
+        <record model="idea.idea" id="idea_idea_4">
+            <field name="name">Better management of smtp errors</field>
+            <field name="description">There should be away to store the reason why some emails are not sent.</field>
+            <field name="user_id" eval="ref('base.user_root')"/>
+            <field name="state">close</field>
+            <field name="category_ids" eval="[(6, 0, [ref('idea.idea_cat_2')])]"/>
+        </record>
+        <workflow action="idea_set_low_priority" model="idea.idea" ref="idea_idea_4"/>
+
+        <record model="idea.idea" id="idea_idea_5">
+            <field name="name">Kitten mode enabled by default</field>
+            <field name="description">As this is the most loved feature, the kitten mode should be enabled by default. And maybe even impossible to remove.</field>
+            <field name="user_id" eval="ref('base.user_root')"/>
+            <field name="state">cancel</field>
+            <field name="category_ids" eval="[(6, 0, [ref('idea.idea_cat_2')])]"/>
+        </record>
+        <workflow action="idea_set_low_priority" model="idea.idea" ref="idea_idea_4"/>
+
+    </data>
+</openerp>
+
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
deleted file mode 100644
index d1e250ce9a5..00000000000
--- a/addons/idea/idea.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from openerp.osv import osv
-from openerp.osv import fields
-from openerp.tools.translate import _
-import time
-
-VoteValues = [('-1', 'Not Voted'), ('0', 'Very Bad'), ('25', 'Bad'), \
-              ('50', 'Normal'), ('75', 'Good'), ('100', 'Very Good') ]
-DefaultVoteValue = '50'
-
-class idea_category(osv.osv):
-    """ Category of Idea """
-    _name = "idea.category"
-    _description = "Idea Category"
-    _columns = {
-        'name': fields.char('Category Name', size=64, required=True),
-    }
-    _sql_constraints = [
-        ('name', 'unique(name)', 'The name of the category must be unique')
-    ]
-    _order = 'name asc'
-
-
-class idea_idea(osv.osv):
-    """ Idea """
-    _name = 'idea.idea'
-    _inherit = ['mail.thread']
-    _columns = {
-        'create_uid': fields.many2one('res.users', 'Creator', required=True, readonly=True),
-        'name': fields.char('Idea Summary', size=64, required=True, readonly=True, oldname='title', states={'draft': [('readonly', False)]}),
-        'description': fields.text('Description', help='Content of the idea', readonly=True, states={'draft': [('readonly', False)]}),
-        'category_ids': fields.many2many('idea.category', string='Tags', readonly=True, states={'draft': [('readonly', False)]}),
-        'state': fields.selection([('draft', 'New'),
-            ('open', 'Accepted'),
-            ('cancel', 'Refused'),
-            ('close', 'Done')],
-            'Status', readonly=True, track_visibility='onchange',
-        )
-    }
-    _sql_constraints = [
-        ('name', 'unique(name)', 'The name of the idea must be unique')
-    ]
-    _defaults = {
-        'state': lambda *a: 'draft',
-    }
-    _order = 'name asc'
-
-    def idea_cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
-
-    def idea_open(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
-
-    def idea_close(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state': 'close'}, context=context)
-
-    def idea_draft(self, cr, uid, ids, context={}):
-        return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
diff --git a/addons/idea/idea_data.xml b/addons/idea/idea_data.xml
deleted file mode 100644
index 421cb6a9eef..00000000000
--- a/addons/idea/idea_data.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <record model="idea.category" id="idea_category_sales">
-            <field name="name">Sales</field>
-        </record>
-        <record model="idea.category" id="idea_category_general">
-            <field name="name">Organization</field>
-        </record>
-        <record model="idea.category" id="idea_category_technical">
-            <field name="name">Technical</field>
-        </record>
-
-        <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/>
-        </record>
-
-    </data>
-</openerp>
-
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
deleted file mode 100644
index 53734d53919..00000000000
--- a/addons/idea/idea_view.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- Top menu item -->
-        <menuitem name="Tools" id="base.menu_tools" sequence="120" groups="base.group_tool_user"/>
-    <!-- Idea Categories Search View-->
-    <record model="ir.ui.view" id="view_idea_category_search">
-        <field name="name">idea.category.search</field>
-        <field name="model">idea.category</field>
-        <field name="arch" type="xml">
-            <search string="Ideas Categories">
-                <field name="name" string="Category"/>
-            </search>
-        </field>
-    </record>
-
-    <!-- Idea Category Form View -->
-        <record model="ir.ui.view" id="view_idea_category_form">
-            <field name="name">idea.category.form</field>
-            <field name="model">idea.category</field>
-            <field name="arch" type="xml">
-                <form string="Category of Ideas" version="7.0">
-                    <group>
-                        <field name="name"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <!-- Idea Category Tree View -->
-        <record model="ir.ui.view" id="view_idea_category_tree">
-            <field name="name">idea.category.tree</field>
-            <field name="model">idea.category</field>
-            <field name="field_parent"></field>
-            <field name="arch" type="xml">
-                <tree string="Category of ideas">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Idea Category Action -->
-
-    <record model="ir.actions.act_window" id="action_idea_category">
-        <field name="name">Categories</field>
-        <field name="res_model">idea.category</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_idea_category_search"/>
-    </record>
-
-    <menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" sequence="20" />
-
-    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas" sequence="3"/>
-
-    <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category" />
-
-
-<!-- New Idea Form View -->
-
-    <record model="ir.ui.view" id="view_idea_idea_form">
-        <field name="name">idea.idea.form</field>
-        <field name="model">idea.idea</field>
-        <field name="arch" type="xml">
-            <form string="Idea" version="7.0">
-                <header>
-                    <button name="idea_open" string="Open" states="draft" class="oe_highlight"/>
-                    <button name="idea_close" string="Accept" states="open" class="oe_highlight"/>
-                    <button name="idea_cancel" string="Refuse" states="open"  class="oe_highlight"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
-                </header>
-                <sheet>
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <label for="category_ids" class="oe_edit_only"/>
-                    <field name="category_ids" widget="many2many_tags"/>
-                    <label for="description"/><newline/>
-                    <field name="description"/>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
-
-    <!-- New Idea Tree View -->
-
-    <record model="ir.ui.view" id="view_idea_idea_tree">
-        <field name="name">idea.idea.tree</field>
-        <field name="model">idea.idea</field>
-        <field name="arch" type="xml">
-        <tree colors="blue:state == 'draft';black:state in ('open','close');gray:state == 'cancel'" string="Ideas">
-            <field name="name"/>
-            <field name="create_uid"/>
-            <field name="state"/>
-        </tree>
-        </field>
-    </record>
-
-    <!-- Search Idea  -->
-
-    <record model="ir.ui.view" id="view_idea_idea_search">
-        <field name="name">idea.idea.search</field>
-        <field name="model">idea.idea</field>
-        <field name="arch" type="xml">
-            <search string="Ideas">
-                <field name="name" string="Idea"/>
-                <filter icon="terp-document-new" string="New" domain="[('state','=', 'draft')]" help="New Ideas"/>
-                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=', 'open')]" help="Open Ideas"/>
-                <filter icon="terp-check" string="Accepted" domain="[('state','=','close')]" help="Accepted Ideas" />
-                <field name="category_ids"/>
-                <group expand="0" string="Group By...">
-                    <filter icon="terp-personal" string="Creator" help="By Creators" context="{'group_by':'create_uid'}"/>
-                    <filter icon="terp-stock_symbol-selection" string="Category" help="By Idea Category" context="{'group_by':'category_ids'}"/>
-                    <filter icon="terp-stock_effects-object-colorize" string="Status" help="By States" context="{'group_by':'state'}"/>
-                </group>
-            </search>
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_idea_idea">
-        <field name="name">Ideas</field>
-        <field name="res_model">idea.idea</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_idea_idea_search"/>
-    </record>
-
-    <menuitem name="Ideas" parent="menu_ideas" id="menu_idea_idea" action="action_idea_idea" sequence="1"/>
-
-    </data>
-</openerp>
diff --git a/addons/idea/idea_workflow.xml b/addons/idea/idea_workflow.xml
deleted file mode 100644
index 649541ae349..00000000000
--- a/addons/idea/idea_workflow.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="workflow" id="wkf_idea">
-            <field name="name">idea.wkf</field>
-            <field name="osv">idea.idea</field>
-            <field name="on_create">True</field>
-        </record>
-
-        <record model="workflow.activity" id="act_draft">
-            <field name="wkf_id" ref="wkf_idea" />
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-            <field name="kind">function</field>
-            <field name="action">idea_draft()</field>
-        </record>
-
-        <record model="workflow.activity" id="act_open">
-            <field name="wkf_id" ref="wkf_idea" />
-            <field name="name">open</field>
-            <field name="kind">function</field>
-            <field name="action">idea_open()</field>
-        </record>
-
-        <record model="workflow.activity" id="act_close">
-            <field name="wkf_id" ref="wkf_idea" />
-            <field name="name">close</field>
-            <field name="kind">function</field>
-            <field name="action">idea_close()</field>
-            <field name="flow_stop">True</field>
-        </record>
-
-        <record model="workflow.activity" id="act_cancel">
-            <field name="wkf_id" ref="wkf_idea" />
-            <field name="name">cancel</field>
-            <field name="kind">function</field>
-            <field name="action">idea_cancel()</field>
-            <field name="flow_stop">True</field>
-        </record>
-
-        <record model="workflow.transition" id="t1">
-            <field name="act_from" ref="act_draft" />
-            <field name="act_to" ref="act_open" />
-            <field name="signal">idea_open</field>
-        </record>
-
-        <record model="workflow.transition" id="t2">
-            <field name="act_from" ref="act_open" />
-            <field name="act_to" ref="act_close" />
-            <field name="signal">idea_close</field>
-        </record>
-
-        <record model="workflow.transition" id="t4">
-            <field name="act_from" ref="act_open" />
-            <field name="act_to" ref="act_cancel" />
-            <field name="signal">idea_cancel</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/idea/models/__init__.py b/addons/idea/models/__init__.py
new file mode 100644
index 00000000000..e8a48771771
--- /dev/null
+++ b/addons/idea/models/__init__.py
@@ -0,0 +1,22 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import idea
diff --git a/addons/idea/models/idea.py b/addons/idea/models/idea.py
new file mode 100644
index 00000000000..61934cfc3b2
--- /dev/null
+++ b/addons/idea/models/idea.py
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    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
+#    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
+from openerp.osv import fields
+
+
+class IdeaCategory(osv.Model):
+    """ Category of Idea """
+    _name = "idea.category"
+    _description = "Idea Category"
+
+    _order = 'name asc'
+
+    _columns = {
+        'name': fields.char('Category Name', size=64, required=True),
+    }
+
+    _sql_constraints = [
+        ('name', 'unique(name)', 'The name of the category must be unique')
+    ]
+
+
+class IdeaIdea(osv.Model):
+    """ Model of an Idea """
+    _name = 'idea.idea'
+    _description = 'Propose and Share your Ideas'
+
+    _rec_name = 'name'
+    _order = 'name asc'
+
+    def _get_state_list(self, cr, uid, context=None):
+        return [('draft', 'New'),
+                    ('open', 'In discussion'),
+                    ('close', 'Accepted'),
+                    ('cancel', 'Refused')]
+
+    def _get_color(self, cr, uid, ids, fields, args, context=None):
+        res = dict.fromkeys(ids, 3)
+        for idea in self.browse(cr, uid, ids, context=context):
+            if idea.priority == 'low':
+                res[idea.id] = 0
+            elif idea.priority == 'high':
+                res[idea.id] = 7
+        return res
+
+    _columns = {
+        'user_id': fields.many2one('res.users', 'Responsible', required=True),
+        'name': fields.char('Summary', required=True, readonly=True,
+            states={'draft': [('readonly', False)]},
+            oldname='title'),
+        'description': fields.text('Description', required=True,
+            states={'draft': [('readonly', False)]},
+            help='Content of the idea'),
+        'category_ids': fields.many2many('idea.category', string='Tags'),
+        'state': fields.selection(_get_state_list, string='Status', required=True),
+        'priority': fields.selection([('low', 'Low'), ('normal', 'Normal'), ('high', 'High')],
+            string='Priority', required=True),
+        'color': fields.function(_get_color, type='integer', string='Color Index'),
+    }
+
+    _sql_constraints = [
+        ('name', 'unique(name)', 'The name of the idea must be unique')
+    ]
+
+    _defaults = {
+        'user_id': lambda self, cr, uid, ctx=None: uid,
+        'state': lambda self, cr, uid, ctx=None: self._get_state_list(cr, uid, ctx)[0][0],
+        'priority': 'normal',
+    }
+
+    #------------------------------------------------------
+    # Technical stuff
+    #------------------------------------------------------
+
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
+        """ Override read_group to always display all states. """
+        if groupby and groupby[0] == "state":
+            # Default result structure
+            states = self._get_state_list(cr, uid, context=context)
+            read_group_all_states = [{
+                        '__context': {'group_by': groupby[1:]},
+                        '__domain': domain + [('state', '=', state_value)],
+                        'state': state_value,
+                        'state_count': 0,
+                    } for state_value, state_name in states]
+            # Get standard results
+            read_group_res = super(IdeaIdea, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
+            # Update standard results with default results
+            result = []
+            for state_value, state_name in states:
+                res = filter(lambda x: x['state'] == state_value, read_group_res)
+                if not res:
+                    res = filter(lambda x: x['state'] == state_value, read_group_all_states)
+                res[0]['state'] = [state_value, state_name]
+                result.append(res[0])
+            return result
+        else:
+            return super(IdeaIdea, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby)
+
+    #------------------------------------------------------
+    # Workflow / Actions
+    #------------------------------------------------------
+
+    def idea_set_low_priority(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'priority': 'low'}, context=context)
+
+    def idea_set_normal_priority(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'priority': 'normal'}, context=context)
+
+    def idea_set_high_priority(self, cr, uid, ids, context={}):
+        return self.write(cr, uid, ids, {'priority': 'high'}, context=context)
diff --git a/addons/idea/security/idea.xml b/addons/idea/security/idea.xml
new file mode 100644
index 00000000000..e7a0d800187
--- /dev/null
+++ b/addons/idea/security/idea.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    </data>
+</openerp>
+
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
deleted file mode 100644
index 8743252c9e5..00000000000
--- a/addons/idea/security/idea_security.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-    <record model="res.groups" id="base.group_tool_user">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_tools"/>
-    </record>
-
-</data>
-</openerp>
-
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 78b8deeaf57..761ada8132c 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_idea_category_user,idea.category user,model_idea_category,base.group_tool_user,1,1,1,1
-access_idea_idea_user,idea.idea user,model_idea_idea,base.group_tool_user,1,1,1,1
+access_idea_category_user,idea.category.user,model_idea_category,base.group_user,1,1,1,1
+access_idea_idea_user,idea.idea.user,model_idea_idea,base.group_user,1,1,1,1
diff --git a/addons/idea/static/description/icon.png b/addons/idea/static/description/icon.png
new file mode 100644
index 00000000000..1f0cba223bb
Binary files /dev/null and b/addons/idea/static/description/icon.png differ
diff --git a/addons/idea/static/src/css/idea_idea.css b/addons/idea/static/src/css/idea_idea.css
new file mode 100644
index 00000000000..08daffd902a
--- /dev/null
+++ b/addons/idea/static/src/css/idea_idea.css
@@ -0,0 +1,21 @@
+.openerp .oe_kanban_view .oe_kanban_idea_idea {
+    width: 200px;
+}
+
+.openerp .oe_kanban_view .oe_kanban_idea_idea .oe_avatars {
+    text-align: right;
+    margin: -5px 0 -10px 0;
+}
+
+.openerp .oe_kanban_view .oe_kanban_idea_idea .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);
+}
diff --git a/addons/google_base_account/wizard/__init__.py b/addons/idea/tests/__init__.py
similarity index 82%
rename from addons/google_base_account/wizard/__init__.py
rename to addons/idea/tests/__init__.py
index a6b9c644a1e..a53567a380b 100644
--- a/addons/google_base_account/wizard/__init__.py
+++ b/addons/idea/tests/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    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
@@ -15,11 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import google_login
+from openerp.addons.idea.tests import test_idea
+
+checks = [
+    test_idea,
+]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/idea/tests/test_idea.py b/addons/idea/tests/test_idea.py
new file mode 100644
index 00000000000..4ca9bb9dcb9
--- /dev/null
+++ b/addons/idea/tests/test_idea.py
@@ -0,0 +1,39 @@
+# -*- 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.tests import common
+
+
+class TestIdeaBase(common.TransactionCase):
+
+    def setUp(self):
+        super(TestIdeaBase, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.idea_category = self.registry('idea.category')
+        self.idea_idea = self.registry('idea.idea')
+
+    def tearDown(self):
+        super(TestIdeaBase, self).tearDown()
+
+    def test_OO(self):
+        pass
diff --git a/addons/idea/views/category.xml b/addons/idea/views/category.xml
new file mode 100644
index 00000000000..79725fad73f
--- /dev/null
+++ b/addons/idea/views/category.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- VIEWS DEFINITION
+                -->
+
+        <record model="ir.ui.view" id="view_idea_category_search">
+            <field name="name">idea.category.search</field>
+            <field name="model">idea.category</field>
+            <field name="arch" type="xml">
+                <search string="Ideas Categories">
+                    <field name="name" string="Category"/>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_idea_category_form">
+            <field name="name">idea.category.form</field>
+            <field name="model">idea.category</field>
+            <field name="arch" type="xml">
+                <form string="Category of Ideas" version="7.0">
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_idea_category_tree">
+            <field name="name">idea.category.tree</field>
+            <field name="model">idea.category</field>
+            <field name="field_parent"></field>
+            <field name="arch" type="xml">
+                <tree string="Category of ideas">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_idea_category">
+            <field name="name">Categories</field>
+            <field name="res_model">idea.category</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_idea_category_search"/>
+        </record>
+
+        <!-- MENUS
+                -->
+
+        <menuitem name="Idea Tags" parent="mail.mail_my_stuff"
+                id="menu_idea_category" action="action_idea_category" sequence="31"/>
+
+    </data>
+</openerp>
diff --git a/addons/idea/views/idea.xml b/addons/idea/views/idea.xml
new file mode 100644
index 00000000000..7df21f99f11
--- /dev/null
+++ b/addons/idea/views/idea.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_idea_idea_kanban">
+            <field name="name">idea.idea.kanban</field>
+            <field name="model">idea.idea</field>
+            <field name="arch" type="xml">
+                <kanban version="7.0" default_group_by="state" class="oe_background_grey">
+                    <field name="color"/>
+                    <field name="user_id"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_card oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_idea_idea oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban"
+                                        groups="base.group_user">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <t t-if="widget.view.is_action_enabled('delete')">
+                                            <li><a type="delete">Delete</a></li>
+                                        </t>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <h4><field name="name"/></h4>
+                                    <div class="oe_kanban_bottom_right">
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar" t-if="record.user_id.value"/>
+                                    </div>
+                                    <field name="category_ids"/>
+                                </div>
+                                <div class="oe_clear"></div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_idea_idea_form">
+            <field name="name">idea.idea.form</field>
+            <field name="model">idea.idea</field>
+            <field name="arch" type="xml">
+                <form string="Idea" version="7.0">
+                    <header>
+                        <button name="idea_set_low_priority" string="Set Low Priority" class="oe_highlight"
+                                attrs="{'invisible': [('priority', '!=', 'normal')]}"/>
+                        <button name="idea_set_normal_priority" string="Set Normal Priority" class="oe_highlight"
+                                attrs="{'invisible': [('priority', 'not in', ['low', 'high'])]}"/>
+                        <button name="idea_set_high_priority" string="Set High Priority" class="oe_highlight"
+                                attrs="{'invisible': [('priority', '!=', 'normal')]}"/>
+                        <field name="state" widget="statusbar" clickable="True"/>
+                    </header>
+                    <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name"/></h1>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="priority" readonly="True"/>
+                            <field name="category_ids" widget="many2many_tags"/>
+                            <field name="description"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_idea_idea_tree">
+            <field name="name">idea.idea.tree</field>
+            <field name="model">idea.idea</field>
+            <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state in ('open', 'close'); gray:state == 'cancel'" string="Ideas">
+                <field name="name"/>
+                <field name="user_id"/>
+                <field name="priority"/>
+                <field name="state"/>
+            </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_idea_idea_search">
+            <field name="name">idea.idea.search</field>
+            <field name="model">idea.idea</field>
+            <field name="arch" type="xml">
+                <search string="Ideas">
+                    <field name="name"/>
+                    <field name="user_id"/>
+                    <field name="category_ids"/>
+                    <filter string="New" domain="[('state', '=', 'draft')]"
+                            help="New Ideas"/>
+                    <filter string="In Progress" domain="[('state','=', 'open')]"
+                            help="Open Ideas"/>
+                    <filter string="Accepted" domain="[('state','=', 'close')]"
+                            help="Accepted Ideas" />
+                    <group expand="0" string="Group By...">
+                        <filter string="Creator" help="By Responsible" context="{'group_by': 'user_id'}"/>
+                        <filter string="Status" help="By State" context="{'group_by': 'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_idea_idea">
+            <field name="name">Ideas</field>
+            <field name="res_model">idea.idea</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="search_view_id" ref="view_idea_idea_search"/>
+        </record>
+
+        <!-- MENUS
+                -->
+
+        <menuitem name="Ideas" parent="mail.mail_my_stuff"
+                id="menu_idea_idea" action="action_idea_idea" sequence="30"/>
+
+    </data>
+</openerp>
diff --git a/addons/im/Gruntfile.js b/addons/im/Gruntfile.js
new file mode 100644
index 00000000000..e8c88bbec9a
--- /dev/null
+++ b/addons/im/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function(grunt) {
+
+    grunt.initConfig({
+        jshint: {
+            src: ['static/src/js/*.js'],
+            options: {
+                sub: true, //[] instead of .
+                evil: true, //eval
+                laxbreak: true, //unsafe line breaks
+            },
+        },
+    });
+
+    grunt.loadNpmTasks('grunt-contrib-jshint');
+
+    grunt.registerTask('test', []);
+
+    grunt.registerTask('default', ['jshint']);
+
+};
\ No newline at end of file
diff --git a/addons/im/__openerp__.py b/addons/im/__openerp__.py
index a76dd7c8cc2..84775065371 100644
--- a/addons/im/__openerp__.py
+++ b/addons/im/__openerp__.py
@@ -17,8 +17,11 @@ chat in real time. It support several chats in parallel.
         'security/ir.model.access.csv',
         'security/im_security.xml',
     ],
-    'depends' : ['base'],
-    'js': ['static/src/js/*.js'],
+    'depends' : ['base', 'web'],
+    'js': [
+        'static/src/js/im_common.js',
+        'static/src/js/im.js',
+    ],
     'css': ['static/src/css/*.css'],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/im/im.py b/addons/im/im.py
index cee1705ec35..97860d33e0a 100644
--- a/addons/im/im.py
+++ b/addons/im/im.py
@@ -22,6 +22,8 @@
 import openerp
 import openerp.tools.config
 import openerp.modules.registry
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 import datetime
 from openerp.osv import osv, fields
@@ -90,41 +92,45 @@ POLL_TIMER = 30
 DISCONNECTION_TIMER = POLL_TIMER + 5
 WATCHER_ERROR_DELAY = 10
 
-class LongPollingController(openerp.addons.web.http.Controller):
-    _cp_path = '/longpolling/im'
+class LongPollingController(http.Controller):
 
-    @openerp.addons.web.http.jsonrequest
-    def poll(self, req, last=None, users_watch=None, db=None, uid=None, password=None, uuid=None):
+    @http.route('/longpolling/im/poll', type="json", auth="none")
+    def poll(self, 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"]
+            openerp.service.security.check(db, uid, password)
+        else:
+            uid = request.session.uid
+            db = request.session.db
+
+        registry = openerp.modules.registry.RegistryManager.get(db)
+        with registry.cursor() as cr:
+            registry.get('im.user').im_connect(cr, uid, uuid=uuid, context=request.context)
+            my_id = registry.get('im.user').get_by_user_id(cr, uid, uuid or uid, request.context)["id"]
         num = 0
         while True:
-            res = req.session.model('im.message').get_messages(last, users_watch, uuid=uuid, context=req.context)
+            with registry.cursor() as cr:
+                res = registry.get('im.message').get_messages(cr, uid, last, users_watch, uuid=uuid, context=request.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):
+    @http.route('/longpolling/im/activated', type="json", auth="none")
+    def activated(self):
         return not not openerp.evented
 
-    @openerp.addons.web.http.jsonrequest
-    def gen_uuid(self, req):
+    @http.route('/longpolling/im/gen_uuid', type="json", auth="none")
+    def gen_uuid(self):
         import uuid
         return "%s" % uuid.uuid1()
 
 def assert_uuid(uuid):
-    if not isinstance(uuid, (str, unicode, type(None))):
+    if not isinstance(uuid, (str, unicode, type(None))) and uuid != False:
         raise Exception("%s is not a uuid" % uuid)
 
 
diff --git a/addons/im/package.json b/addons/im/package.json
new file mode 100644
index 00000000000..3ce6500a077
--- /dev/null
+++ b/addons/im/package.json
@@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "grunt": "*",
+    "grunt-contrib-jshint": "*"
+  }
+}
diff --git a/addons/im/static/src/img/icon.png b/addons/im/static/description/icon.png
similarity index 100%
rename from addons/im/static/src/img/icon.png
rename to addons/im/static/description/icon.png
diff --git a/addons/im/static/src/css/im.css b/addons/im/static/src/css/im.css
index 269d411d416..03a20bb0510 100644
--- a/addons/im/static/src/css/im.css
+++ b/addons/im/static/src/css/im.css
@@ -105,160 +105,3 @@
     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_livechat/static/ext/static/css/livesupport.css b/addons/im/static/src/css/im_common.css
similarity index 99%
rename from addons/im_livechat/static/ext/static/css/livesupport.css
rename to addons/im/static/src/css/im_common.css
index bfe26b5e838..f3877af1686 100644
--- a/addons/im_livechat/static/ext/static/css/livesupport.css
+++ b/addons/im/static/src/css/im_common.css
@@ -36,7 +36,7 @@
 .oe_im_chatview {
     position: fixed;
     overflow: hidden;
-    bottom: 42px;
+    margin-bottom: 5px;
     margin-right: 6px;
     background: rgba(60, 60, 60, 0.8);
     -moz-border-radius: 3px;
diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js
index a271c9eccf0..9af04bf4f43 100644
--- a/addons/im/static/src/js/im.js
+++ b/addons/im/static/src/js/im.js
@@ -1,17 +1,25 @@
 
-openerp.im = function(instance) {
+(function() {
+    "use strict";
+
+    var instance = openerp;
+
+    openerp.im = {};
 
     var USERS_LIMIT = 20;
-    var ERROR_DELAY = 5000;
 
-    var _t = instance.web._t,
-       _lt = instance.web._lt;
+    var _t = instance.web._t;
     var QWeb = instance.web.qweb;
 
     instance.web.UserMenu.include({
         do_update: function(){
             var self = this;
             this.update_promise.then(function() {
+                im_common.notification = function(message) {
+                    instance.client.do_warn(message);
+                };
+                im_common.connection = openerp.session;
+
                 var im = new instance.im.InstantMessaging(self);
                 im.appendTo(instance.client.$el);
                 var button = new instance.im.ImTopButton(this);
@@ -45,7 +53,7 @@ openerp.im = function(instance) {
             this.set("right_offset", 0);
             this.set("current_search", "");
             this.users = [];
-            this.c_manager = new instance.im.ConversationManager(this);
+            this.c_manager = new im_common.ConversationManager(this);
             this.on("change:right_offset", this.c_manager, _.bind(function() {
                 this.c_manager.set("right_offset", this.get("right_offset"));
             }, this));
@@ -148,323 +156,4 @@ openerp.im = function(instance) {
         },
     });
 
-    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
+})();
\ No newline at end of file
diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js
new file mode 100644
index 00000000000..a6314a978e2
--- /dev/null
+++ b/addons/im/static/src/js/im_common.js
@@ -0,0 +1,408 @@
+
+/*
+    This file must compile in EcmaScript 3 and work in IE7.
+
+    Prerequisites to use this module:
+    - load the im_common.xml qweb template into openerp.qweb
+    - implement all the stuff defined later
+*/
+
+(function() {
+
+function declare($, _, openerp) {
+    /* jshint es3: true */
+    "use strict";
+
+    var im_common = {};
+
+    /*
+        All of this must be defined to use this module
+    */
+    _.extend(im_common, {
+        notification: function(message) {
+            throw new Error("Not implemented");
+        },
+        connection: null
+    });
+
+    var _t = openerp._t;
+
+    var ERROR_DELAY = 5000;
+
+    im_common.ImUser = openerp.Class.extend(openerp.PropertiesMixin, {
+        init: function(parent, user_rec) {
+            openerp.PropertiesMixin.init.call(this, parent);
+            user_rec.image_url = im_common.connection.url("/im/static/src/img/avatar/avatar.jpeg");
+
+            // TODO : check it works correctly
+            if (user_rec.user)
+                user_rec.image_url = im_common.connection.url('/web/binary/image', {model:'res.users', field: 'image_small', id: user_rec.user[0]});
+            /*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");
+            openerp.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);
+        }
+    });
+
+    im_common.ConversationManager = openerp.Class.extend(openerp.PropertiesMixin, {
+        init: function(parent, options) {
+            openerp.PropertiesMixin.init.call(this, parent);
+            this.options = _.clone(options) || {};
+            _.defaults(this.options, {
+                inputPlaceholder: _t("Say something..."),
+                defaultMessage: null,
+                userName: _t("Anonymous"),
+                anonymous_mode: false
+            });
+            this.set("right_offset", 0);
+            this.set("bottom_offset", 0);
+            this.conversations = [];
+            this.users = {};
+            this.on("change:right_offset", this, this.calc_positions);
+            this.on("change:bottom_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 auth_def = null;
+            var user_id = null;
+
+            if (this.options.anonymous_mode) {
+                var uuid = localStorage["oe_livesupport_uuid"];
+                var def = $.when(uuid);
+
+                if (! uuid) {
+                    def = im_common.connection.rpc("/longpolling/im/gen_uuid", {});
+                }
+                var anonymous_user_id = null;
+                auth_def = def.then(function(uuid) {
+                    localStorage["oe_livesupport_uuid"] = uuid;
+                    return im_common.connection.model("im.user").call("get_by_user_id", [uuid]);
+                }).then(function(my_id) {
+                    user_id = my_id["id"];
+                    return im_common.connection.model("im.user").call("assign_name", [uuid, self.options.userName]);
+                });
+            } else {
+                auth_def = im_common.connection.model("im.user").call("get_by_user_id",
+                        [im_common.connection.uid]).then(function(my_id) {
+                    user_id = my_id["id"];
+                });
+            }
+
+            return auth_def.then(function() {
+                self.my_id = user_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;
+                me.set("name", _t("You"));
+                return im_common.connection.rpc("/longpolling/im/activated", {}, {shadow: true});
+            }).then(function(activated) {
+                if (activated) {
+                    self.activated = true;
+                    $(window).on("unload", self.unload_event_handler);
+                    self.poll();
+                } else {
+                    return $.Deferred().reject();
+                }
+            }, function(a, e) {
+                e.preventDefault();
+            });
+        },
+        unload: function() {
+            return im_common.connection.model("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 im_common.connection.model("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 im_common.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");
+            });
+            im_common.connection.rpc("/longpolling/im/poll", {
+                last: this.last,
+                users_watch: user_ids,
+                uuid: self.me.get("uuid")
+            }, {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.deparam !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined;
+            this.ting = new Audio(im_common.connection.url(
+                "/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 (! openerp.webclient || !openerp.webclient.set_title_part)
+                return;
+            openerp.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 im_common.Conversation(this, user, this.me, this.options);
+                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("bottom_position", this.get("bottom_offset"));
+                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);
+            openerp.PropertiesMixin.destroy.call(this);
+        }
+    });
+
+    im_common.Conversation = openerp.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, options) {
+            this._super(parent);
+            this.options = options;
+            this.me = me;
+            this.user = user;
+            this.user.add_watcher();
+            this.set("right_position", 0);
+            this.set("bottom_position", 0);
+            this.shown = true;
+            this.set("pending", 0);
+            this.inputPlaceholder = this.options.defaultInputPlaceholder;
+        },
+        start: function() {
+            this.$().append(openerp.qweb.render("im_common.conversation", {widget: this, to_url: _.bind(im_common.connection.url, im_common.connection)}));
+            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.on("change:bottom_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"));
+            this.$().css("bottom", this.get("bottom_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, openerp.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 = im_common.connection.model("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) {
+                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;
+            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 = $(openerp.qweb.render("im_common.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();
+        }
+    });
+
+    return im_common;
+}
+
+if (typeof(define) !== "undefined") {
+    define(["jquery", "underscore", "openerp"], declare);
+} else {
+    window.im_common = declare($, _, openerp);
+}
+
+})();
diff --git a/addons/im/static/src/xml/im.xml b/addons/im/static/src/xml/im.xml
index 795d1b3e698..1acb538db4f 100644
--- a/addons/im/static/src/xml/im.xml
+++ b/addons/im/static/src/xml/im.xml
@@ -27,37 +27,4 @@
             <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/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml
new file mode 100644
index 00000000000..4286d0c9710
--- /dev/null
+++ b/addons/im/static/src/xml/im_common.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+<t t-name="im_common.conversation">
+    <div class="oe_im_chatview_header">
+        <img t-att-src="to_url('/im/static/src/img/green.png')" class="oe_im_chatview_online"/>
+        <t t-esc="widget.user.get('name')"/>
+        <scan class="oe_im_chatview_nbr_messages" />
+        <button class="oe_im_chatview_close">×</button>
+    </div>
+    <div class="oe_im_chatview_disconnected">
+        <t t-esc='widget.user.get("name") + _t(" 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" t-att-placeholder="widget.inputPlaceholder" />
+    </div>
+</t>
+
+<t t-name="im_common.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')"/></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_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py
index 1ffb422fe6a..b68a0079c3a 100644
--- a/addons/im_livechat/im_livechat.py
+++ b/addons/im_livechat/im_livechat.py
@@ -26,6 +26,8 @@ import random
 import jinja2
 from openerp.osv import osv, fields
 from openerp import tools
+import openerp.addons.web.http as http
+from openerp.addons.web.http import request
 
 env = jinja2.Environment(
     loader=jinja2.PackageLoader('openerp.addons.im_livechat', "."),
@@ -33,48 +35,47 @@ env = jinja2.Environment(
 )
 env.filters["json"] = json.dumps
 
-class LiveChatController(openerp.addons.web.http.Controller):
-    _cp_path = '/im_livechat'
+class LiveChatController(http.Controller):
 
-    @openerp.addons.web.http.httprequest
-    def loader(self, req, **kwargs):
+    def _auth(self, db):
+        reg = openerp.modules.registry.RegistryManager.get(db)
+        uid = openerp.netsvc.dispatch_rpc('common', 'authenticate', [db, "anonymous", "anonymous", None])
+        return reg, uid
+
+    @http.route('/im_livechat/loader', auth="none")
+    def loader(self, **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):
+        reg, uid = self._auth(db)
+        with reg.cursor() as cr:
+            info = reg.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel)
+            info["db"] = db
+            info["channel"] = channel
+            info["userName"] = user_name
+            return request.make_response(env.get_template("loader.js").render(info),
+                 headers=[('Content-Type', "text/javascript")])
+
+    @http.route('/im_livechat/web_page', auth="none")
+    def web_page(self, **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")])
+        reg, uid = self._auth(db)
+        with reg.cursor() as cr:
+            script = reg.get('im_livechat.channel').read(cr, uid, channel, ["script"])["script"]
+            info = reg.get('im_livechat.channel').get_info_for_chat_src(cr, uid, channel)
+            info["script"] = script
+            return request.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
+    @http.route('/im_livechat/available', type='json', auth="none")
+    def available(self, db, channel):
+        reg, uid = self._auth(db)
+        with reg.cursor() as cr:
+            return reg.get('im_livechat.channel').get_available_user(cr, uid, channel) > 0
 
 class im_livechat_channel(osv.osv):
     _name = 'im_livechat.channel'
diff --git a/addons/im_livechat/include.html b/addons/im_livechat/include.html
index 55de6212361..210bad6984c 100644
--- a/addons/im_livechat/include.html
+++ b/addons/im_livechat/include.html
@@ -1,2 +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/static/ext/static/lib/requirejs/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
index 669591b410f..d2580ab272a 100644
--- a/addons/im_livechat/loader.js
+++ b/addons/im_livechat/loader.js
@@ -1,19 +1,40 @@
 
+(function() {
+
+var tmpQWeb2 = window.QWeb2;
+
 require.config({
     context: "oelivesupport",
-    baseUrl: {{url | json}} + "/im_livechat/static/ext/static/js",
+    baseUrl: {{url | json}},
+    paths: {
+        jquery: "im_livechat/static/ext/static/lib/jquery/jquery",
+        underscore: "im_livechat/static/ext/static/lib/underscore/underscore",
+        qweb2: "im_livechat/static/ext/static/lib/qweb/qweb2",
+        openerp: "web/static/src/js/openerpframework",
+        "jquery.achtung": "im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung",
+        livesupport: "im_livechat/static/ext/static/js/livesupport",
+        im_common: "im/static/src/js/im_common"
+    },
     shim: {
         underscore: {
             init: function() {
                 return _.noConflict();
             },
         },
+        qweb2: {
+            init: function() {
+                var QWeb2 = window.QWeb2;
+                window.QWeb2 = tmpQWeb2;
+                return QWeb2;
+            },
+        },
         "jquery.achtung": {
             deps: ['jquery'],
         },
     },
 })(["livesupport", "jquery"], function(livesupport, jQuery) {
     jQuery.noConflict();
+    console.log("loaded live support");
     livesupport.main({{url | json}}, {{db | json}}, "anonymous", "anonymous", {{channel | json}}, {
         buttonText: {{buttonText | json}},
         inputPlaceholder: {{inputPlaceholder | json}},
@@ -22,3 +43,5 @@ require.config({
         userName: {{userName | json}} || undefined,
     });
 });
+
+})();
diff --git a/addons/im_livechat/static/src/img/icon.png b/addons/im_livechat/static/description/icon.png
similarity index 100%
rename from addons/im_livechat/static/src/img/icon.png
rename to addons/im_livechat/static/description/icon.png
diff --git a/addons/im_livechat/static/ext/.bowerrc b/addons/im_livechat/static/ext/.bowerrc
new file mode 100644
index 00000000000..187c8f0abc4
--- /dev/null
+++ b/addons/im_livechat/static/ext/.bowerrc
@@ -0,0 +1,3 @@
+{
+    "directory": "static/lib/"
+}
diff --git a/addons/im_livechat/static/ext/Gruntfile.js b/addons/im_livechat/static/ext/Gruntfile.js
new file mode 100644
index 00000000000..3d4a7f5aa50
--- /dev/null
+++ b/addons/im_livechat/static/ext/Gruntfile.js
@@ -0,0 +1,20 @@
+module.exports = function(grunt) {
+
+    grunt.initConfig({
+        jshint: {
+            src: ['static/js/*.js'],
+            options: {
+                sub: true, //[] instead of .
+                evil: true, //eval
+                laxbreak: true, //unsafe line breaks
+            },
+        },
+    });
+
+    grunt.loadNpmTasks('grunt-contrib-jshint');
+
+    grunt.registerTask('test', []);
+
+    grunt.registerTask('default', ['jshint']);
+
+};
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/bower.json b/addons/im_livechat/static/ext/bower.json
new file mode 100644
index 00000000000..f10d0de7b9c
--- /dev/null
+++ b/addons/im_livechat/static/ext/bower.json
@@ -0,0 +1,18 @@
+{
+  "name": "im_livechat",
+  "version": "0.0.0",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "1.8.3",
+    "underscore": "1.3.1",
+    "qweb": "git@github.com:OpenERP/qweb.git#~1.0.0",
+    "jquery-achtung": "git://github.com/joshvarner/jquery-achtung.git",
+    "requirejs": "~2.1.8"
+  }
+}
diff --git a/addons/im_livechat/static/ext/package.json b/addons/im_livechat/static/ext/package.json
new file mode 100644
index 00000000000..3ce6500a077
--- /dev/null
+++ b/addons/im_livechat/static/ext/package.json
@@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "grunt": "*",
+    "grunt-contrib-jshint": "*"
+  }
+}
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.mp3 b/addons/im_livechat/static/ext/static/audio/Ting.mp3
deleted file mode 100644
index ffbb77144b2..00000000000
Binary files a/addons/im_livechat/static/ext/static/audio/Ting.mp3 and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/audio/Ting.ogg b/addons/im_livechat/static/ext/static/audio/Ting.ogg
deleted file mode 100644
index 74ee13a4e5a..00000000000
Binary files a/addons/im_livechat/static/ext/static/audio/Ting.ogg and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg b/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg
deleted file mode 100644
index 7168794022e..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/avatar/avatar.jpeg and /dev/null 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
deleted file mode 100755
index 6f3957702fe..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/button-gloss.png and /dev/null 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
deleted file mode 100755
index 3bf6484a29d..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/glyphicons-halflings-white.png and /dev/null 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
deleted file mode 100755
index a9969993201..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/glyphicons-halflings.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/green.png b/addons/im_livechat/static/ext/static/img/green.png
deleted file mode 100644
index 01fb373c251..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/green.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/logo.png b/addons/im_livechat/static/ext/static/img/logo.png
deleted file mode 100644
index aca5f4c60d8..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/logo.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/img/wood.png b/addons/im_livechat/static/ext/static/img/wood.png
deleted file mode 100644
index 22f2450d3ad..00000000000
Binary files a/addons/im_livechat/static/ext/static/img/wood.png and /dev/null differ
diff --git a/addons/im_livechat/static/ext/static/js/jquery.achtung.js b/addons/im_livechat/static/ext/static/js/jquery.achtung.js
deleted file mode 100644
index 1aa69469c1d..00000000000
--- a/addons/im_livechat/static/ext/static/js/jquery.achtung.js
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- * 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
deleted file mode 100644
index ded03845983..00000000000
--- a/addons/im_livechat/static/ext/static/js/jquery.js
+++ /dev/null
@@ -1,9555 +0,0 @@
-/*!
- * 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/livechat.xml b/addons/im_livechat/static/ext/static/js/livechat.xml
new file mode 100644
index 00000000000..1c7b00466d9
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/js/livechat.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+<t t-name="chatButton">
+    <t t-esc="widget.text"/>
+</t>
+</templates>
\ 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
index c45e9588c83..fd5cecfe7d9 100644
--- a/addons/im_livechat/static/ext/static/js/livesupport.js
+++ b/addons/im_livechat/static/ext/static/js/livesupport.js
@@ -1,46 +1,48 @@
 
-define(["nova", "underscore", "oeclient", "require", "jquery",
-        "jquery.achtung"], function(nova, _, oeclient, require, $) {
+/*
+    This file must compile in EcmaScript 3 and work in IE7.
+*/
+
+define(["openerp", "im_common", "underscore", "require", "jquery",
+        "jquery.achtung"], function(openerp, im_common, _, require, $) {
+    /* jshint es3: true */
+    "use strict";
+
+    var _t = openerp._t;
+    
     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?",
+            buttonText: _t("Chat with one of our collaborators"),
+            inputPlaceholder: _t("How may I help you?"),
             defaultMessage: null,
             auto: false,
-            userName: "Anonymous",
+            userName: _t("Anonymous"),
+            anonymous_mode: true
         });
-        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) {
+        im_common.notification = notification;
+
+        console.log("starting live support customer app");
+        im_common.connection = new openerp.Session(null, server_url, { override_session: true });
+        return im_common.connection.session_authenticate(db, login, password).then(function() {
+            var defs = [];
+            defs.push(add_css("/im/static/src/css/im_common.css"));
+            defs.push(add_css("/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css"));
+            defs.push(im_common.connection.rpc('/web/proxy/load', {path: '/im_livechat/static/ext/static/js/livechat.xml'}).then(function(xml) {
+                openerp.qweb.add_template(xml);
+            }));
+            defs.push(im_common.connection.rpc('/web/proxy/load', {path: '/im/static/src/xml/im_common.xml'}).then(function(xml) {
+                openerp.qweb.add_template(xml);
+            }));
+            return $.when.apply($, defs);
+        }).then(function() {
+            return im_common.connection.rpc("/im_livechat/available", {db: db, channel: channel}).then(function(activated) {
                 if (! activated & ! options.auto)
                     return;
-                var button = new livesupport.ChatButton(null, channel, options);
+                var button = new im_common.ChatButton(null, channel, options);
                 button.appendTo($("body"));
                 if (options.auto)
                     button.click();
@@ -50,7 +52,7 @@ define(["nova", "underscore", "oeclient", "require", "jquery",
 
     var add_css = function(relative_file_name) {
         var css_def = $.Deferred();
-        $('<link rel="stylesheet" href="' + require.toUrl(relative_file_name) + '"></link>')
+        $('<link rel="stylesheet" href="' + im_common.connection.url(relative_file_name) + '"></link>')
                 .appendTo($("head")).ready(function() {
             css_def.resolve();
         });
@@ -61,25 +63,24 @@ define(["nova", "underscore", "oeclient", "require", "jquery",
         $.achtung({message: message, timeout: 0, showEffects: false, hideEffects: false});
     };
 
-    var ERROR_DELAY = 5000;
-
-    livesupport.ChatButton = nova.Widget.$extend({
+    im_common.ChatButton = openerp.Widget.extend({
         className: "openerp_style oe_chat_button",
         events: {
-            "click": "click",
+            "click": "click"
         },
-        __init__: function(parent, channel, options) {
-            this.$super(parent);
+        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}));
+        start: function() {
+            this.$().append(openerp.qweb.render("chatButton", {widget: this}));
         },
         click: function() {
             if (! this.manager) {
-                this.manager = new livesupport.ConversationManager(null);
+                this.manager = new im_common.ConversationManager(this, this.options);
+                this.manager.set("bottom_offset", 37);
                 this.activated_def = this.manager.start_polling();
             }
             var def = $.Deferred();
@@ -92,362 +93,28 @@ define(["nova", "underscore", "oeclient", "require", "jquery",
                 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.");
+                im_common.notification(_t("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) {
+            im_common.connection.model("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.");
+                    im_common.notification(_t("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())});
+                            date: openerp.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
deleted file mode 100644
index 54cdf450dc1..00000000000
--- a/addons/im_livechat/static/ext/static/js/livesupport_templates.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<%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
deleted file mode 100644
index aaabfd38caf..00000000000
--- a/addons/im_livechat/static/ext/static/js/livesupport_templates.js
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index eee00741fb6..00000000000
--- a/addons/im_livechat/static/ext/static/js/nova.js
+++ /dev/null
@@ -1,988 +0,0 @@
-/*
-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
deleted file mode 100644
index b3192b786e2..00000000000
--- a/addons/im_livechat/static/ext/static/js/oeclient.js
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
-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/to_jsonp.py b/addons/im_livechat/static/ext/static/js/to_jsonp.py
deleted file mode 100644
index 61f1a885768..00000000000
--- a/addons/im_livechat/static/ext/static/js/to_jsonp.py
+++ /dev/null
@@ -1,12 +0,0 @@
-
-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/jquery.achtung.css b/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css
similarity index 82%
rename from addons/im_livechat/static/ext/static/js/jquery.achtung.css
rename to addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css
index 820ae3e9194..27284c0e2ab 100644
--- a/addons/im_livechat/static/ext/static/js/jquery.achtung.css
+++ b/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.css
@@ -1,6 +1,6 @@
 /**
- * achtung 0.3.0
- * 
+ * achtung %%VERSION%%
+ *
  * Growl-like notifications for jQuery
  *
  * Copyright (c) 2009 Josh Varner <josh@voxwerk.com>
@@ -11,10 +11,10 @@
  * 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
@@ -29,43 +29,138 @@
  * @author Josh Varner <josh@voxwerk.com>
  */
 
+#achtung-overlay {
+    overflow: hidden;
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 50;
+}
+
 /* IE 6 doesn't support position: fixed */
 * html #achtung-overlay {
-	position:absolute;
+    position: absolute;
 }
 
 /* IE6 includes padding in width */
 * html .achtung {
-    width: 280px;
+    width: 260px;
 }
 
-#achtung-overlay {
+#achtung-wrapper {
     overflow: hidden;
-    position: fixed;
-    top: 15px;
-    right: 15px;
-    width: 280px;
-    z-index:50;
+    padding: 25px 30px 10px 10px;
 }
 
 .achtung {
-    display:none;
+    display: none;
+    float: right;
+    clear: right;
     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;
+    padding: 15px;
+    background: #000;
+    background: rgba(0,0,0,.95);
+    color: white;
+    width: 230px;
+    font-weight: normal;
+    font-style: italic;
+    font-size: 1.05em;
+    position: relative;
+    overflow: hidden;
+    text-shadow: -1px -1px 0 rgba(0,0,0,.3);
+    box-shadow: rgba(0,0,0,.3) 0 1px 4px;
+    -moz-box-shadow: rgba(0,0,0,.3) 0 1px 4px;
+    -webkit-box-shadow: rgba(0,0,0,.3) 0 1px 4px;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    opacity: 1.0;
+    filter:Alpha(Opacity=100);
+}
+
+.achtung-default {
+    background: #000;
+    background: -moz-linear-gradient(top, rgba(150,150,150,.9), rgba(120,120,120,.9) 70%);
+    background: -webkit-gradient(linear, left top, left bottom,
+        from(rgba(150,150,150,.9)),
+        color-stop(70%, rgba(120,120,120,.9)),
+        to(rgba(120,120,120,.9))
+    ) no-repeat;
+    color: white;
+}
+
+.achtung .achtung-message-icon {
+    float: left;
+    margin: 0 .8em 0 -.5em;
+    zoom: 1;
+}
+
+.achtung .ui-icon.achtung-close-button {
+    overflow: hidden;
+    float: right;
+    position: relative;
+    top: -8px;
+    right: -8px;
+    cursor: pointer;
+    background-image: url('images/ui-icons_cccccc_256x240.png');
+}
+
+.achtung .ui-icon.achtung-close-button:hover {
+    background-image: url('images/ui-icons_ffffff_256x240.png');
+}
+
+/* Slightly darker for these colors (readability) */
+.achtungSuccess, .achtungFail, .achtungWait {
     /* Note that if using show/hide animations, IE will lose
        this setting */
-    opacity: .85;
-    filter:Alpha(Opacity=85);
+   opacity: 1.0;
+   filter:Alpha(Opacity=100);
+}
+
+.achtungSuccess {
+    background: #6a5;
+    background: #6a5 -moz-linear-gradient(top, #8c7, #6a5 70%);
+    background: #6a5 -webkit-gradient(linear, left top, left bottom,
+        from(#8c7),
+        color-stop(70%, #6a5),
+        to(#6a5)
+    ) no-repeat;
+}
+.achtungFail {
+    background: #a55;
+    background: #a55 -moz-linear-gradient(top, #c66, #a44 70%);
+    background: #789 -webkit-gradient(linear, left top, left bottom,
+        from(#c66),
+        color-stop(70%, #a44),
+        to(#a44)
+    ) no-repeat;
+}
+.achtungWait {
+    background: #789;
+    background: #789 -moz-linear-gradient(top, #89a, #678 70%);
+    background: #789 -webkit-gradient(linear, left top, left bottom,
+        from(#89a),
+        color-stop(70%, #678),
+        to(#678)
+    ) no-repeat;
+}
+
+.achtungSuccess .ui-icon.achtung-close-button,
+.achtungFail .ui-icon.achtung-close-button {
+    background-image: url('images/ui-icons_444444_256x240.png');
+}
+
+.achtungSuccess .ui-icon.achtung-close-button:hover,
+.achtungFail .ui-icon.achtung-close-button:hover {
+    background-image: url('images/ui-icons_ffffff_256x240.png');
+}
+
+.achtung .wait-icon {
+    background-image: url('images/wait.gif');
+}
+
+.achtung .achtung-message {
+    display: inline;
 }
 
 /**
@@ -74,8 +169,8 @@
  * 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 { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+.ui-icon { width: 16px; height: 16px; background-image: url('images/ui-icons_222222_256x240.png'); }
 .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; }
@@ -249,58 +344,3 @@
 .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/lib/jquery-achtung/src/ui.achtung.js b/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.js
new file mode 100644
index 00000000000..e9d7cd0ef99
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/lib/jquery-achtung/src/ui.achtung.js
@@ -0,0 +1,282 @@
+/**
+ * achtung %%VERSION%%
+ *
+ * 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>
+ */
+
+/*jslint browser:true, white:false, onevar:false, nomen:false, bitwise:false, plusplus:false, immed: false */
+/*globals window, jQuery */
+(function ($) {
+
+var widgetName = 'achtung';
+
+/**
+ * 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, isMethodCall ? 1 : 0);
+
+	// handle initialization and non-getter methods
+	return this.each(function () {
+		// prevent calls to internal methods
+		if (isMethodCall && options.substring(0, 1) === '_') {
+			return;
+		}
+
+		var instance = $.data(this, widgetName);
+
+		// constructor
+		if (!instance && !isMethodCall) {
+			$.data(this, widgetName, new $.achtung(this))._init(args);
+		}
+
+		if (!!instance && isMethodCall && $.isFunction(instance[options])) {
+			instance[options].apply(instance, args);
+		}
+	});
+};
+
+$.achtung = function (element) {
+    if (!element || !element.nodeType) {
+        var el = $('<div>');
+        return el.achtung.apply(el, arguments);
+    }
+
+    this.container = $(element);
+};
+
+
+/**
+ * Static members
+ **/
+$.extend($.achtung, {
+    version: '%%VERSION%%',
+    overlay: false,
+    wrapper: false,
+    defaults: {
+        timeout: 10,
+        disableClose: false,
+        icon: false,
+        className: 'achtung-default',
+        crossFadeMessage: 500, // 0 to disable
+        animateClassSwitch: 0, // 0 to disable (doesn't work with gradient backgrounds)
+        showEffects: {'opacity':'toggle'}, // ,'height':'toggle'},
+        hideEffects: {'opacity':'toggle'}, // ,'height':'toggle'},
+        showEffectDuration: 300,
+        hideEffectDuration: 500
+    }
+});
+
+/**
+ * Non-static members
+ **/
+$.extend($.achtung.prototype, {
+    container: false,
+    icon: false,
+    message: false,
+    closeTimer: false,
+    options: {},
+
+    _init: function (args) {
+        var o, self = this;
+
+        o = this.options = $.extend.apply($, [{}, $.achtung.defaults].concat(args));
+
+        if ((o.animateClassSwitch > 0) && !('switchClass' in $.fn)) {
+            o.animateClassSwitch = this.options.animateClassSwitch = 0;
+        }
+
+        if (!o.disableClose) {
+            $('<span class="achtung-close-button ui-icon ui-icon-close" />')
+                .prependTo(this.container)
+                .bind({
+                    click: function () { self.close(); }
+                });
+        }
+
+        this.changeIcon(o.icon, true);
+
+        if (o.message) {
+            this.message = $('<span>', {
+                'class': 'achtung-message',
+                html: o.message
+            }).appendTo(this.container);
+        }
+
+        if ('className' in o) {
+            this.container.addClass(o.className);
+        }
+
+        if ('css' in o) {
+            this.container.css(o.css);
+        }
+
+        if (!$.achtung.overlay) {
+            $.achtung.overlay = $('<div id="achtung-overlay"><div id="achtung-wrapper"></div></div>');
+            $.achtung.overlay.appendTo(document.body);
+            $.achtung.wrapper = $('#achtung-wrapper');
+        }
+
+        this.container.addClass('achtung').hide().appendTo($.achtung.wrapper);
+
+        if (o.showEffects) {
+            this.container.animate(o.showEffects, o.showEffectDuration);
+        } else {
+            this.container.show();
+        }
+
+        this.timeout(o.timeout);
+    },
+
+    timeout: function (timeout) {
+        var self = this;
+
+        if (this.closeTimer) {
+            clearTimeout(this.closeTimer);
+        }
+
+        if (timeout > 0) {
+            this.closeTimer = setTimeout(function () { self.close(); }, timeout * 1000);
+            this.options.timeout = timeout;
+        } else if (timeout < 0) {
+            this.close();
+        }
+    },
+
+    /**
+     * Change the CSS class associated with this message.
+     *
+     * @param newClass string Name of new class to associate
+     */
+    changeClass: function (newClass) {
+        var oldClass = '' + this.options.className,
+            self = this;
+
+        if (oldClass === newClass) {
+            return;
+        }
+
+        this.container.queue(function (next) {
+            if (self.options.animateClassSwitch > 0) {
+                $(this).switchClass(oldClass, newClass, self.options.animateClassSwitch);
+            } else {
+                $(this).removeClass(oldClass).addClass(newClass);
+            }
+            next();
+        });
+
+        this.options.className = newClass;
+    },
+
+    changeIcon: function (newIcon, force) {
+        if (!force && this.options.icon === newIcon) {
+            return;
+        }
+
+        if (!!this.icon) {
+            if (newIcon) {
+                this.icon.removeClass(this.options.icon).addClass(newIcon);
+            } else {
+                this.icon.remove();
+                this.icon = false;
+            }
+        } else if (newIcon) {
+            this.icon = $('<span class="achtung-message-icon ui-icon ' + newIcon + '" />');
+            this.container.prepend(this.icon);
+        }
+
+        this.options.icon = newIcon;
+    },
+
+    changeMessage: function (newMessage) {
+        if (this.options.crossFadeMessage > 0) {
+            this.message.clone()
+                .css('position', 'absolute')
+                .insertBefore(this.message)
+                .fadeOut(this.options.crossFadeMessage, function () { $(this).remove(); });
+
+            this.message.hide().html(newMessage).fadeIn(this.options.crossFadeMessage);
+        } else {
+            this.message.html(newMessage);
+        }
+
+        this.options.message = newMessage;
+    },
+
+    update: function () {
+        var options = $.extend.apply($, [{}].concat(Array.prototype.slice.call(arguments, 0))),
+            map = {
+                className: 'changeClass',
+                css: 'css',
+                icon: 'changeIcon',
+                message: 'changeMessage',
+                timeout: 'timeout'
+            };
+
+        for (var prop in map) {
+            if (prop in options) {
+                this[map[prop]](options[prop]);
+            }
+        }
+    },
+
+    isVisible: function () {
+        return (true === this.container.is(':visible'));
+    },
+
+    _trigger: function (type, data) {
+        this.container.trigger(widgetName + type, data);
+    },
+
+    close: function () {
+        var o = this.options, self = this;
+
+        this._trigger('close');
+
+        if (o.hideEffects) {
+            this.container.animate(o.hideEffects, o.hideEffectDuration, function () {
+                self.remove();
+            });
+        } else {
+            this.container.hide();
+            this.remove();
+        }
+    },
+
+    remove: function () {
+        this.container.remove();
+
+        if ($.achtung.wrapper && !($.achtung.wrapper.contents().length)) {
+            $.achtung.wrapper = false;
+            $.achtung.overlay.remove();
+            $.achtung.overlay = false;
+        }
+    }
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/addons/im_livechat/static/ext/static/lib/jquery/jquery.js b/addons/im_livechat/static/ext/static/lib/jquery/jquery.js
new file mode 100644
index 00000000000..b4318519e88
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/lib/jquery/jquery.js
@@ -0,0 +1,9472 @@
+/*!
+ * jQuery JavaScript Library v1.8.3
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: Tue Nov 13 2012 08:20:33 GMT-0500 (Eastern Standard Time)
+ */
+(function( window, undefined ) {
+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,
+        navigator = window.navigator,
+
+        // Map over jQuery in case of overwrite
+        _jQuery = window.jQuery,
+
+        // Map over the $ in case of overwrite
+        _$ = window.$,
+
+        // Save a reference to some core methods
+        core_push = Array.prototype.push,
+        core_slice = Array.prototype.slice,
+        core_indexOf = Array.prototype.indexOf,
+        core_toString = Object.prototype.toString,
+        core_hasOwn = Object.prototype.hasOwnProperty,
+        core_trim = String.prototype.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 detecting and trimming whitespace
+        core_rnotwhite = /\S/,
+        core_rspace = /\s+/,
+
+        // 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)
+        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*\.|)\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();
+                }
+        },
+
+        // [[Class]] -> type pairs
+        class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+        constructor: jQuery,
+        init: function( selector, context, rootjQuery ) {
+                var match, elem, ret, doc;
+
+                // Handle $(""), $(null), $(undefined), $(false)
+                if ( !selector ) {
+                        return this;
+                }
+
+                // Handle $(DOMElement)
+                if ( selector.nodeType ) {
+                        this.context = this[0] = selector;
+                        this.length = 1;
+                        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;
+                                        doc = ( context && context.nodeType ? context.ownerDocument || context : document );
+
+                                        // scripts is true for back-compat
+                                        selector = jQuery.parseHTML( match[1], doc, true );
+                                        if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+                                                this.attr.call( selector, context, true );
+                                        }
+
+                                        return jQuery.merge( this, selector );
+
+                                // 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: $(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 current version of jQuery being used
+        jquery: "1.8.3",
+
+        // 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, name, selector ) {
+
+                // 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;
+
+                if ( name === "find" ) {
+                        ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
+                } else if ( name ) {
+                        ret.selector = this.selector + "." + name + "(" + selector + ")";
+                }
+
+                // 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;
+        },
+
+        eq: function( i ) {
+                i = +i;
+                return i === -1 ?
+                        this.slice( i ) :
+                        this.slice( i, i + 1 );
+        },
+
+        first: function() {
+                return this.eq( 0 );
+        },
+
+        last: function() {
+                return this.eq( -1 );
+        },
+
+        slice: function() {
+                return this.pushStack( core_slice.apply( this, arguments ),
+                        "slice", core_slice.call(arguments).join(",") );
+        },
+
+        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, 1 );
+                }
+
+                // 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 ) {
+                return obj == null ?
+                        String( obj ) :
+                        class2type[ core_toString.call(obj) ] || "object";
+        },
+
+        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
+        // scripts (optional): If true, will include scripts passed in the html string
+        parseHTML: function( data, context, scripts ) {
+                var parsed;
+                if ( !data || typeof data !== "string" ) {
+                        return null;
+                }
+                if ( typeof context === "boolean" ) {
+                        scripts = context;
+                        context = 0;
+                }
+                context = context || document;
+
+                // Single tag
+                if ( (parsed = rsingleTag.exec( data )) ) {
+                        return [ context.createElement( parsed[1] ) ];
+                }
+
+                parsed = jQuery.buildFragment( [ data ], context, scripts ? null : [] );
+                return jQuery.merge( [],
+                        (parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment).childNodes );
+        },
+
+        parseJSON: function( data ) {
+                if ( !data || typeof data !== "string") {
+                        return null;
+                }
+
+                // Make sure leading/trailing whitespace is removed (IE can't handle it)
+                data = jQuery.trim( data );
+
+                // Attempt to parse using the native JSON parser first
+                if ( window.JSON && window.JSON.parse ) {
+                        return window.JSON.parse( 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 && core_rnotwhite.test( 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 name,
+                        i = 0,
+                        length = obj.length,
+                        isObj = length === undefined || jQuery.isFunction( obj );
+
+                if ( args ) {
+                        if ( isObj ) {
+                                for ( name in obj ) {
+                                        if ( callback.apply( obj[ name ], args ) === false ) {
+                                                break;
+                                        }
+                                }
+                        } else {
+                                for ( ; i < length; ) {
+                                        if ( callback.apply( obj[ i++ ], args ) === false ) {
+                                                break;
+                                        }
+                                }
+                        }
+
+                // A special, fast, case for the most common use of each
+                } else {
+                        if ( isObj ) {
+                                for ( name in obj ) {
+                                        if ( callback.call( obj[ name ], name, obj[ name ] ) === false ) {
+                                                break;
+                                        }
+                                }
+                        } else {
+                                for ( ; i < length; ) {
+                                        if ( callback.call( obj[ i ], i, obj[ i++ ] ) === 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 type,
+                        ret = results || [];
+
+                if ( arr != null ) {
+                        // The window, strings (and functions) also have 'length'
+                        // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+                        type = jQuery.type( arr );
+
+                        if ( arr.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( arr ) ) {
+                                core_push.call( ret, arr );
+                        } else {
+                                jQuery.merge( 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, key,
+                        ret = [],
+                        i = 0,
+                        length = elems.length,
+                        // jquery objects are treated as arrays
+                        isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
+
+                // 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 ( key in elems ) {
+                                value = callback( elems[ key ], key, arg );
+
+                                if ( value != null ) {
+                                        ret[ ret.length ] = value;
+                                }
+                        }
+                }
+
+                // Flatten any nested arrays
+                return ret.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, 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, pass ) {
+                var exec,
+                        bulk = key == null,
+                        i = 0,
+                        length = elems.length;
+
+                // Sets many values
+                if ( key && typeof key === "object" ) {
+                        for ( i in key ) {
+                                jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
+                        }
+                        chainable = 1;
+
+                // Sets one value
+                } else if ( value !== undefined ) {
+                        // Optionally, function values get executed if exec is true
+                        exec = pass === undefined && jQuery.isFunction( value );
+
+                        if ( bulk ) {
+                                // Bulk operations only iterate when executing function values
+                                if ( exec ) {
+                                        exec = fn;
+                                        fn = function( elem, key, value ) {
+                                                return exec.call( jQuery( elem ), value );
+                                        };
+
+                                // Otherwise they run against the entire set
+                                } else {
+                                        fn.call( elems, value );
+                                        fn = null;
+                                }
+                        }
+
+                        if ( fn ) {
+                                for (; i < length; i++ ) {
+                                        fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+                                }
+                        }
+
+                        chainable = 1;
+                }
+
+                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, 1 );
+
+                // 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".split(" "), function(i, name) {
+        class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+// 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.split( core_rspace ), 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 = fns[ i ];
+                                                        // deferred[ done | fail | progress ] for forwarding actions to newDefer
+                                                        deferred[ tuple[1] ]( jQuery.isFunction( fn ) ?
+                                                                function() {
+                                                                        var returned = 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 === deferred ? newDefer : this, [ returned ] );
+                                                                        }
+                                                                } :
+                                                                newDefer[ action ]
+                                                        );
+                                                });
+                                                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 ] = list.fire
+                        deferred[ tuple[0] ] = list.fire;
+                        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,
+                i,
+                isSupported,
+                clickFn,
+                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 = {
+                // 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,
+
+                // Make sure that if no value is specified for a checkbox
+                // that it defaults to "on".
+                // (WebKit defaults to "" instead)
+                checkOn: ( input.value === "on" ),
+
+                // 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,
+
+                // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+                getSetAttribute: div.className !== "t",
+
+                // 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
+                submitBubbles: true,
+                changeBubbles: true,
+                focusinBubbles: false,
+                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;
+
+        // Test to see if it's possible to delete an expando from an element
+        // Fails in Internet Explorer
+        try {
+                delete div.test;
+        } catch( e ) {
+                support.deleteExpando = false;
+        }
+
+        if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+                div.attachEvent( "onclick", clickFn = function() {
+                        // Cloning a node shouldn't copy over any
+                        // bound event handlers (IE does this)
+                        support.noCloneEvent = false;
+                });
+                div.cloneNode( true ).fireEvent("onclick");
+                div.detachEvent( "onclick", clickFn );
+        }
+
+        // Check if a radio maintains its value
+        // after being appended to the DOM
+        input = document.createElement("input");
+        input.value = "t";
+        input.setAttribute( "type", "radio" );
+        support.radioValue = input.value === "t";
+
+        input.setAttribute( "checked", "checked" );
+
+        // #11217 - WebKit loses check when the name is after the checked attribute
+        input.setAttribute( "name", "t" );
+
+        div.appendChild( input );
+        fragment = document.createDocumentFragment();
+        fragment.appendChild( div.lastChild );
+
+        // WebKit doesn't clone checked state correctly in fragments
+        support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+        // Check if a disconnected checkbox will retain its checked
+        // value of true after appended to the DOM (IE6/7)
+        support.appendChecked = input.checked;
+
+        fragment.removeChild( input );
+        fragment.appendChild( div );
+
+        // Technique from Juriy Zaytsev
+        // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
+        // We only care about the case where non-standard event systems
+        // are used, namely in IE. Short-circuiting here helps us to
+        // avoid an eval call (in setAttribute) which can cause CSP
+        // to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+        if ( div.attachEvent ) {
+                for ( i in {
+                        submit: true,
+                        change: true,
+                        focusin: true
+                }) {
+                        eventName = "on" + i;
+                        isSupported = ( eventName in div );
+                        if ( !isSupported ) {
+                                div.setAttribute( eventName, "return;" );
+                                isSupported = ( typeof div[ eventName ] === "function" );
+                        }
+                        support[ i + "Bubbles" ] = isSupported;
+                }
+        }
+
+        // Run tests that need a body at doc ready
+        jQuery(function() {
+                var container, div, tds, marginDiv,
+                        divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;",
+                        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 = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px";
+                body.insertBefore( container, body.firstChild );
+
+                // Construct the test element
+                div = document.createElement("div");
+                container.appendChild( div );
+
+                // 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).
+                // (only IE 8 fails this test)
+                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";
+
+                // Check if empty table cells still have offsetWidth/Height
+                // (IE <= 8 fail this test)
+                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 );
+
+                // NOTE: To any future maintainer, we've 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. For more
+                        // info see bug #3333
+                        // Fails in WebKit before Feb 2011 nightlies
+                        // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+                        marginDiv = document.createElement("div");
+                        marginDiv.style.cssText = div.style.cssText = divReset;
+                        marginDiv.style.marginRight = marginDiv.style.width = "0";
+                        div.style.width = "1px";
+                        div.appendChild( marginDiv );
+                        support.reliableMarginRight =
+                                !parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
+                }
+
+                if ( typeof div.style.zoom !== "undefined" ) {
+                        // Check if natively block-level elements act like inline-block
+                        // elements when setting their display to 'inline' and giving
+                        // them layout
+                        // (IE < 8 does this)
+                        div.innerHTML = "";
+                        div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
+                        support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
+
+                        // Check if elements with layout shrink-wrap their children
+                        // (IE 6 does this)
+                        div.style.display = "block";
+                        div.style.overflow = "visible";
+                        div.innerHTML = "<div></div>";
+                        div.firstChild.style.width = "5px";
+                        support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
+
+                        container.style.zoom = 1;
+                }
+
+                // Null elements to avoid leaks in IE
+                body.removeChild( container );
+                container = div = tds = marginDiv = null;
+        });
+
+        // Null elements to avoid leaks in IE
+        fragment.removeChild( div );
+        all = a = select = opt = input = fragment = div = null;
+
+        return support;
+})();
+var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+        rmultiDash = /([A-Z])/g;
+
+jQuery.extend({
+        cache: {},
+
+        deletedIds: [],
+
+        // Remove at next major release (1.9/2.0)
+        uuid: 0,
+
+        // Unique for each copy of jQuery on the page
+        // Non-digits removed to match rinlinejQuery
+        expando: "jQuery" + ( jQuery.fn.jquery + 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, 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 = jQuery.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;
+        },
+
+        removeData: function( elem, name, pvt /* 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(" ");
+                                                }
+                                        }
+                                }
+
+                                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;
+                }
+        },
+
+        // For internal use only.
+        _data: function( elem, name, data ) {
+                return jQuery.data( elem, name, data, 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 parts, part, attr, name, l,
+                        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" ) ) {
+                                        attr = elem.attributes;
+                                        for ( l = attr.length; i < l; i++ ) {
+                                                name = attr[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 );
+                        });
+                }
+
+                parts = key.split( ".", 2 );
+                parts[1] = parts[1] ? "." + parts[1] : "";
+                part = parts[1] + "!";
+
+                return jQuery.access( this, function( value ) {
+
+                        if ( value === undefined ) {
+                                data = this.triggerHandler( "getData" + part, [ parts[0] ] );
+
+                                // Try to fetch any internally stored data first
+                                if ( data === undefined && elem ) {
+                                        data = jQuery.data( elem, key );
+                                        data = dataAttr( elem, key, data );
+                                }
+
+                                return data === undefined && parts[1] ?
+                                        this.data( parts[0] ) :
+                                        data;
+                        }
+
+                        parts[1] = value;
+                        this.each(function() {
+                                var self = jQuery( this );
+
+                                self.triggerHandler( "setData" + part, parts );
+                                jQuery.data( this, key, value );
+                                self.triggerHandler( "changeData" + part, parts );
+                        });
+                }, null, value, arguments.length > 1, null, false );
+        },
+
+        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--;
+                }
+
+                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", true );
+                                jQuery.removeData( elem, key, true );
+                        })
+                });
+        }
+});
+
+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, fixSpecified,
+        rclass = /[\t\r\n]/g,
+        rreturn = /\r/g,
+        rtype = /^(?:button|input)$/i,
+        rfocusable = /^(?:button|input|object|select|textarea)$/i,
+        rclickable = /^a(?:rea|)$/i,
+        rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+        getSetAttribute = jQuery.support.getSetAttribute;
+
+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 classNames, i, l, elem,
+                        setClass, c, cl;
+
+                if ( jQuery.isFunction( value ) ) {
+                        return this.each(function( j ) {
+                                jQuery( this ).addClass( value.call(this, j, this.className) );
+                        });
+                }
+
+                if ( value && typeof value === "string" ) {
+                        classNames = value.split( core_rspace );
+
+                        for ( i = 0, l = this.length; i < l; i++ ) {
+                                elem = this[ i ];
+
+                                if ( elem.nodeType === 1 ) {
+                                        if ( !elem.className && classNames.length === 1 ) {
+                                                elem.className = value;
+
+                                        } else {
+                                                setClass = " " + elem.className + " ";
+
+                                                for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+                                                        if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) {
+                                                                setClass += classNames[ c ] + " ";
+                                                        }
+                                                }
+                                                elem.className = jQuery.trim( setClass );
+                                        }
+                                }
+                        }
+                }
+
+                return this;
+        },
+
+        removeClass: function( value ) {
+                var removes, className, elem, c, cl, i, l;
+
+                if ( jQuery.isFunction( value ) ) {
+                        return this.each(function( j ) {
+                                jQuery( this ).removeClass( value.call(this, j, this.className) );
+                        });
+                }
+                if ( (value && typeof value === "string") || value === undefined ) {
+                        removes = ( value || "" ).split( core_rspace );
+
+                        for ( i = 0, l = this.length; i < l; i++ ) {
+                                elem = this[ i ];
+                                if ( elem.nodeType === 1 && elem.className ) {
+
+                                        className = (" " + elem.className + " ").replace( rclass, " " );
+
+                                        // loop over each item in the removal list
+                                        for ( c = 0, cl = removes.length; c < cl; c++ ) {
+                                                // Remove until there is nothing to remove,
+                                                while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) {
+                                                        className = className.replace( " " + removes[ c ] + " " , " " );
+                                                }
+                                        }
+                                        elem.className = value ? jQuery.trim( className ) : "";
+                                }
+                        }
+                }
+
+                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.split( core_rspace );
+
+                                while ( (className = classNames[ i++ ]) ) {
+                                        // check each className given, space separated list
+                                        state = isBool ? state : !self.hasClass( className );
+                                        self[ state ? "addClass" : "removeClass" ]( className );
+                                }
+
+                        } else if ( type === "undefined" || type === "boolean" ) {
+                                if ( this.className ) {
+                                        // store className if set
+                                        jQuery._data( this, "__className__", this.className );
+                                }
+
+                                // toggle whole className
+                                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;
+                        }
+                }
+        },
+
+        // Unused in 1.8, left in so attrFn-stabbers won't die; remove in 1.9
+        attrFn: {},
+
+        attr: function( elem, name, value, pass ) {
+                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;
+                }
+
+                if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
+                        return jQuery( elem )[ name ]( value );
+                }
+
+                // 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 );
+                                return;
+
+                        } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
+                                return ret;
+
+                        } else {
+                                elem.setAttribute( name, value + "" );
+                                return value;
+                        }
+
+                } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
+                        return ret;
+
+                } else {
+
+                        ret = elem.getAttribute( name );
+
+                        // Non-existent attributes return null, we normalize to undefined
+                        return ret === null ?
+                                undefined :
+                                ret;
+                }
+        },
+
+        removeAttr: function( elem, value ) {
+                var propName, attrNames, name, isBool,
+                        i = 0;
+
+                if ( value && elem.nodeType === 1 ) {
+
+                        attrNames = value.split( core_rspace );
+
+                        for ( ; i < attrNames.length; i++ ) {
+                                name = attrNames[ i ];
+
+                                if ( name ) {
+                                        propName = jQuery.propFix[ name ] || name;
+                                        isBool = rboolean.test( name );
+
+                                        // See #9699 for explanation of this approach (setting first, then removal)
+                                        // Do not do this for boolean attributes (see #10870)
+                                        if ( !isBool ) {
+                                                jQuery.attr( elem, name, "" );
+                                        }
+                                        elem.removeAttribute( getSetAttribute ? name : propName );
+
+                                        // Set corresponding property to false for boolean attributes
+                                        if ( isBool && propName in elem ) {
+                                                elem[ propName ] = false;
+                                        }
+                                }
+                        }
+                }
+        },
+
+        attrHooks: {
+                type: {
+                        set: function( elem, value ) {
+                                // We can't allow the type property to be changed (since it causes problems in IE)
+                                if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
+                                        jQuery.error( "type property can't be changed" );
+                                } else 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 it's default in case type is set after value
+                                        // This is for element creation
+                                        var val = elem.value;
+                                        elem.setAttribute( "type", value );
+                                        if ( val ) {
+                                                elem.value = val;
+                                        }
+                                        return value;
+                                }
+                        }
+                },
+                // Use the value property for back compat
+                // Use the nodeHook for button elements in IE6/7 (#1954)
+                value: {
+                        get: function( elem, name ) {
+                                if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+                                        return nodeHook.get( elem, name );
+                                }
+                                return name in elem ?
+                                        elem.value :
+                                        null;
+                        },
+                        set: function( elem, value, name ) {
+                                if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+                                        return nodeHook.set( elem, value, name );
+                                }
+                                // Does not return so that setAttribute is also used
+                                elem.value = 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 ) {
+                // Align boolean attributes with corresponding properties
+                // Fall back to attribute presence where some booleans are not supported
+                var attrNode,
+                        property = jQuery.prop( elem, name );
+                return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+                        name.toLowerCase() :
+                        undefined;
+        },
+        set: function( elem, value, name ) {
+                var propName;
+                if ( value === false ) {
+                        // Remove boolean attributes when set to false
+                        jQuery.removeAttr( elem, name );
+                } else {
+                        // value is true since we know at this point it's type boolean and not false
+                        // Set boolean attributes to the same name and set the DOM property
+                        propName = jQuery.propFix[ name ] || name;
+                        if ( propName in elem ) {
+                                // Only set the IDL specifically if it already exists on the element
+                                elem[ propName ] = true;
+                        }
+
+                        elem.setAttribute( name, name.toLowerCase() );
+                }
+                return name;
+        }
+};
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+        fixSpecified = {
+                name: true,
+                id: true,
+                coords: true
+        };
+
+        // 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;
+                        ret = elem.getAttributeNode( name );
+                        return ret && ( fixSpecified[ name ] ? 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 ) {
+                                ret = document.createAttribute( name );
+                                elem.setAttributeNode( ret );
+                        }
+                        return ( ret.value = value + "" );
+                }
+        };
+
+        // 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;
+                                }
+                        }
+                });
+        });
+
+        // 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 ) {
+                        if ( value === "" ) {
+                                value = "false";
+                        }
+                        nodeHook.set( elem, value, name );
+                }
+        };
+}
+
+
+// Some attributes require a special call on IE
+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;
+                        }
+                });
+        });
+}
+
+if ( !jQuery.support.style ) {
+        jQuery.attrHooks.style = {
+                get: function( elem ) {
+                        // Return undefined in the case of empty string
+                        // Normalize to lowercase since IE uppercases css property names
+                        return elem.style.cssText.toLowerCase() || 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 = /^(?:textarea|input|select)$/i,
+        rtypenamespace = /^([^\.]*|)(?:\.(.+)|)$/,
+        rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
+        rkeyEvent = /^key/,
+        rmouseEvent = /^(?:mouse|contextmenu)|click/,
+        rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+        hoverHack = function( events ) {
+                return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+        };
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+        add: function( elem, types, handler, data, selector ) {
+
+                var elemData, eventHandle, events,
+                        t, tns, type, namespaces, handleObj,
+                        handleObjIn, handlers, special;
+
+                // Don't attach events to noData or text/comment nodes (allow plain objects tho)
+                if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
+                        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
+                events = elemData.events;
+                if ( !events ) {
+                        elemData.events = events = {};
+                }
+                eventHandle = elemData.handle;
+                if ( !eventHandle ) {
+                        elemData.handle = eventHandle = 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 = jQuery.trim( hoverHack(types) ).split( " " );
+                for ( t = 0; t < types.length; t++ ) {
+
+                        tns = rtypenamespace.exec( types[t] ) || [];
+                        type = tns[1];
+                        namespaces = ( tns[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: tns[1],
+                                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
+                        handlers = events[ type ];
+                        if ( !handlers ) {
+                                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;
+        },
+
+        global: {},
+
+        // Detach an event or set of events from an element
+        remove: function( elem, types, handler, selector, mappedTypes ) {
+
+                var t, tns, type, origType, namespaces, origCount,
+                        j, events, special, eventType, handleObj,
+                        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 = jQuery.trim( hoverHack( types || "" ) ).split(" ");
+                for ( t = 0; t < types.length; t++ ) {
+                        tns = rtypenamespace.exec( types[t] ) || [];
+                        type = origType = tns[1];
+                        namespaces = tns[2];
+
+                        // 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;
+                        eventType = events[ type ] || [];
+                        origCount = eventType.length;
+                        namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
+
+                        // Remove matching events
+                        for ( j = 0; j < eventType.length; j++ ) {
+                                handleObj = eventType[ j ];
+
+                                if ( ( mappedTypes || origType === handleObj.origType ) &&
+                                         ( !handler || handler.guid === handleObj.guid ) &&
+                                         ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
+                                         ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+                                        eventType.splice( j--, 1 );
+
+                                        if ( handleObj.selector ) {
+                                                eventType.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 ( eventType.length === 0 && origCount !== eventType.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", true );
+                }
+        },
+
+        // Events that are safe to short-circuit if no handlers are attached.
+        // Native DOM events should not be added, they may have inline handlers.
+        customEvent: {
+                "getData": true,
+                "setData": true,
+                "changeData": true
+        },
+
+        trigger: function( event, data, elem, onlyHandlers ) {
+                // Don't do events on text and comment nodes
+                if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
+                        return;
+                }
+
+                // Event object or event type
+                var cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType,
+                        type = event.type || event,
+                        namespaces = [];
+
+                // 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 ) {
+                        // Exclusive events trigger only for the exact event (no namespaces)
+                        type = type.slice(0, -1);
+                        exclusive = true;
+                }
+
+                if ( type.indexOf( "." ) >= 0 ) {
+                        // Namespaced trigger; create a regexp to match event type in handle()
+                        namespaces = type.split(".");
+                        type = namespaces.shift();
+                        namespaces.sort();
+                }
+
+                if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
+                        // No jQuery handlers for this event type, and it can't have inline handlers
+                        return;
+                }
+
+                // Caller can pass in an Event, Object, or just an event type string
+                event = typeof event === "object" ?
+                        // jQuery.Event object
+                        event[ jQuery.expando ] ? event :
+                        // Object literal
+                        new jQuery.Event( type, event ) :
+                        // Just the event type (string)
+                        new jQuery.Event( type );
+
+                event.type = type;
+                event.isTrigger = true;
+                event.exclusive = exclusive;
+                event.namespace = namespaces.join( "." );
+                event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
+                ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
+
+                // Handle a global trigger
+                if ( !elem ) {
+
+                        // TODO: Stop taunting the data cache; remove global events and always attach to document
+                        cache = jQuery.cache;
+                        for ( i in cache ) {
+                                if ( cache[ i ].events && cache[ i ].events[ type ] ) {
+                                        jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
+                                }
+                        }
+                        return;
+                }
+
+                // 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 ? jQuery.makeArray( data ) : [];
+                data.unshift( event );
+
+                // Allow special events to draw outside the lines
+                special = jQuery.event.special[ type ] || {};
+                if ( 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)
+                eventPath = [[ elem, special.bindType || type ]];
+                if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+                        bubbleType = special.delegateType || type;
+                        cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
+                        for ( old = elem; cur; cur = cur.parentNode ) {
+                                eventPath.push([ cur, bubbleType ]);
+                                old = cur;
+                        }
+
+                        // Only add window if we got to document (e.g., not plain obj or detached DOM)
+                        if ( old === (elem.ownerDocument || document) ) {
+                                eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
+                        }
+                }
+
+                // Fire handlers on the event path
+                for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
+
+                        cur = eventPath[i][0];
+                        event.type = eventPath[i][1];
+
+                        handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+                        if ( handle ) {
+                                handle.apply( cur, data );
+                        }
+                        // Note that this is a bare JS function and not a jQuery 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)
+                                // IE<9 dies on focus/blur to hidden element (#1486)
+                                if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
+
+                                        // Don't re-trigger an onFOO event when we call its FOO() method
+                                        old = elem[ ontype ];
+
+                                        if ( old ) {
+                                                elem[ ontype ] = null;
+                                        }
+
+                                        // Prevent re-triggering of the same event, since we already bubbled it above
+                                        jQuery.event.triggered = type;
+                                        elem[ type ]();
+                                        jQuery.event.triggered = undefined;
+
+                                        if ( old ) {
+                                                elem[ ontype ] = old;
+                                        }
+                                }
+                        }
+                }
+
+                return event.result;
+        },
+
+        dispatch: function( event ) {
+
+                // Make a writable jQuery.Event from the native event object
+                event = jQuery.event.fix( event || window.event );
+
+                var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
+                        handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
+                        delegateCount = handlers.delegateCount,
+                        args = core_slice.call( arguments ),
+                        run_all = !event.exclusive && !event.namespace,
+                        special = jQuery.event.special[ event.type ] || {},
+                        handlerQueue = [];
+
+                // 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 that should run if there are delegated events
+                // Avoid non-left-click bubbling in Firefox (#3861)
+                if ( delegateCount && !(event.button && event.type === "click") ) {
+
+                        for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
+
+                                // Don't process clicks (ONLY) on disabled elements (#6911, #8165, #11382, #11764)
+                                if ( cur.disabled !== true || event.type !== "click" ) {
+                                        selMatch = {};
+                                        matches = [];
+                                        for ( i = 0; i < delegateCount; i++ ) {
+                                                handleObj = handlers[ i ];
+                                                sel = handleObj.selector;
+
+                                                if ( selMatch[ sel ] === undefined ) {
+                                                        selMatch[ sel ] = handleObj.needsContext ?
+                                                                jQuery( sel, this ).index( cur ) >= 0 :
+                                                                jQuery.find( sel, this, null, [ cur ] ).length;
+                                                }
+                                                if ( selMatch[ sel ] ) {
+                                                        matches.push( handleObj );
+                                                }
+                                        }
+                                        if ( matches.length ) {
+                                                handlerQueue.push({ elem: cur, matches: matches });
+                                        }
+                                }
+                        }
+                }
+
+                // Add the remaining (directly-bound) handlers
+                if ( handlers.length > delegateCount ) {
+                        handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
+                }
+
+                // Run delegates first; they may want to stop propagation beneath us
+                for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
+                        matched = handlerQueue[ i ];
+                        event.currentTarget = matched.elem;
+
+                        for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
+                                handleObj = matched.matches[ j ];
+
+                                // Triggered event must either 1) be non-exclusive and have no namespace, or
+                                // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+                                if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
+
+                                        event.data = handleObj.data;
+                                        event.handleObj = handleObj;
+
+                                        ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+                                                        .apply( matched.elem, args );
+
+                                        if ( ret !== undefined ) {
+                                                event.result = ret;
+                                                if ( 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;
+        },
+
+        // Includes some event props shared by KeyEvent and MouseEvent
+        // *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
+        props: "attrChange attrName relatedNode srcElement 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;
+                }
+        },
+
+        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 = jQuery.Event( originalEvent );
+
+                for ( i = copy.length; i; ) {
+                        prop = copy[ --i ];
+                        event[ prop ] = originalEvent[ prop ];
+                }
+
+                // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
+                if ( !event.target ) {
+                        event.target = originalEvent.srcElement || document;
+                }
+
+                // Target should not be a text node (#504, Safari)
+                if ( event.target.nodeType === 3 ) {
+                        event.target = event.target.parentNode;
+                }
+
+                // For mouse/key events, metaKey==false if it's undefined (#3368, #11328; IE6/7/8)
+                event.metaKey = !!event.metaKey;
+
+                return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
+        },
+
+        special: {
+                load: {
+                        // Prevent triggered image.load events from bubbling to window.load
+                        noBubble: true
+                },
+
+                focus: {
+                        delegateType: "focusin"
+                },
+                blur: {
+                        delegateType: "focusout"
+                },
+
+                beforeunload: {
+                        setup: function( data, namespaces, eventHandle ) {
+                                // We only want to do this special case on windows
+                                if ( jQuery.isWindow( this ) ) {
+                                        this.onbeforeunload = eventHandle;
+                                }
+                        },
+
+                        teardown: function( namespaces, eventHandle ) {
+                                if ( this.onbeforeunload === eventHandle ) {
+                                        this.onbeforeunload = null;
+                                }
+                        }
+                }
+        },
+
+        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();
+                }
+        }
+};
+
+// Some plugins are using, but it's undocumented/deprecated and will be removed.
+// The 1.7 special event interface should provide all the hooks needed now.
+jQuery.event.handle = jQuery.event.dispatch;
+
+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;
+};
+
+function returnFalse() {
+        return false;
+}
+function returnTrue() {
+        return 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 = {
+        preventDefault: function() {
+                this.isDefaultPrevented = returnTrue;
+
+                var e = this.originalEvent;
+                if ( !e ) {
+                        return;
+                }
+
+                // if preventDefault exists run it on the original event
+                if ( e.preventDefault ) {
+                        e.preventDefault();
+
+                // otherwise set the returnValue property of the original event to false (IE)
+                } else {
+                        e.returnValue = false;
+                }
+        },
+        stopPropagation: function() {
+                this.isPropagationStopped = returnTrue;
+
+                var e = this.originalEvent;
+                if ( !e ) {
+                        return;
+                }
+                // if stopPropagation exists run it on the original event
+                if ( e.stopPropagation ) {
+                        e.stopPropagation();
+                }
+                // otherwise set the cancelBubble property of the original event to true (IE)
+                e.cancelBubble = true;
+        },
+        stopImmediatePropagation: function() {
+                this.isImmediatePropagationStopped = returnTrue;
+                this.stopPropagation();
+        },
+        isDefaultPrevented: returnFalse,
+        isPropagationStopped: returnFalse,
+        isImmediatePropagationStopped: returnFalse
+};
+
+// 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,
+                                selector = handleObj.selector;
+
+                        // 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, "_submit_attached" ) ) {
+                                        jQuery.event.add( form, "submit._submit", function( event ) {
+                                                event._submit_bubble = true;
+                                        });
+                                        jQuery._data( form, "_submit_attached", 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, "_change_attached" ) ) {
+                                        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, "_change_attached", 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" ) { // && selector != null
+                                // ( 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 );
+        },
+
+        live: function( types, data, fn ) {
+                jQuery( this.context ).on( types, this.selector, data, fn );
+                return this;
+        },
+        die: function( types, fn ) {
+                jQuery( this.context ).off( types, this.selector || "**", fn );
+                return this;
+        },
+
+        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 ) {
+                if ( this[0] ) {
+                        return jQuery.event.trigger( type, data, this[0], true );
+                }
+        },
+
+        toggle: function( fn ) {
+                // Save reference to arguments for access in closure
+                var args = arguments,
+                        guid = fn.guid || jQuery.guid++,
+                        i = 0,
+                        toggler = function( event ) {
+                                // Figure out which function to execute
+                                var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+                                jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+                                // Make sure that clicks stop
+                                event.preventDefault();
+
+                                // and execute the function
+                                return args[ lastToggle ].apply( this, arguments ) || false;
+                        };
+
+                // link all the functions, so any of them can unbind this click handler
+                toggler.guid = guid;
+                while ( i < args.length ) {
+                        args[ i++ ].guid = guid;
+                }
+
+                return this.click( toggler );
+        },
+
+        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 ) {
+                if ( fn == null ) {
+                        fn = data;
+                        data = null;
+                }
+
+                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 cachedruns,
+        assertGetIdNotName,
+        Expr,
+        getText,
+        isXML,
+        contains,
+        compile,
+        sortOrder,
+        hasDuplicate,
+        outermostContext,
+
+        baseHasDuplicate = true,
+        strundefined = "undefined",
+
+        expando = ( "sizcache" + Math.random() ).replace( ".", "" ),
+
+        Token = String,
+        document = window.document,
+        docElem = document.documentElement,
+        dirruns = 0,
+        done = 0,
+        pop = [].pop,
+        push = [].push,
+        slice = [].slice,
+        // Use a stripped-down indexOf if a native one is unavailable
+        indexOf = [].indexOf || function( elem ) {
+                var i = 0,
+                        len = this.length;
+                for ( ; i < len; i++ ) {
+                        if ( this[i] === elem ) {
+                                return i;
+                        }
+                }
+                return -1;
+        },
+
+        // Augment a function for special use by Sizzle
+        markFunction = function( fn, value ) {
+                fn[ expando ] = value == null || value;
+                return fn;
+        },
+
+        createCache = function() {
+                var cache = {},
+                        keys = [];
+
+                return markFunction(function( key, value ) {
+                        // Only keep the most recent entries
+                        if ( keys.push( key ) > Expr.cacheLength ) {
+                                delete cache[ keys.shift() ];
+                        }
+
+                        // Retrieve with (key + " ") to avoid collision with native Object.prototype properties (see Issue #157)
+                        return (cache[ key + " " ] = value);
+                }, cache );
+        },
+
+        classCache = createCache(),
+        tokenCache = createCache(),
+        compilerCache = createCache(),
+
+        // Regex
+
+        // 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 not in parens/brackets,
+        //   then attribute selectors and non-pseudos (denoted by :),
+        //   then anything else
+        // These preferences are here to reduce the number of selectors
+        //   needing tokenize in the PSEUDO preFilter
+        pseudos = ":(" + characterEncoding + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + attributes + ")|[^:]|\\\\.)*|.*))\\)|)",
+
+        // For matchExpr.POS and matchExpr.needsContext
+        pos = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
+                "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)",
+
+        // 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 ),
+
+        // Easily-parseable/retrievable ID or TAG or CLASS selectors
+        rquickExpr = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,
+
+        rnot = /^:not/,
+        rsibling = /[\x20\t\r\n\f]*[+~]/,
+        rendsWithNot = /:not\($/,
+
+        rheader = /h\d/i,
+        rinputs = /input|select|textarea|button/i,
+
+        rbackslash = /\\(?!\\)/g,
+
+        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 ),
+                "POS": new RegExp( pos, "i" ),
+                "CHILD": new RegExp( "^:(only|nth|first|last)-child(?:\\(" + whitespace +
+                        "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+                        "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+                // For use in libraries implementing .is()
+                "needsContext": new RegExp( "^" + whitespace + "*[>+~]|" + pos, "i" )
+        },
+
+        // Support
+
+        // Used for testing something on an element
+        assert = function( fn ) {
+                var div = document.createElement("div");
+
+                try {
+                        return fn( div );
+                } catch (e) {
+                        return false;
+                } finally {
+                        // release memory in IE
+                        div = null;
+                }
+        },
+
+        // Check if getElementsByTagName("*") returns only elements
+        assertTagNameNoComments = assert(function( div ) {
+                div.appendChild( document.createComment("") );
+                return !div.getElementsByTagName("*").length;
+        }),
+
+        // Check if getAttribute returns normalized href attributes
+        assertHrefNotNormalized = assert(function( div ) {
+                div.innerHTML = "<a href='#'></a>";
+                return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
+                        div.firstChild.getAttribute("href") === "#";
+        }),
+
+        // Check if attributes should be retrieved by attribute nodes
+        assertAttributes = 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
+        assertUsableClassName = 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
+        assertUsableName = 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 = document.getElementsByName &&
+                        // buggy browsers will return fewer than the correct 2
+                        document.getElementsByName( expando ).length === 2 +
+                        // buggy browsers will return more than the correct 0
+                        document.getElementsByName( expando + 0 ).length;
+                assertGetIdNotName = !document.getElementById( expando );
+
+                // Cleanup
+                docElem.removeChild( div );
+
+                return pass;
+        });
+
+// If slice is not available, provide a backup
+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;
+        };
+}
+
+function Sizzle( selector, context, results, seed ) {
+        results = results || [];
+        context = context || document;
+        var match, elem, xml, m,
+                nodeType = context.nodeType;
+
+        if ( !selector || typeof selector !== "string" ) {
+                return results;
+        }
+
+        if ( nodeType !== 1 && nodeType !== 9 ) {
+                return [];
+        }
+
+        xml = isXML( context );
+
+        if ( !xml && !seed ) {
+                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]) && assertUsableClassName && context.getElementsByClassName ) {
+                                push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
+                                return results;
+                        }
+                }
+        }
+
+        // All others
+        return select( selector.replace( rtrim, "$1" ), context, results, seed, xml );
+}
+
+Sizzle.matches = function( expr, elements ) {
+        return Sizzle( expr, null, null, elements );
+};
+
+Sizzle.matchesSelector = function( elem, expr ) {
+        return Sizzle( expr, null, null, [ elem ] ).length > 0;
+};
+
+// 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 ( 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
+        } else {
+
+                // If no nodeType, this is expected to be an array
+                for ( ; (node = elem[i]); i++ ) {
+                        // Do not traverse comment nodes
+                        ret += getText( node );
+                }
+        }
+        return ret;
+};
+
+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;
+};
+
+// Element contains another
+contains = Sizzle.contains = docElem.contains ?
+        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) );
+        } :
+        docElem.compareDocumentPosition ?
+        function( a, b ) {
+                return b && !!( a.compareDocumentPosition( b ) & 16 );
+        } :
+        function( a, b ) {
+                while ( (b = b.parentNode) ) {
+                        if ( b === a ) {
+                                return true;
+                        }
+                }
+                return false;
+        };
+
+Sizzle.attr = function( elem, name ) {
+        var val,
+                xml = isXML( elem );
+
+        if ( !xml ) {
+                name = name.toLowerCase();
+        }
+        if ( (val = Expr.attrHandle[ name ]) ) {
+                return val( elem );
+        }
+        if ( xml || assertAttributes ) {
+                return elem.getAttribute( name );
+        }
+        val = elem.getAttributeNode( name );
+        return val ?
+                typeof elem[ name ] === "boolean" ?
+                        elem[ name ] ? name : null :
+                        val.specified ? val.value : null :
+                null;
+};
+
+Expr = Sizzle.selectors = {
+
+        // Can be adjusted by the user
+        cacheLength: 50,
+
+        createPseudo: markFunction,
+
+        match: matchExpr,
+
+        // IE6/7 return a modified href
+        attrHandle: assertHrefNotNormalized ?
+                {} :
+                {
+                        "href": function( elem ) {
+                                return elem.getAttribute( "href", 2 );
+                        },
+                        "type": function( elem ) {
+                                return elem.getAttribute("type");
+                        }
+                },
+
+        find: {
+                "ID": assertGetIdNotName ?
+                        function( id, context, xml ) {
+                                if ( typeof context.getElementById !== strundefined && !xml ) {
+                                        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] : [];
+                                }
+                        } :
+                        function( id, context, xml ) {
+                                if ( typeof context.getElementById !== strundefined && !xml ) {
+                                        var m = context.getElementById( id );
+
+                                        return m ?
+                                                m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
+                                                        [m] :
+                                                        undefined :
+                                                [];
+                                }
+                        },
+
+                "TAG": assertTagNameNoComments ?
+                        function( tag, context ) {
+                                if ( typeof context.getElementsByTagName !== strundefined ) {
+                                        return context.getElementsByTagName( tag );
+                                }
+                        } :
+                        function( tag, context ) {
+                                var results = context.getElementsByTagName( tag );
+
+                                // Filter out possible comments
+                                if ( tag === "*" ) {
+                                        var elem,
+                                                tmp = [],
+                                                i = 0;
+
+                                        for ( ; (elem = results[i]); i++ ) {
+                                                if ( elem.nodeType === 1 ) {
+                                                        tmp.push( elem );
+                                                }
+                                        }
+
+                                        return tmp;
+                                }
+                                return results;
+                        },
+
+                "NAME": assertUsableName && function( tag, context ) {
+                        if ( typeof context.getElementsByName !== strundefined ) {
+                                return context.getElementsByName( name );
+                        }
+                },
+
+                "CLASS": assertUsableClassName && function( className, context, xml ) {
+                        if ( typeof context.getElementsByClassName !== strundefined && !xml ) {
+                                return context.getElementsByClassName( className );
+                        }
+                }
+        },
+
+        relative: {
+                ">": { dir: "parentNode", first: true },
+                " ": { dir: "parentNode" },
+                "+": { dir: "previousSibling", first: true },
+                "~": { dir: "previousSibling" }
+        },
+
+        preFilter: {
+                "ATTR": function( match ) {
+                        match[1] = match[1].replace( rbackslash, "" );
+
+                        // Move the given value to match[3] whether quoted or unquoted
+                        match[3] = ( match[4] || match[5] || "" ).replace( rbackslash, "" );
+
+                        if ( match[2] === "~=" ) {
+                                match[3] = " " + match[3] + " ";
+                        }
+
+                        return match.slice( 0, 4 );
+                },
+
+                "CHILD": function( match ) {
+                        /* matches from matchExpr["CHILD"]
+                                1 type (only|nth|...)
+                                2 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
+                                3 xn-component of xn+y argument ([+-]?\d*n|)
+                                4 sign of xn-component
+                                5 x of xn-component
+                                6 sign of y-component
+                                7 y of y-component
+                        */
+                        match[1] = match[1].toLowerCase();
+
+                        if ( match[1] === "nth" ) {
+                                // nth-child requires argument
+                                if ( !match[2] ) {
+                                        Sizzle.error( match[0] );
+                                }
+
+                                // numeric x and y parameters for Expr.filter.CHILD
+                                // remember that false/true cast respectively to 0/1
+                                match[3] = +( match[3] ? match[4] + (match[5] || 1) : 2 * ( match[2] === "even" || match[2] === "odd" ) );
+                                match[4] = +( ( match[6] + match[7] ) || match[2] === "odd" );
+
+                        // other types prohibit arguments
+                        } else if ( match[2] ) {
+                                Sizzle.error( match[0] );
+                        }
+
+                        return match;
+                },
+
+                "PSEUDO": function( match ) {
+                        var unquoted, excess;
+                        if ( matchExpr["CHILD"].test( match[0] ) ) {
+                                return null;
+                        }
+
+                        if ( match[3] ) {
+                                match[2] = match[3];
+                        } else if ( (unquoted = match[4]) ) {
+                                // Only check arguments that contain a pseudo
+                                if ( 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
+                                        unquoted = unquoted.slice( 0, excess );
+                                        match[0] = match[0].slice( 0, excess );
+                                }
+                                match[2] = unquoted;
+                        }
+
+                        // Return only captures needed by the pseudo filter method (type and argument)
+                        return match.slice( 0, 3 );
+                }
+        },
+
+        filter: {
+                "ID": assertGetIdNotName ?
+                        function( id ) {
+                                id = id.replace( rbackslash, "" );
+                                return function( elem ) {
+                                        return elem.getAttribute("id") === id;
+                                };
+                        } :
+                        function( id ) {
+                                id = id.replace( rbackslash, "" );
+                                return function( elem ) {
+                                        var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+                                        return node && node.value === id;
+                                };
+                        },
+
+                "TAG": function( nodeName ) {
+                        if ( nodeName === "*" ) {
+                                return function() { return true; };
+                        }
+                        nodeName = nodeName.replace( rbackslash, "" ).toLowerCase();
+
+                        return function( elem ) {
+                                return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+                        };
+                },
+
+                "CLASS": function( className ) {
+                        var pattern = classCache[ expando ][ 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, context ) {
+                                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, argument, first, last ) {
+
+                        if ( type === "nth" ) {
+                                return function( elem ) {
+                                        var node, diff,
+                                                parent = elem.parentNode;
+
+                                        if ( first === 1 && last === 0 ) {
+                                                return true;
+                                        }
+
+                                        if ( parent ) {
+                                                diff = 0;
+                                                for ( node = parent.firstChild; node; node = node.nextSibling ) {
+                                                        if ( node.nodeType === 1 ) {
+                                                                diff++;
+                                                                if ( elem === node ) {
+                                                                        break;
+                                                                }
+                                                        }
+                                                }
+                                        }
+
+                                        // Incorporate the offset (or cast to NaN), then check against cycle size
+                                        diff -= last;
+                                        return diff === first || ( diff % first === 0 && diff / first >= 0 );
+                                };
+                        }
+
+                        return function( elem ) {
+                                var node = elem;
+
+                                switch ( type ) {
+                                        case "only":
+                                        case "first":
+                                                while ( (node = node.previousSibling) ) {
+                                                        if ( node.nodeType === 1 ) {
+                                                                return false;
+                                                        }
+                                                }
+
+                                                if ( type === "first" ) {
+                                                        return true;
+                                                }
+
+                                                node = elem;
+
+                                                /* falls through */
+                                        case "last":
+                                                while ( (node = node.nextSibling) ) {
+                                                        if ( node.nodeType === 1 ) {
+                                                                return false;
+                                                        }
+                                                }
+
+                                                return true;
+                                }
+                        };
+                },
+
+                "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: {
+                "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;
+                        };
+                }),
+
+                "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;
+                },
+
+                "parent": function( elem ) {
+                        return !Expr.pseudos["empty"]( elem );
+                },
+
+                "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 "?")
+                        var nodeType;
+                        elem = elem.firstChild;
+                        while ( elem ) {
+                                if ( elem.nodeName > "@" || (nodeType = elem.nodeType) === 3 || nodeType === 4 ) {
+                                        return false;
+                                }
+                                elem = elem.nextSibling;
+                        }
+                        return true;
+                },
+
+                "header": function( elem ) {
+                        return rheader.test( elem.nodeName );
+                },
+
+                "text": function( elem ) {
+                        var type, 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" &&
+                                (type = elem.type) === "text" &&
+                                ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === type );
+                },
+
+                // Input types
+                "radio": createInputPseudo("radio"),
+                "checkbox": createInputPseudo("checkbox"),
+                "file": createInputPseudo("file"),
+                "password": createInputPseudo("password"),
+                "image": createInputPseudo("image"),
+
+                "submit": createButtonPseudo("submit"),
+                "reset": createButtonPseudo("reset"),
+
+                "button": function( elem ) {
+                        var name = elem.nodeName.toLowerCase();
+                        return name === "input" && elem.type === "button" || name === "button";
+                },
+
+                "input": function( elem ) {
+                        return rinputs.test( elem.nodeName );
+                },
+
+                "focus": function( elem ) {
+                        var doc = elem.ownerDocument;
+                        return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+                },
+
+                "active": function( elem ) {
+                        return elem === elem.ownerDocument.activeElement;
+                },
+
+                // Positional types
+                "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 ) {
+                        for ( var i = 0; i < length; i += 2 ) {
+                                matchIndexes.push( i );
+                        }
+                        return matchIndexes;
+                }),
+
+                "odd": createPositionalPseudo(function( matchIndexes, length ) {
+                        for ( var i = 1; i < length; i += 2 ) {
+                                matchIndexes.push( i );
+                        }
+                        return matchIndexes;
+                }),
+
+                "lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+                        for ( var i = argument < 0 ? argument + length : argument; --i >= 0; ) {
+                                matchIndexes.push( i );
+                        }
+                        return matchIndexes;
+                }),
+
+                "gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+                        for ( var i = argument < 0 ? argument + length : argument; ++i < length; ) {
+                                matchIndexes.push( i );
+                        }
+                        return matchIndexes;
+                })
+        }
+};
+
+function siblingCheck( a, b, ret ) {
+        if ( a === b ) {
+                return ret;
+        }
+
+        var cur = a.nextSibling;
+
+        while ( cur ) {
+                if ( cur === b ) {
+                        return -1;
+                }
+
+                cur = cur.nextSibling;
+        }
+
+        return 1;
+}
+
+sortOrder = docElem.compareDocumentPosition ?
+        function( a, b ) {
+                if ( a === b ) {
+                        hasDuplicate = true;
+                        return 0;
+                }
+
+                return ( !a.compareDocumentPosition || !b.compareDocumentPosition ?
+                        a.compareDocumentPosition :
+                        a.compareDocumentPosition(b) & 4
+                ) ? -1 : 1;
+        } :
+        function( a, 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 a.sourceIndex - b.sourceIndex;
+                }
+
+                var al, bl,
+                        ap = [],
+                        bp = [],
+                        aup = a.parentNode,
+                        bup = b.parentNode,
+                        cur = aup;
+
+                // If the nodes are siblings (or identical) we can do a quick check
+                if ( aup === bup ) {
+                        return siblingCheck( a, b );
+
+                // If no parents were found then the nodes are disconnected
+                } else if ( !aup ) {
+                        return -1;
+
+                } else if ( !bup ) {
+                        return 1;
+                }
+
+                // Otherwise they're somewhere else in the tree so we need
+                // to build up a full list of the parentNodes for comparison
+                while ( cur ) {
+                        ap.unshift( cur );
+                        cur = cur.parentNode;
+                }
+
+                cur = bup;
+
+                while ( cur ) {
+                        bp.unshift( cur );
+                        cur = cur.parentNode;
+                }
+
+                al = ap.length;
+                bl = bp.length;
+
+                // Start walking down the tree looking for a discrepancy
+                for ( var i = 0; i < al && i < bl; i++ ) {
+                        if ( ap[i] !== bp[i] ) {
+                                return siblingCheck( ap[i], bp[i] );
+                        }
+                }
+
+                // We ended someplace up the tree so do a sibling check
+                return i === al ?
+                        siblingCheck( a, bp[i], -1 ) :
+                        siblingCheck( ap[i], b, 1 );
+        };
+
+// Always assume the presence of duplicates if sort doesn't
+// pass them to our comparison function (as in Google Chrome).
+[0, 0].sort( sortOrder );
+baseHasDuplicate = !hasDuplicate;
+
+// Document sorting and removing duplicates
+Sizzle.uniqueSort = function( results ) {
+        var elem,
+                duplicates = [],
+                i = 1,
+                j = 0;
+
+        hasDuplicate = baseHasDuplicate;
+        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;
+};
+
+Sizzle.error = function( msg ) {
+        throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+function tokenize( selector, parseOnly ) {
+        var matched, match, tokens, type,
+                soFar, groups, preFilters,
+                cached = tokenCache[ expando ][ 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 )) ) {
+                        tokens.push( matched = new Token( match.shift() ) );
+                        soFar = soFar.slice( matched.length );
+
+                        // Cast descendant combinators to space
+                        matched.type = match[0].replace( rtrim, " " );
+                }
+
+                // Filters
+                for ( type in Expr.filter ) {
+                        if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
+                                (match = preFilters[ type ]( match ))) ) {
+
+                                tokens.push( matched = new Token( match.shift() ) );
+                                soFar = soFar.slice( matched.length );
+                                matched.type = type;
+                                matched.matches = match;
+                        }
+                }
+
+                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 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 ( checkNonElements || elem.nodeType === 1  ) {
+                                        return matcher( elem, context, xml );
+                                }
+                        }
+                } :
+
+                // Check against all ancestor/preceding elements
+                function( elem, context, xml ) {
+                        // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+                        if ( !xml ) {
+                                var cache,
+                                        dirkey = dirruns + " " + doneName + " ",
+                                        cachedkey = dirkey + cachedruns;
+                                while ( (elem = elem[ dir ]) ) {
+                                        if ( checkNonElements || elem.nodeType === 1 ) {
+                                                if ( (cache = elem[ expando ]) === cachedkey ) {
+                                                        return elem.sizset;
+                                                } else if ( typeof cache === "string" && cache.indexOf(dirkey) === 0 ) {
+                                                        if ( elem.sizset ) {
+                                                                return elem;
+                                                        }
+                                                } else {
+                                                        elem[ expando ] = cachedkey;
+                                                        if ( matcher( elem, context, xml ) ) {
+                                                                elem.sizset = true;
+                                                                return elem;
+                                                        }
+                                                        elem.sizset = false;
+                                                }
+                                        }
+                                }
+                        } else {
+                                while ( (elem = elem[ dir ]) ) {
+                                        if ( checkNonElements || elem.nodeType === 1 ) {
+                                                if ( matcher( elem, context, xml ) ) {
+                                                        return elem;
+                                                }
+                                        }
+                                }
+                        }
+                };
+}
+
+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 && tokens.slice( 0, i - 1 ).join("").replace( rtrim, "$1" ),
+                                        matcher,
+                                        i < j && matcherFromTokens( tokens.slice( i, j ) ),
+                                        j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+                                        j < len && tokens.join("")
+                                );
+                        }
+                        matchers.push( matcher );
+                }
+        }
+
+        return elementMatcher( matchers );
+}
+
+function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
+        var 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 = superMatcher.el;
+                        }
+
+                        // 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 = ++superMatcher.el;
+                                        }
+                                }
+
+                                // 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
+                        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;
+                };
+
+        superMatcher.el = 0;
+        return bySet ?
+                markFunction( superMatcher ) :
+                superMatcher;
+}
+
+compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
+        var i,
+                setMatchers = [],
+                elementMatchers = [],
+                cached = compilerCache[ expando ][ 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, xml ) {
+        var i, tokens, token, type, find,
+                match = tokenize( selector ),
+                j = match.length;
+
+        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 && !xml &&
+                                        Expr.relative[ tokens[1].type ] ) {
+
+                                context = Expr.find["ID"]( token.matches[0].replace( rbackslash, "" ), context, xml )[0];
+                                if ( !context ) {
+                                        return results;
+                                }
+
+                                selector = selector.slice( tokens.shift().length );
+                        }
+
+                        // Fetch a seed set for right-to-left matching
+                        for ( i = matchExpr["POS"].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( rbackslash, "" ),
+                                                rsibling.test( tokens[0].type ) && context.parentNode || context,
+                                                xml
+                                        )) ) {
+
+                                                // If seed is empty or no tokens remain, we can return early
+                                                tokens.splice( i, 1 );
+                                                selector = seed.length && tokens.join("");
+                                                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,
+                xml,
+                results,
+                rsibling.test( selector )
+        );
+        return results;
+}
+
+if ( document.querySelectorAll ) {
+        (function() {
+                var disconnectedMatch,
+                        oldSelect = select,
+                        rescape = /'|\\/g,
+                        rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
+
+                        // 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" ],
+
+                        // matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+                        // A support test would require too much code (would include document ready)
+                        // just skip matchesSelector for :active
+                        rbuggyMatches = [ ":active" ],
+                        matches = docElem.matchesSelector ||
+                                docElem.mozMatchesSelector ||
+                                docElem.webkitMatchesSelector ||
+                                docElem.oMatchesSelector ||
+                                docElem.msMatchesSelector;
+
+                // 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 (do not put tests after this one)
+                        if ( !div.querySelectorAll(":checked").length ) {
+                                rbuggyQSA.push(":checked");
+                        }
+                });
+
+                assert(function( div ) {
+
+                        // Opera 10-12/IE9 - ^= $= *= and empty values
+                        // Should not select anything
+                        div.innerHTML = "<p test=''></p>";
+                        if ( div.querySelectorAll("[test^='']").length ) {
+                                rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
+                        }
+
+                        // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+                        // IE8 throws error here (do not put tests after this one)
+                        div.innerHTML = "<input type='hidden'/>";
+                        if ( !div.querySelectorAll(":enabled").length ) {
+                                rbuggyQSA.push(":enabled", ":disabled");
+                        }
+                });
+
+                // rbuggyQSA always contains :focus, so no need for a length check
+                rbuggyQSA = /* rbuggyQSA.length && */ new RegExp( rbuggyQSA.join("|") );
+
+                select = function( selector, context, results, seed, xml ) {
+                        // Only use querySelectorAll when not filtering,
+                        // when this is not xml,
+                        // and when no QSA bugs apply
+                        if ( !seed && !xml && !rbuggyQSA.test( selector ) ) {
+                                var groups, i,
+                                        old = true,
+                                        nid = expando,
+                                        newContext = context,
+                                        newSelector = context.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 ( context.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 + groups[i].join("");
+                                        }
+                                        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");
+                                                }
+                                        }
+                                }
+                        }
+
+                        return oldSelect( selector, context, results, seed, xml );
+                };
+
+                if ( matches ) {
+                        assert(function( div ) {
+                                // Check to see if it's possible to do matchesSelector
+                                // on a disconnected node (IE 9)
+                                disconnectedMatch = matches.call( div, "div" );
+
+                                // This should fail with an exception
+                                // Gecko does not error, returns false instead
+                                try {
+                                        matches.call( div, "[test!='']:sizzle" );
+                                        rbuggyMatches.push( "!=", pseudos );
+                                } catch ( e ) {}
+                        });
+
+                        // rbuggyMatches always contains :active and :focus, so no need for a length check
+                        rbuggyMatches = /* rbuggyMatches.length && */ new RegExp( rbuggyMatches.join("|") );
+
+                        Sizzle.matchesSelector = function( elem, expr ) {
+                                // Make sure that attribute selectors are quoted
+                                expr = expr.replace( rattributeQuotes, "='$1']" );
+
+                                // rbuggyMatches always contains :active, so no need for an existence check
+                                if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && !rbuggyQSA.test( expr ) ) {
+                                        try {
+                                                var ret = matches.call( elem, expr );
+
+                                                // IE 9's matchesSelector returns false on disconnected nodes
+                                                if ( ret || 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, null, null, [ elem ] ).length > 0;
+                        };
+                }
+        })();
+}
+
+// Deprecated
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
+// Back-compat
+function setFilters() {}
+Expr.filters = setFilters.prototype = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
+// 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, l, length, n, r, ret,
+                        self = this;
+
+                if ( typeof selector !== "string" ) {
+                        return jQuery( selector ).filter(function() {
+                                for ( i = 0, l = self.length; i < l; i++ ) {
+                                        if ( jQuery.contains( self[ i ], this ) ) {
+                                                return true;
+                                        }
+                                }
+                        });
+                }
+
+                ret = this.pushStack( "", "find", selector );
+
+                for ( i = 0, l = this.length; i < l; i++ ) {
+                        length = ret.length;
+                        jQuery.find( selector, this[i], ret );
+
+                        if ( i > 0 ) {
+                                // Make sure that the results are unique
+                                for ( n = length; n < ret.length; n++ ) {
+                                        for ( r = 0; r < length; r++ ) {
+                                                if ( ret[r] === ret[n] ) {
+                                                        ret.splice(n--, 1);
+                                                        break;
+                                                }
+                                        }
+                                }
+                        }
+                }
+
+                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), "not", selector);
+        },
+
+        filter: function( selector ) {
+                return this.pushStack( winnow(this, selector, true), "filter", selector );
+        },
+
+        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;
+                        }
+                }
+
+                ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
+
+                return this.pushStack( ret, "closest", selectors );
+        },
+
+        // 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.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( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+                        all :
+                        jQuery.unique( all ) );
+        },
+
+        addBack: function( selector ) {
+                return this.add( selector == null ?
+                        this.prevObject : this.prevObject.filter(selector)
+                );
+        }
+});
+
+jQuery.fn.andSelf = jQuery.fn.addBack;
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+        return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+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, name, core_slice.call( arguments ).join(",") );
+        };
+});
+
+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, i ) {
+                        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, i ) {
+                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,
+        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,
+        rnocache = /<(?:script|object|embed|option|style)/i,
+        rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+        rcheckableType = /^(?:checkbox|radio)$/,
+        // checked="checked" or checked
+        rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+        rscriptType = /\/(java|ecma)script/i,
+        rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,
+        wrapMap = {
+                option: [ 1, "<select multiple='multiple'>", "</select>" ],
+                legend: [ 1, "<fieldset>", "</fieldset>" ],
+                thead: [ 1, "<table>", "</table>" ],
+                tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+                td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+                col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+                area: [ 1, "<map>", "</map>" ],
+                _default: [ 0, "", "" ]
+        },
+        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;
+
+// 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.
+if ( !jQuery.support.htmlSerialize ) {
+        wrapMap._default = [ 1, "X<div>", "</div>" ];
+}
+
+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.appendChild( elem );
+                        }
+                });
+        },
+
+        prepend: function() {
+                return this.domManip(arguments, true, function( elem ) {
+                        if ( this.nodeType === 1 || this.nodeType === 11 ) {
+                                this.insertBefore( elem, this.firstChild );
+                        }
+                });
+        },
+
+        before: function() {
+                if ( !isDisconnected( this[0] ) ) {
+                        return this.domManip(arguments, false, function( elem ) {
+                                this.parentNode.insertBefore( elem, this );
+                        });
+                }
+
+                if ( arguments.length ) {
+                        var set = jQuery.clean( arguments );
+                        return this.pushStack( jQuery.merge( set, this ), "before", this.selector );
+                }
+        },
+
+        after: function() {
+                if ( !isDisconnected( this[0] ) ) {
+                        return this.domManip(arguments, false, function( elem ) {
+                                this.parentNode.insertBefore( elem, this.nextSibling );
+                        });
+                }
+
+                if ( arguments.length ) {
+                        var set = jQuery.clean( arguments );
+                        return this.pushStack( jQuery.merge( this, set ), "after", this.selector );
+                }
+        },
+
+        // 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 ) {
+                                if ( !keepData && elem.nodeType === 1 ) {
+                                        jQuery.cleanData( elem.getElementsByTagName("*") );
+                                        jQuery.cleanData( [ elem ] );
+                                }
+
+                                if ( elem.parentNode ) {
+                                        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( elem.getElementsByTagName("*") );
+                        }
+
+                        // Remove any remaining nodes
+                        while ( elem.firstChild ) {
+                                elem.removeChild( elem.firstChild );
+                        }
+                }
+
+                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( elem.getElementsByTagName( "*" ) );
+                                                        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 ) {
+                if ( !isDisconnected( this[0] ) ) {
+                        // 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 ( jQuery.isFunction( value ) ) {
+                                return this.each(function(i) {
+                                        var self = jQuery(this), old = self.html();
+                                        self.replaceWith( value.call( this, i, old ) );
+                                });
+                        }
+
+                        if ( typeof value !== "string" ) {
+                                value = jQuery( value ).detach();
+                        }
+
+                        return this.each(function() {
+                                var next = this.nextSibling,
+                                        parent = this.parentNode;
+
+                                jQuery( this ).remove();
+
+                                if ( next ) {
+                                        jQuery(next).before( value );
+                                } else {
+                                        jQuery(parent).append( value );
+                                }
+                        });
+                }
+
+                return this.length ?
+                        this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+                        this;
+        },
+
+        detach: function( selector ) {
+                return this.remove( selector, true );
+        },
+
+        domManip: function( args, table, callback ) {
+
+                // Flatten any nested arrays
+                args = [].concat.apply( [], args );
+
+                var results, first, fragment, iNoClone,
+                        i = 0,
+                        value = args[0],
+                        scripts = [],
+                        l = this.length;
+
+                // We can't cloneNode fragments that contain checked, in WebKit
+                if ( !jQuery.support.checkClone && l > 1 && typeof value === "string" && rchecked.test( value ) ) {
+                        return this.each(function() {
+                                jQuery(this).domManip( args, table, callback );
+                        });
+                }
+
+                if ( jQuery.isFunction(value) ) {
+                        return this.each(function(i) {
+                                var self = jQuery(this);
+                                args[0] = value.call( this, i, table ? self.html() : undefined );
+                                self.domManip( args, table, callback );
+                        });
+                }
+
+                if ( this[0] ) {
+                        results = jQuery.buildFragment( args, this, scripts );
+                        fragment = results.fragment;
+                        first = fragment.firstChild;
+
+                        if ( fragment.childNodes.length === 1 ) {
+                                fragment = first;
+                        }
+
+                        if ( first ) {
+                                table = table && jQuery.nodeName( first, "tr" );
+
+                                // Use the original fragment for the last item instead of the first because it can end up
+                                // being emptied incorrectly in certain situations (#8070).
+                                // Fragments from the fragment cache must always be cloned and never used in place.
+                                for ( iNoClone = results.cacheable || l - 1; i < l; i++ ) {
+                                        callback.call(
+                                                table && jQuery.nodeName( this[i], "table" ) ?
+                                                        findOrAppend( this[i], "tbody" ) :
+                                                        this[i],
+                                                i === iNoClone ?
+                                                        fragment :
+                                                        jQuery.clone( fragment, true, true )
+                                        );
+                                }
+                        }
+
+                        // Fix #11809: Avoid leaking memory
+                        fragment = first = null;
+
+                        if ( scripts.length ) {
+                                jQuery.each( scripts, function( i, elem ) {
+                                        if ( elem.src ) {
+                                                if ( jQuery.ajax ) {
+                                                        jQuery.ajax({
+                                                                url: elem.src,
+                                                                type: "GET",
+                                                                dataType: "script",
+                                                                async: false,
+                                                                global: false,
+                                                                "throws": true
+                                                        });
+                                                } else {
+                                                        jQuery.error("no ajax");
+                                                }
+                                        } else {
+                                                jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) );
+                                        }
+
+                                        if ( elem.parentNode ) {
+                                                elem.parentNode.removeChild( elem );
+                                        }
+                                });
+                        }
+                }
+
+                return this;
+        }
+});
+
+function findOrAppend( elem, tag ) {
+        return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
+}
+
+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 cloneFixAttributes( src, dest ) {
+        var nodeName;
+
+        // We do not need to do anything for non-Elements
+        if ( dest.nodeType !== 1 ) {
+                return;
+        }
+
+        // clearAttributes removes the attributes, which we don't want,
+        // but also removes the attachEvent events, which we *do* want
+        if ( dest.clearAttributes ) {
+                dest.clearAttributes();
+        }
+
+        // mergeAttributes, in contrast, only merges back on the
+        // original attributes, not the events
+        if ( dest.mergeAttributes ) {
+                dest.mergeAttributes( src );
+        }
+
+        nodeName = dest.nodeName.toLowerCase();
+
+        if ( nodeName === "object" ) {
+                // IE6-10 improperly clones children of object elements using classid.
+                // IE10 throws NoModificationAllowedError if parent is null, #12132.
+                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" && 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.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;
+
+        // IE blanks contents when cloning scripts
+        } else if ( nodeName === "script" && dest.text !== src.text ) {
+                dest.text = src.text;
+        }
+
+        // Event data gets referenced instead of copied if the expando
+        // gets copied too
+        dest.removeAttribute( jQuery.expando );
+}
+
+jQuery.buildFragment = function( args, context, scripts ) {
+        var fragment, cacheable, cachehit,
+                first = args[ 0 ];
+
+        // Set context from what may come in as undefined or a jQuery collection or a node
+        // Updated to fix #12266 where accessing context[0] could throw an exception in IE9/10 &
+        // also doubles as fix for #8950 where plain objects caused createDocumentFragment exception
+        context = context || document;
+        context = !context.nodeType && context[0] || context;
+        context = context.ownerDocument || context;
+
+        // Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+        // Cloning options loses the selected state, so don't cache them
+        // IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+        // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+        // Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
+        if ( args.length === 1 && typeof first === "string" && first.length < 512 && context === document &&
+                first.charAt(0) === "<" && !rnocache.test( first ) &&
+                (jQuery.support.checkClone || !rchecked.test( first )) &&
+                (jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
+
+                // Mark cacheable and look for a hit
+                cacheable = true;
+                fragment = jQuery.fragments[ first ];
+                cachehit = fragment !== undefined;
+        }
+
+        if ( !fragment ) {
+                fragment = context.createDocumentFragment();
+                jQuery.clean( args, context, fragment, scripts );
+
+                // Update the cache, but only store false
+                // unless this is a second parsing of the same content
+                if ( cacheable ) {
+                        jQuery.fragments[ first ] = cachehit && fragment;
+                }
+        }
+
+        return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+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 ),
+                        l = insert.length,
+                        parent = this.length === 1 && this[0].parentNode;
+
+                if ( (parent == null || parent && parent.nodeType === 11 && parent.childNodes.length === 1) && l === 1 ) {
+                        insert[ original ]( this[0] );
+                        return this;
+                } else {
+                        for ( ; i < l; i++ ) {
+                                elems = ( i > 0 ? this.clone(true) : this ).get();
+                                jQuery( insert[i] )[ original ]( elems );
+                                ret = ret.concat( elems );
+                        }
+
+                        return this.pushStack( ret, name, insert.selector );
+                }
+        };
+});
+
+function getAll( elem ) {
+        if ( typeof elem.getElementsByTagName !== "undefined" ) {
+                return elem.getElementsByTagName( "*" );
+
+        } else if ( typeof elem.querySelectorAll !== "undefined" ) {
+                return elem.querySelectorAll( "*" );
+
+        } else {
+                return [];
+        }
+}
+
+// Used in clean, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+        if ( rcheckableType.test( elem.type ) ) {
+                elem.defaultChecked = elem.checked;
+        }
+}
+
+jQuery.extend({
+        clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+                var srcElements,
+                        destElements,
+                        i,
+                        clone;
+
+                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) ) {
+                        // IE copies events bound via attachEvent when using cloneNode.
+                        // Calling detachEvent on the clone will also remove the events
+                        // from the original. In order to get around this, we use some
+                        // proprietary methods to clear the events. Thanks to MooTools
+                        // guys for this hotness.
+
+                        cloneFixAttributes( elem, clone );
+
+                        // Using Sizzle here is crazy slow, so we use getElementsByTagName instead
+                        srcElements = getAll( elem );
+                        destElements = getAll( clone );
+
+                        // Weird iteration because IE will replace the length property
+                        // with an element if you are cloning the body and one of the
+                        // elements on the page has a name or id of "length"
+                        for ( i = 0; srcElements[i]; ++i ) {
+                                // Ensure that the destination node is not null; Fixes #9587
+                                if ( destElements[i] ) {
+                                        cloneFixAttributes( srcElements[i], destElements[i] );
+                                }
+                        }
+                }
+
+                // Copy the events from the original to the clone
+                if ( dataAndEvents ) {
+                        cloneCopyEvent( elem, clone );
+
+                        if ( deepDataAndEvents ) {
+                                srcElements = getAll( elem );
+                                destElements = getAll( clone );
+
+                                for ( i = 0; srcElements[i]; ++i ) {
+                                        cloneCopyEvent( srcElements[i], destElements[i] );
+                                }
+                        }
+                }
+
+                srcElements = destElements = null;
+
+                // Return the cloned set
+                return clone;
+        },
+
+        clean: function( elems, context, fragment, scripts ) {
+                var i, j, elem, tag, wrap, depth, div, hasBody, tbody, len, handleScript, jsTags,
+                        safe = context === document && safeFragment,
+                        ret = [];
+
+                // Ensure that context is a document
+                if ( !context || typeof context.createDocumentFragment === "undefined" ) {
+                        context = document;
+                }
+
+                // Use the already-created safe fragment if context permits
+                for ( i = 0; (elem = elems[i]) != null; i++ ) {
+                        if ( typeof elem === "number" ) {
+                                elem += "";
+                        }
+
+                        if ( !elem ) {
+                                continue;
+                        }
+
+                        // Convert html string into DOM nodes
+                        if ( typeof elem === "string" ) {
+                                if ( !rhtml.test( elem ) ) {
+                                        elem = context.createTextNode( elem );
+                                } else {
+                                        // Ensure a safe container in which to render the html
+                                        safe = safe || createSafeFragment( context );
+                                        div = context.createElement("div");
+                                        safe.appendChild( div );
+
+                                        // Fix "XHTML"-style tags in all browsers
+                                        elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+                                        // Go to html and back, then peel off extra wrappers
+                                        tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
+                                        wrap = wrapMap[ tag ] || wrapMap._default;
+                                        depth = wrap[0];
+                                        div.innerHTML = wrap[1] + elem + wrap[2];
+
+                                        // Move to the right depth
+                                        while ( depth-- ) {
+                                                div = div.lastChild;
+                                        }
+
+                                        // Remove IE's autoinserted <tbody> from table fragments
+                                        if ( !jQuery.support.tbody ) {
+
+                                                // String was a <table>, *may* have spurious <tbody>
+                                                hasBody = rtbody.test(elem);
+                                                        tbody = tag === "table" && !hasBody ?
+                                                                div.firstChild && div.firstChild.childNodes :
+
+                                                                // String was a bare <thead> or <tfoot>
+                                                                wrap[1] === "<table>" && !hasBody ?
+                                                                        div.childNodes :
+                                                                        [];
+
+                                                for ( j = tbody.length - 1; j >= 0 ; --j ) {
+                                                        if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+                                                                tbody[ j ].parentNode.removeChild( tbody[ j ] );
+                                                        }
+                                                }
+                                        }
+
+                                        // IE completely kills leading whitespace when innerHTML is used
+                                        if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+                                                div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+                                        }
+
+                                        elem = div.childNodes;
+
+                                        // Take out of fragment container (we need a fresh div each time)
+                                        div.parentNode.removeChild( div );
+                                }
+                        }
+
+                        if ( elem.nodeType ) {
+                                ret.push( elem );
+                        } else {
+                                jQuery.merge( ret, elem );
+                        }
+                }
+
+                // Fix #11356: Clear elements from safeFragment
+                if ( div ) {
+                        elem = div = safe = null;
+                }
+
+                // Reset defaultChecked for any radios and checkboxes
+                // about to be appended to the DOM in IE 6/7 (#8060)
+                if ( !jQuery.support.appendChecked ) {
+                        for ( i = 0; (elem = ret[i]) != null; i++ ) {
+                                if ( jQuery.nodeName( elem, "input" ) ) {
+                                        fixDefaultChecked( elem );
+                                } else if ( typeof elem.getElementsByTagName !== "undefined" ) {
+                                        jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
+                                }
+                        }
+                }
+
+                // Append elements to a provided document fragment
+                if ( fragment ) {
+                        // Special handling of each script element
+                        handleScript = function( elem ) {
+                                // Check if we consider it executable
+                                if ( !elem.type || rscriptType.test( elem.type ) ) {
+                                        // Detach the script and store it in the scripts array (if provided) or the fragment
+                                        // Return truthy to indicate that it has been handled
+                                        return scripts ?
+                                                scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
+                                                fragment.appendChild( elem );
+                                }
+                        };
+
+                        for ( i = 0; (elem = ret[i]) != null; i++ ) {
+                                // Check if we're done after handling an executable script
+                                if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
+                                        // Append to fragment and handle embedded scripts
+                                        fragment.appendChild( elem );
+                                        if ( typeof elem.getElementsByTagName !== "undefined" ) {
+                                                // handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
+                                                jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
+
+                                                // Splice the scripts into ret after their former ancestor and advance our index beyond them
+                                                ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+                                                i += jsTags.length;
+                                        }
+                                }
+                        }
+                }
+
+                return ret;
+        },
+
+        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 ( elem.removeAttribute ) {
+                                                        elem.removeAttribute( internalKey );
+
+                                                } else {
+                                                        elem[ internalKey ] = null;
+                                                }
+
+                                                jQuery.deletedIds.push( id );
+                                        }
+                                }
+                        }
+                }
+        }
+});
+// Limit scope pollution from any deprecated API
+(function() {
+
+var matched, browser;
+
+// Use of jQuery.browser is frowned upon.
+// More details: http://api.jquery.com/jQuery.browser
+// jQuery.uaMatch maintained for back-compat
+jQuery.uaMatch = function( ua ) {
+        ua = ua.toLowerCase();
+
+        var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+                /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+                /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+                /(msie) ([\w.]+)/.exec( ua ) ||
+                ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+                [];
+
+        return {
+                browser: match[ 1 ] || "",
+                version: match[ 2 ] || "0"
+        };
+};
+
+matched = jQuery.uaMatch( navigator.userAgent );
+browser = {};
+
+if ( matched.browser ) {
+        browser[ matched.browser ] = true;
+        browser.version = matched.version;
+}
+
+// Chrome is Webkit, but Webkit is also Safari.
+if ( browser.chrome ) {
+        browser.webkit = true;
+} else if ( browser.webkit ) {
+        browser.safari = true;
+}
+
+jQuery.browser = browser;
+
+jQuery.sub = function() {
+        function jQuerySub( selector, context ) {
+                return new jQuerySub.fn.init( selector, context );
+        }
+        jQuery.extend( true, jQuerySub, this );
+        jQuerySub.superclass = this;
+        jQuerySub.fn = jQuerySub.prototype = this();
+        jQuerySub.fn.constructor = jQuerySub;
+        jQuerySub.sub = this.sub;
+        jQuerySub.fn.init = function init( selector, context ) {
+                if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+                        context = jQuerySub( context );
+                }
+
+                return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+        };
+        jQuerySub.fn.init.prototype = jQuerySub.fn;
+        var rootjQuerySub = jQuerySub(document);
+        return jQuerySub;
+};
+
+})();
+var curCSS, iframe, iframeDoc,
+        ralpha = /alpha\([^)]*\)/i,
+        ropacity = /opacity=([^)]*)/,
+        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" ],
+
+        eventsToggle = jQuery.fn.toggle;
+
+// 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 ) {
+        elem = el || elem;
+        return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
+}
+
+function showHide( elements, show ) {
+        var elem, display,
+                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 {
+                        display = curCSS( elem, "display" );
+
+                        if ( !values[ index ] && display !== "none" ) {
+                                jQuery._data( elem, "olddisplay", 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 ) {
+                        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, fn2 ) {
+                var bool = typeof state === "boolean";
+
+                if ( jQuery.isFunction( state ) && jQuery.isFunction( fn2 ) ) {
+                        return eventsToggle.apply( this, arguments );
+                }
+
+                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: {
+                "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";
+                        }
+
+                        // 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, numeric, extra ) {
+                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 );
+                }
+
+                //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 ( numeric || extra !== undefined ) {
+                        num = parseFloat( val );
+                        return numeric || 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 ) {
+                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.call( elem );
+
+                // Revert the old values
+                for ( name in options ) {
+                        elem.style[ name ] = old[ name ];
+                }
+
+                return ret;
+        }
+});
+
+// NOTE: To any future maintainer, we've window.getComputedStyle
+// because jsdom on node.js will break without it.
+if ( window.getComputedStyle ) {
+        curCSS = function( elem, name ) {
+                var ret, width, minWidth, maxWidth,
+                        computed = window.getComputedStyle( elem, null ),
+                        style = elem.style;
+
+                if ( computed ) {
+
+                        // getPropertyValue is only needed for .css('filter') in IE9, see #12537
+                        ret = computed.getPropertyValue( name ) || computed[ name ];
+
+                        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 ) ) {
+                                width = style.width;
+                                minWidth = style.minWidth;
+                                maxWidth = style.maxWidth;
+
+                                style.minWidth = style.maxWidth = style.width = ret;
+                                ret = computed.width;
+
+                                style.width = width;
+                                style.minWidth = minWidth;
+                                style.maxWidth = maxWidth;
+                        }
+                }
+
+                return ret;
+        };
+} else if ( document.documentElement.currentStyle ) {
+        curCSS = function( elem, name ) {
+                var left, rsLeft,
+                        ret = elem.currentStyle && elem.currentStyle[ name ],
+                        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;
+                        rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
+
+                        // Put in the new values to get a computed value out
+                        if ( rsLeft ) {
+                                elem.runtimeStyle.left = elem.currentStyle.left;
+                        }
+                        style.left = name === "fontSize" ? "1em" : ret;
+                        ret = style.pixelLeft + "px";
+
+                        // Revert the changed values
+                        style.left = left;
+                        if ( rsLeft ) {
+                                elem.runtimeStyle.left = rsLeft;
+                        }
+                }
+
+                return ret === "" ? "auto" : ret;
+        };
+}
+
+function setPositiveNumber( elem, value, subtract ) {
+        var matches = rnumsplit.exec( value );
+        return matches ?
+                        Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
+                        value;
+}
+
+function augmentWidthOrHeight( elem, name, extra, isBorderBox ) {
+        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" ) {
+                        // we use jQuery.css instead of curCSS here
+                        // because of the reliableMarginRight CSS hook!
+                        val += jQuery.css( elem, extra + cssExpand[ i ], true );
+                }
+
+                // From this point on we use curCSS for maximum performance (relevant in animations)
+                if ( isBorderBox ) {
+                        // border-box includes padding, so remove it if we want content
+                        if ( extra === "content" ) {
+                                val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
+                        }
+
+                        // at this point, extra isn't border nor margin, so remove border
+                        if ( extra !== "margin" ) {
+                                val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+                        }
+                } else {
+                        // at this point, extra isn't content, so add padding
+                        val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
+
+                        // at this point, extra isn't content nor padding, so add border
+                        if ( extra !== "padding" ) {
+                                val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+                        }
+                }
+        }
+
+        return val;
+}
+
+function getWidthOrHeight( elem, name, extra ) {
+
+        // Start with offset property, which is equivalent to the border-box value
+        var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+                valueIsBorderBox = true,
+                isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "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 );
+                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
+                )
+        ) + "px";
+}
+
+
+// Try to determine the default display value of an element
+function css_defaultDisplay( nodeName ) {
+        if ( elemdisplay[ nodeName ] ) {
+                return elemdisplay[ nodeName ];
+        }
+
+        var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ),
+                display = elem.css("display");
+        elem.remove();
+
+        // If the simple way fails,
+        // get element's real default display by attaching it to a temp iframe
+        if ( display === "none" || display === "" ) {
+                // Use the already-created iframe if possible
+                iframe = document.body.appendChild(
+                        iframe || jQuery.extend( document.createElement("iframe"), {
+                                frameBorder: 0,
+                                width: 0,
+                                height: 0
+                        })
+                );
+
+                // Create a cacheable copy of the iframe document on first call.
+                // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+                // document to it; WebKit & Firefox won't allow reusing the iframe document.
+                if ( !iframeDoc || !iframe.createElement ) {
+                        iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+                        iframeDoc.write("<!doctype html><html><body>");
+                        iframeDoc.close();
+                }
+
+                elem = iframeDoc.body.appendChild( iframeDoc.createElement(nodeName) );
+
+                display = curCSS( elem, "display" );
+                document.body.removeChild( iframe );
+        }
+
+        // Store the correct default display
+        elemdisplay[ nodeName ] = display;
+
+        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
+                                if ( elem.offsetWidth === 0 && rdisplayswap.test( curCSS( elem, "display" ) ) ) {
+                                        return jQuery.swap( elem, cssShow, function() {
+                                                return getWidthOrHeight( elem, name, extra );
+                                        });
+                                } else {
+                                        return getWidthOrHeight( elem, name, extra );
+                                }
+                        }
+                },
+
+                set: function( elem, value, extra ) {
+                        return setPositiveNumber( elem, value, extra ?
+                                augmentWidthOrHeight(
+                                        elem,
+                                        name,
+                                        extra,
+                                        jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"
+                                ) : 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 >= 1 && 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 there is no filter style applied in a css rule, we are done
+                                if ( 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 ) {
+                                // 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" }, function() {
+                                        if ( computed ) {
+                                                return 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 ) {
+                                                var ret = curCSS( elem, prop );
+                                                // if curCSS returns percentage, fallback to offset
+                                                return rnumnonpx.test( ret ) ? jQuery( elem ).position()[ prop ] + "px" : ret;
+                                        }
+                                }
+                        };
+                });
+        }
+
+});
+
+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) || curCSS( 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,
+
+                                // assumes a single number if not a string
+                                parts = typeof value === "string" ? value.split(" ") : [ value ],
+                                expanded = {};
+
+                        for ( i = 0; 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,
+        rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+        rselectTextarea = /^(?:select|textarea)/i;
+
+jQuery.fn.extend({
+        serialize: function() {
+                return jQuery.param( this.serializeArray() );
+        },
+        serializeArray: function() {
+                return this.map(function(){
+                        return this.elements ? jQuery.makeArray( this.elements ) : this;
+                })
+                .filter(function(){
+                        return this.name && !this.disabled &&
+                                ( this.checked || rselectTextarea.test( this.nodeName ) ||
+                                        rinput.test( this.type ) );
+                })
+                .map(function( i, elem ){
+                        var val = jQuery( this ).val();
+
+                        return val == null ?
+                                null :
+                                jQuery.isArray( val ) ?
+                                        jQuery.map( val, function( val, i ){
+                                                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 {
+                                // If array item is non-scalar (array or object), encode its
+                                // numeric index to resolve deserialization ambiguity issues.
+                                // Note that rack (as of 1.0.0) can't currently deserialize
+                                // nested arrays properly, and attempting to do so may cause
+                                // a server error. Possible fixes are to modify rack's
+                                // deserialization algorithm or to provide an option or flag
+                                // to force array serialization to be shallow.
+                                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,
+
+        rhash = /#.*$/,
+        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 = /^\/\//,
+        rquery = /\?/,
+        rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+        rts = /([?&])_=[^&]*/,
+        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 = ["*/"] + ["*"];
+
+// #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, list, placeBefore,
+                        dataTypes = dataTypeExpression.toLowerCase().split( core_rspace ),
+                        i = 0,
+                        length = dataTypes.length;
+
+                if ( jQuery.isFunction( func ) ) {
+                        // For each dataType in the dataTypeExpression
+                        for ( ; i < length; i++ ) {
+                                dataType = dataTypes[ i ];
+                                // We control if we're asked to add before
+                                // any existing element
+                                placeBefore = /^\+/.test( dataType );
+                                if ( placeBefore ) {
+                                        dataType = dataType.substr( 1 ) || "*";
+                                }
+                                list = structure[ dataType ] = structure[ dataType ] || [];
+                                // then we add to the structure accordingly
+                                list[ placeBefore ? "unshift" : "push" ]( func );
+                        }
+                }
+        };
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+                dataType /* internal */, inspected /* internal */ ) {
+
+        dataType = dataType || options.dataTypes[ 0 ];
+        inspected = inspected || {};
+
+        inspected[ dataType ] = true;
+
+        var selection,
+                list = structure[ dataType ],
+                i = 0,
+                length = list ? list.length : 0,
+                executeOnly = ( structure === prefilters );
+
+        for ( ; i < length && ( executeOnly || !selection ); i++ ) {
+                selection = list[ i ]( options, originalOptions, jqXHR );
+                // If we got redirected to another dataType
+                // we try there if executing only and not done already
+                if ( typeof selection === "string" ) {
+                        if ( !executeOnly || inspected[ selection ] ) {
+                                selection = undefined;
+                        } else {
+                                options.dataTypes.unshift( selection );
+                                selection = inspectPrefiltersOrTransports(
+                                                structure, options, originalOptions, jqXHR, selection, inspected );
+                        }
+                }
+        }
+        // If we're only executing or nothing was selected
+        // we try the catchall dataType if not done already
+        if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+                selection = inspectPrefiltersOrTransports(
+                                structure, options, originalOptions, jqXHR, "*", inspected );
+        }
+        // unnecessary when only executing (prefilters)
+        // but it'll be ignored by the caller in that case
+        return selection;
+}
+
+// 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 );
+        }
+}
+
+jQuery.fn.load = function( url, params, callback ) {
+        if ( typeof url !== "string" && _load ) {
+                return _load.apply( this, arguments );
+        }
+
+        // Don't do a request if no elements are being requested
+        if ( !this.length ) {
+                return this;
+        }
+
+        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";
+        }
+
+        // Request the remote document
+        jQuery.ajax({
+                url: url,
+
+                // if "type" variable is undefined, then "GET" method will be used
+                type: type,
+                dataType: "html",
+                data: params,
+                complete: function( jqXHR, status ) {
+                        if ( callback ) {
+                                self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
+                        }
+                }
+        }).done(function( responseText ) {
+
+                // Save response for use in complete callback
+                response = arguments;
+
+                // See if a selector was specified
+                self.html( selector ?
+
+                        // Create a dummy div to hold the results
+                        jQuery("<div>")
+
+                                // inject the contents of the document in, removing the scripts
+                                // to avoid any 'Permission Denied' errors in IE
+                                .append( responseText.replace( rscript, "" ) )
+
+                                // Locate the specified elements
+                                .find( selector ) :
+
+                        // If not, just inject the full result
+                        responseText );
+
+        });
+
+        return this;
+};
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+        jQuery.fn[ o ] = function( f ){
+                return this.on( o, f );
+        };
+});
+
+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({
+                        type: method,
+                        url: url,
+                        data: data,
+                        success: callback,
+                        dataType: type
+                });
+        };
+});
+
+jQuery.extend({
+
+        getScript: function( url, callback ) {
+                return jQuery.get( url, undefined, callback, "script" );
+        },
+
+        getJSON: function( url, data, callback ) {
+                return jQuery.get( url, data, callback, "json" );
+        },
+
+        // 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 ) {
+                if ( settings ) {
+                        // Building a settings object
+                        ajaxExtend( target, jQuery.ajaxSettings );
+                } else {
+                        // Extending ajaxSettings
+                        settings = target;
+                        target = jQuery.ajaxSettings;
+                }
+                ajaxExtend( target, settings );
+                return target;
+        },
+
+        ajaxSettings: {
+                url: ajaxLocation,
+                isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+                global: true,
+                type: "GET",
+                contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+                processData: true,
+                async: true,
+                /*
+                timeout: 0,
+                data: null,
+                dataType: null,
+                username: null,
+                password: null,
+                cache: null,
+                throws: false,
+                traditional: false,
+                headers: {},
+                */
+
+                accepts: {
+                        xml: "application/xml, text/xml",
+                        html: "text/html",
+                        text: "text/plain",
+                        json: "application/json, text/javascript",
+                        "*": allTypes
+                },
+
+                contents: {
+                        xml: /xml/,
+                        html: /html/,
+                        json: /json/
+                },
+
+                responseFields: {
+                        xml: "responseXML",
+                        text: "responseText"
+                },
+
+                // List of data converters
+                // 1) key format is "source_type destination_type" (a single space in-between)
+                // 2) the catchall symbol "*" can be used for source_type
+                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: {
+                        context: true,
+                        url: true
+                }
+        },
+
+        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 // ifModified key
+                        ifModifiedKey,
+                        // Response headers
+                        responseHeadersString,
+                        responseHeaders,
+                        // transport
+                        transport,
+                        // 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
+                        // It's the callbackContext if one was provided in the options
+                        // and if it's a DOM node or a jQuery collection
+                        globalEventContext = callbackContext !== s &&
+                                ( callbackContext.nodeType || callbackContext instanceof 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,
+
+                                // Caches the header
+                                setRequestHeader: function( name, value ) {
+                                        if ( !state ) {
+                                                var lname = name.toLowerCase();
+                                                name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+                                                requestHeaders[ name ] = value;
+                                        }
+                                        return this;
+                                },
+
+                                // Raw string
+                                getAllResponseHeaders: function() {
+                                        return state === 2 ? responseHeadersString : null;
+                                },
+
+                                // 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 === undefined ? null : match;
+                                },
+
+                                // Overrides response content-type header
+                                overrideMimeType: function( type ) {
+                                        if ( !state ) {
+                                                s.mimeType = type;
+                                        }
+                                        return this;
+                                },
+
+                                // Cancel the request
+                                abort: function( statusText ) {
+                                        statusText = statusText || strAbort;
+                                        if ( transport ) {
+                                                transport.abort( statusText );
+                                        }
+                                        done( 0, statusText );
+                                        return this;
+                                }
+                        };
+
+                // Callback for when everything is done
+                // It is defined here because jslint complains if it is declared
+                // at the end of the function (which would be more logical and readable)
+                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[ ifModifiedKey ] = modified;
+                                        }
+                                        modified = jqXHR.getResponseHeader("Etag");
+                                        if ( modified ) {
+                                                jQuery.etag[ ifModifiedKey ] = modified;
+                                        }
+                                }
+
+                                // If not modified
+                                if ( status === 304 ) {
+
+                                        statusText = "notmodified";
+                                        isSuccess = true;
+
+                                // 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 ( !statusText || status ) {
+                                        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( "ajax" + ( isSuccess ? "Success" : "Error" ),
+                                                [ 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" );
+                                }
+                        }
+                }
+
+                // Attach deferreds
+                deferred.promise( jqXHR );
+                jqXHR.success = jqXHR.done;
+                jqXHR.error = jqXHR.fail;
+                jqXHR.complete = completeDeferred.add;
+
+                // Status-dependent callbacks
+                jqXHR.statusCode = function( map ) {
+                        if ( map ) {
+                                var tmp;
+                                if ( state < 2 ) {
+                                        for ( tmp in map ) {
+                                                statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+                                        }
+                                } else {
+                                        tmp = map[ jqXHR.status ];
+                                        jqXHR.always( tmp );
+                                }
+                        }
+                        return this;
+                };
+
+                // Remove hash character (#7531: and string promotion)
+                // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+                // We also use the url parameter if available
+                s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+                // Extract dataTypes list
+                s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
+
+                // 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;
+
+                // Uppercase the type
+                s.type = s.type.toUpperCase();
+
+                // Determine if request has content
+                s.hasContent = !rnoContent.test( s.type );
+
+                // Watch for a new set of requests
+                if ( fireGlobals && jQuery.active++ === 0 ) {
+                        jQuery.event.trigger( "ajaxStart" );
+                }
+
+                // More options handling for requests with no content
+                if ( !s.hasContent ) {
+
+                        // If data is available, append data to url
+                        if ( s.data ) {
+                                s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+                                // #9682: remove data so that it's not used in an eventual retry
+                                delete s.data;
+                        }
+
+                        // Get ifModifiedKey before adding the anti-cache parameter
+                        ifModifiedKey = s.url;
+
+                        // Add anti-cache in url if needed
+                        if ( s.cache === false ) {
+
+                                var ts = jQuery.now(),
+                                        // try replacing _= if it is there
+                                        ret = s.url.replace( rts, "$1_=" + ts );
+
+                                // if nothing was replaced, add timestamp to the end
+                                s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+                        }
+                }
+
+                // 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 If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+                if ( s.ifModified ) {
+                        ifModifiedKey = ifModifiedKey || s.url;
+                        if ( jQuery.lastModified[ ifModifiedKey ] ) {
+                                jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+                        }
+                        if ( jQuery.etag[ ifModifiedKey ] ) {
+                                jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
+                        }
+                }
+
+                // 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;
+                                }
+                        }
+                }
+
+                return jqXHR;
+        },
+
+        // Counter for holding the number of active queries
+        active: 0,
+
+        // Last-Modified header cache for next request
+        lastModified: {},
+        etag: {}
+
+});
+
+/* 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,
+                // Work with a copy of dataTypes in case we need to modify it for conversion
+                dataTypes = s.dataTypes.slice(),
+                prev = dataTypes[ 0 ],
+                converters = {},
+                i = 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 };
+}
+var oldCallbacks = [],
+        rquestion = /\?/,
+        rjsonp = /(=)\?(?=&|$)|\?\?/,
+        nonce = jQuery.now();
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+        jsonp: "callback",
+        jsonpCallback: function() {
+                var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( 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,
+                data = s.data,
+                url = s.url,
+                hasCallback = s.jsonp !== false,
+                replaceInUrl = hasCallback && rjsonp.test( url ),
+                replaceInData = hasCallback && !replaceInUrl && typeof data === "string" &&
+                        !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
+                        rjsonp.test( data );
+
+        // Handle iff the expected data type is "jsonp" or we have a parameter to set
+        if ( s.dataTypes[ 0 ] === "jsonp" || replaceInUrl || replaceInData ) {
+
+                // Get callback name, remembering preexisting value associated with it
+                callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
+                        s.jsonpCallback() :
+                        s.jsonpCallback;
+                overwritten = window[ callbackName ];
+
+                // Insert callback into url or form data
+                if ( replaceInUrl ) {
+                        s.url = url.replace( rjsonp, "$1" + callbackName );
+                } else if ( replaceInData ) {
+                        s.data = data.replace( rjsonp, "$1" + callbackName );
+                } else if ( hasCallback ) {
+                        s.url += ( rquestion.test( 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
+                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";
+        }
+});
+// Install script dataType
+jQuery.ajaxSetup({
+        accepts: {
+                script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+        },
+        contents: {
+                script: /javascript|ecmascript/
+        },
+        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 || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+                return {
+
+                        send: function( _, callback ) {
+
+                                script = document.createElement( "script" );
+
+                                script.async = "async";
+
+                                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 ( head && script.parentNode ) {
+                                                        head.removeChild( script );
+                                                }
+
+                                                // Dereference the script
+                                                script = undefined;
+
+                                                // Callback if not abort
+                                                if ( !isAbort ) {
+                                                        callback( 200, "success" );
+                                                }
+                                        }
+                                };
+                                // Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+                                // This arises when a base node is used (#2709 and #4378).
+                                head.insertBefore( script, head.firstChild );
+                        },
+
+                        abort: function() {
+                                if ( script ) {
+                                        script.onload( 0, 1 );
+                                }
+                        }
+                };
+        }
+});
+var xhrCallbacks,
+        // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+        xhrOnUnloadAbort = window.ActiveXObject ? function() {
+                // Abort all pending requests
+                for ( var key in xhrCallbacks ) {
+                        xhrCallbacks[ key ]( 0, 1 );
+                }
+        } : false,
+        xhrId = 0;
+
+// 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
+(function( xhr ) {
+        jQuery.extend( jQuery.support, {
+                ajax: !!xhr,
+                cors: !!xhr && ( "withCredentials" in xhr )
+        });
+})( jQuery.ajaxSettings.xhr() );
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+        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( _ ) {}
+
+                                        // 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 {
+                                                                        status = xhr.status;
+                                                                        responseHeaders = xhr.getAllResponseHeaders();
+                                                                        responses = {};
+                                                                        xml = xhr.responseXML;
+
+                                                                        // 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)
+                                                                        try {
+                                                                                responses.text = xhr.responseText;
+                                                                        } catch( e ) {
+                                                                        }
+
+                                                                        // 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, 0 );
+                                        } 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(0,1);
+                                        }
+                                }
+                        };
+                }
+        });
+}
+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;
+        }, 0 );
+        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,
+                index = 0,
+                tweenerIndex = 0,
+                length = animationPrefilters.length,
+                deferred = jQuery.Deferred().always( function() {
+                        // don't match elem in the :animated selector
+                        delete tick.elem;
+                }),
+                tick = function() {
+                        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, easing ) {
+                                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;
+
+                                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, {
+                        anim: animation,
+                        queue: animation.opts.queue,
+                        elem: elem
+                })
+        );
+
+        // 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 ) {
+        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", true );
+                        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 any value as a 4th 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, false, "" );
+                        // 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" ||
+                        // special check for .toggle( handler, handler, ... )
+                        ( !i && jQuery.isFunction( speed ) && jQuery.isFunction( easing ) ) ?
+                        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 );
+
+                                // Empty animations resolve immediately
+                                if ( empty ) {
+                                        anim.stop( true );
+                                }
+                        };
+
+                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 );
+                        }
+                });
+        }
+});
+
+// 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 ) && !timerId ) {
+                timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
+        }
+};
+
+jQuery.fx.interval = 13;
+
+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;
+        };
+}
+var rroot = /^(?:body|html)$/i;
+
+jQuery.fn.offset = function( options ) {
+        if ( arguments.length ) {
+                return options === undefined ?
+                        this :
+                        this.each(function( i ) {
+                                jQuery.offset.setOffset( this, options, i );
+                        });
+        }
+
+        var docElem, body, win, clientTop, clientLeft, scrollTop, scrollLeft,
+                box = { top: 0, left: 0 },
+                elem = this[ 0 ],
+                doc = elem && elem.ownerDocument;
+
+        if ( !doc ) {
+                return;
+        }
+
+        if ( (body = doc.body) === elem ) {
+                return jQuery.offset.bodyOffset( elem );
+        }
+
+        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 );
+        clientTop  = docElem.clientTop  || body.clientTop  || 0;
+        clientLeft = docElem.clientLeft || body.clientLeft || 0;
+        scrollTop  = win.pageYOffset || docElem.scrollTop;
+        scrollLeft = win.pageXOffset || docElem.scrollLeft;
+        return {
+                top: box.top  + scrollTop  - clientTop,
+                left: box.left + scrollLeft - clientLeft
+        };
+};
+
+jQuery.offset = {
+
+        bodyOffset: function( body ) {
+                var top = body.offsetTop,
+                        left = body.offsetLeft;
+
+                if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
+                        top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+                        left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+                }
+
+                return { top: top, left: left };
+        },
+
+        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 elem = this[0],
+
+                // Get *real* offsetParent
+                offsetParent = this.offsetParent(),
+
+                // Get correct offsets
+                offset       = this.offset(),
+                parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+                // Subtract 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
+                offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+                offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+                // Add offsetParent borders
+                parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+                parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+                // Subtract the two offsets
+                return {
+                        top:  offset.top  - parentOffset.top,
+                        left: offset.left - parentOffset.left
+                };
+        },
+
+        offsetParent: function() {
+                return this.map(function() {
+                        var offsetParent = this.offsetParent || document.body;
+                        while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+                                offsetParent = offsetParent.offsetParent;
+                        }
+                        return offsetParent || document.body;
+                });
+        }
+});
+
+
+// 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, value, extra ) :
+
+                                        // Set width or height on the element
+                                        jQuery.style( elem, type, value, extra );
+                        }, type, chainable ? margin : undefined, chainable, null );
+                };
+        });
+});
+// 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 );
diff --git a/addons/im_livechat/static/ext/static/lib/qweb/qweb2.js b/addons/im_livechat/static/ext/static/lib/qweb/qweb2.js
new file mode 100644
index 00000000000..0c4b59cd377
--- /dev/null
+++ b/addons/im_livechat/static/ext/static/lib/qweb/qweb2.js
@@ -0,0 +1,736 @@
+/*
+Copyright (c) 2013, Fabien Meghazi
+
+Released under the MIT license
+
+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.
+*/
+
+// TODO: trim support
+// TODO: line number -> https://bugzilla.mozilla.org/show_bug.cgi?id=618650
+// TODO: templates orverwritten could be called by t-call="__super__" ?
+// TODO: t-set + t-value + children node == scoped variable ?
+
+(function() {
+
+var QWeb2 = {
+    expressions_cache: {},
+    RESERVED_WORDS: 'true,false,NaN,null,undefined,debugger,console,window,in,instanceof,new,function,return,this,typeof,eval,void,Math,RegExp,Array,Object,Date'.split(','),
+    ACTIONS_PRECEDENCE: 'foreach,if,call,set,esc,escf,raw,rawf,js,debug,log'.split(','),
+    WORD_REPLACEMENT: {
+        'and': '&&',
+        'or': '||',
+        'gt': '>',
+        'gte': '>=',
+        'lt': '<',
+        'lte': '<='
+    },
+    tools: {
+        exception: function(message, context) {
+            context = context || {};
+            var prefix = 'QWeb2';
+            if (context.template) {
+                prefix += " - template['" + context.template + "']";
+            }
+            throw new Error(prefix + ": " + message);
+        },
+        warning : function(message) {
+            if (typeof(window) !== 'undefined' && window.console) {
+                window.console.warn(message);
+            }
+        },
+        trim: function(s, mode) {
+            switch (mode) {
+                case "left":
+                    return s.replace(/^\s*/, "");
+                case "right":
+                    return s.replace(/\s*$/, "");
+                default:
+                    return s.replace(/^\s*|\s*$/g, "");
+            }
+        },
+        js_escape: function(s, noquotes) {
+            return (noquotes ? '' : "'") + s.replace(/\r?\n/g, "\\n").replace(/'/g, "\\'") + (noquotes ? '' : "'");
+        },
+        html_escape: function(s, attribute) {
+            if (s == null) {
+                return '';
+            }
+            s = String(s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+            if (attribute) {
+                s = s.replace(/"/g, '&quot;');
+            }
+            return s;
+        },
+        gen_attribute: function(o) {
+            if (o !== null && o !== undefined) {
+                if (o.constructor === Array) {
+                    if (o[1] !== null && o[1] !== undefined) {
+                        return this.format_attribute(o[0], o[1]);
+                    }
+                } else if (typeof o === 'object') {
+                    var r = '';
+                    for (var k in o) {
+                        if (o.hasOwnProperty(k)) {
+                            r += this.gen_attribute([k, o[k]]);
+                        }
+                    }
+                    return r;
+                }
+            }
+            return '';
+        },
+        format_attribute: function(name, value) {
+            return ' ' + name + '="' + this.html_escape(value, true) + '"';
+        },
+        extend: function(dst, src, exclude) {
+            for (var p in src) {
+                if (src.hasOwnProperty(p) && !(exclude && this.arrayIndexOf(exclude, p) !== -1)) {
+                    dst[p] = src[p];
+                }
+            }
+            return dst;
+        },
+        arrayIndexOf : function(array, item) {
+            for (var i = 0, ilen = array.length; i < ilen; i++) {
+                if (array[i] === item) {
+                    return i;
+                }
+            }
+            return -1;
+        },
+        xml_node_to_string : function(node, childs_only) {
+            if (childs_only) {
+                var childs = node.childNodes, r = [];
+                for (var i = 0, ilen = childs.length; i < ilen; i++) {
+                    r.push(this.xml_node_to_string(childs[i]));
+                }
+                return r.join('');
+            } else {
+                if (typeof XMLSerializer !== 'undefined') {
+                    return (new XMLSerializer()).serializeToString(node);
+                } else {
+                    switch(node.nodeType) {
+                    case 1: return node.outerHTML;
+                    case 3: return node.data;
+                    case 4: return '<![CDATA[' + node.data + ']]>';
+                    case 8: return '<!-- ' + node.data + '-->';
+                    }
+                    throw new Error('Unknown node type ' + node.nodeType);
+                }
+            }
+        },
+        call: function(context, template, old_dict, _import, callback) {
+            var new_dict = this.extend({}, old_dict);
+            new_dict['__caller__'] = old_dict['__template__'];
+            if (callback) {
+                new_dict['__content__'] = callback(context, new_dict);
+            }
+            var r = context.engine._render(template, new_dict);
+            if (_import) {
+                if (_import === '*') {
+                    this.extend(old_dict, new_dict, ['__caller__', '__template__']);
+                } else {
+                    _import = _import.split(',');
+                    for (var i = 0, ilen = _import.length; i < ilen; i++) {
+                        var v = _import[i];
+                        old_dict[v] = new_dict[v];
+                    }
+                }
+            }
+            return r;
+        },
+        foreach: function(context, enu, as, old_dict, callback) {
+            if (enu != null) {
+                var size, new_dict = this.extend({}, old_dict);
+                new_dict[as + "_all"] = enu;
+                var as_value = as + "_value",
+                    as_index = as + "_index",
+                    as_first = as + "_first",
+                    as_last = as + "_last",
+                    as_parity = as + "_parity";
+                if (size = enu.length) {
+                    new_dict[as + "_size"] = size;
+                    for (var j = 0, jlen = enu.length; j < jlen; j++) {
+                        var cur = enu[j];
+                        new_dict[as_value] = cur;
+                        new_dict[as_index] = j;
+                        new_dict[as_first] = j === 0;
+                        new_dict[as_last] = j + 1 === size;
+                        new_dict[as_parity] = (j % 2 == 1 ? 'odd' : 'even');
+                        if (cur.constructor === Object) {
+                            this.extend(new_dict, cur);
+                        }
+                        new_dict[as] = cur;
+                        callback(context, new_dict);
+                    }
+                } else if (enu.constructor == Number) {
+                    var _enu = [];
+                    for (var i = 0; i < enu; i++) {
+                        _enu.push(i);
+                    }
+                    this.foreach(context, _enu, as, old_dict, callback);
+                } else {
+                    var index = 0;
+                    for (var k in enu) {
+                        if (enu.hasOwnProperty(k)) {
+                            var v = enu[k];
+                            new_dict[as_value] = v;
+                            new_dict[as_index] = index;
+                            new_dict[as_first] = index === 0;
+                            new_dict[as_parity] = (j % 2 == 1 ? 'odd' : 'even');
+                            new_dict[as] = k;
+                            callback(context, new_dict);
+                            index += 1;
+                        }
+                      }
+                }
+            } else {
+                this.exception("No enumerator given to foreach", context);
+            }
+        }
+    }
+};
+
+QWeb2.Engine = (function() {
+    function Engine() {
+        // TODO: handle prefix at template level : t-prefix="x", don't forget to lowercase it
+        this.prefix = 't';
+        this.debug = false;
+        this.templates_resources = []; // TODO: implement this.reload()
+        this.templates = {};
+        this.compiled_templates = {};
+        this.extend_templates = {};
+        this.default_dict = {};
+        this.tools = QWeb2.tools;
+        this.jQuery = window.jQuery;
+        this.reserved_words = QWeb2.RESERVED_WORDS.slice(0);
+        this.actions_precedence = QWeb2.ACTIONS_PRECEDENCE.slice(0);
+        this.word_replacement = QWeb2.tools.extend({}, QWeb2.WORD_REPLACEMENT);
+        this.preprocess_node = null;
+        for (var i = 0; i < arguments.length; i++) {
+            this.add_template(arguments[i]);
+        }
+    }
+
+    QWeb2.tools.extend(Engine.prototype, {
+        add_template : function(template) {
+            this.templates_resources.push(template);
+            if (template.constructor === String) {
+                template = this.load_xml(template);
+            }
+            var ec = (template.documentElement && template.documentElement.childNodes) || template.childNodes || [];
+            for (var i = 0; i < ec.length; i++) {
+                var node = ec[i];
+                if (node.nodeType === 1) {
+                    if (node.nodeName == 'parsererror') {
+                        return this.tools.exception(node.innerText);
+                    }
+                    var name = node.getAttribute(this.prefix + '-name');
+                    var extend = node.getAttribute(this.prefix + '-extend');
+                    if (name && extend) {
+                        // Clone template and extend it
+                        if (!this.templates[extend]) {
+                            return this.tools.exception("Can't clone undefined template " + extend);
+                        }
+                        this.templates[name] = this.templates[extend].cloneNode(true);
+                        extend = name;
+                        name = undefined;
+                    }
+                    if (name) {
+                        this.templates[name] = node;
+                        this.compiled_templates[name] = null;
+                    } else if (extend) {
+                        delete(this.compiled_templates[extend]);
+                        if (this.extend_templates[extend]) {
+                            this.extend_templates[extend].push(node);
+                        } else {
+                            this.extend_templates[extend] = [node];
+                        }
+                    }
+                }
+            }
+            return true;
+        },
+        load_xml : function(s) {
+            s = this.tools.trim(s);
+            if (s.charAt(0) === '<') {
+                return this.load_xml_string(s);
+            } else {
+                var req = this.get_xhr();
+                if (req) {
+                    // TODO: third parameter is async : https://developer.mozilla.org/en/XMLHttpRequest#open()
+                    // do an on_ready in QWeb2{} that could be passed to add_template
+                    if (this.debug) {
+                        s += '?debug=' + (new Date()).getTime(); // TODO fme: do it properly in case there's already url parameters
+                    }
+                    req.open('GET', s, false);
+                    req.send(null);
+                    var xDoc = req.responseXML;
+                    if (xDoc) {
+                        if (!xDoc.documentElement) {
+                            throw new Error("QWeb2: This xml document has no root document : " + xDoc.responseText);
+                        }
+                        if (xDoc.documentElement.nodeName == "parsererror") {
+                            return this.tools.exception(xDoc.documentElement.childNodes[0].nodeValue);
+                        }
+                        return xDoc;
+                    } else {
+                        return this.load_xml_string(req.responseText);
+                    }
+                }
+            }
+        },
+        load_xml_string : function(s) {
+            if (window.DOMParser) {
+                var dp = new DOMParser();
+                var r = dp.parseFromString(s, "text/xml");
+                if (r.body && r.body.firstChild && r.body.firstChild.nodeName == 'parsererror') {
+                    return this.tools.exception(r.body.innerText);
+                }
+                return r;
+            }
+            var xDoc;
+            try {
+                // new ActiveXObject("Msxml2.DOMDocument.4.0");
+                xDoc = new ActiveXObject("MSXML2.DOMDocument");
+            } catch (e) {
+                return this.tools.exception(
+                    "Could not find a DOM Parser: " + e.message);
+            }
+            xDoc.async = false;
+            xDoc.preserveWhiteSpace = true;
+            xDoc.loadXML(s);
+            return xDoc;
+        },
+        has_template : function(template) {
+            return !!this.templates[template];
+        },
+        get_xhr : function() {
+            if (window.XMLHttpRequest) {
+                return new window.XMLHttpRequest();
+            }
+            try {
+                return new ActiveXObject('MSXML2.XMLHTTP.3.0');
+            } catch (e) {
+                return null;
+            }
+        },
+        compile : function(node) {
+            var e = new QWeb2.Element(this, node);
+            var template = node.getAttribute(this.prefix + '-name');
+            return  "   /* 'this' refers to Qweb2.Engine instance */\n" +
+                    "   var context = { engine : this, template : " + (this.tools.js_escape(template)) + " };\n" +
+                    "   dict = dict || {};\n" +
+                    "   dict['__template__'] = '" + template + "';\n" +
+                    "   var r = [];\n" +
+                    "   /* START TEMPLATE */" +
+                    (this.debug ? "" : " try {\n") +
+                    (e.compile()) + "\n" +
+                    "   /* END OF TEMPLATE */" +
+                    (this.debug ? "" : " } catch(error) {\n" +
+                    "       if (console && console.exception) console.exception(error);\n" +
+                    "       context.engine.tools.exception('Runtime Error: ' + error, context);\n") +
+                    (this.debug ? "" : "   }\n") +
+                    "   return r.join('');";
+        },
+        render : function(template, dict) {
+            dict = dict || {};
+            QWeb2.tools.extend(dict, this.default_dict);
+            /*if (this.debug && window['console'] !== undefined) {
+                console.time("QWeb render template " + template);
+            }*/
+            var r = this._render(template, dict);
+            /*if (this.debug && window['console'] !== undefined) {
+                console.timeEnd("QWeb render template " + template);
+            }*/
+            return r;
+        },
+        _render : function(template, dict) {
+            if (this.compiled_templates[template]) {
+                return this.compiled_templates[template].apply(this, [dict || {}]);
+            } else if (this.templates[template]) {
+                var ext;
+                if (ext = this.extend_templates[template]) {
+                    var extend_node;
+                    while (extend_node = ext.shift()) {
+                        this.extend(template, extend_node);
+                    }
+                }
+                var code = this.compile(this.templates[template]), tcompiled;
+                try {
+                    tcompiled = new Function(['dict'], code);
+                } catch (error) {
+                    if (this.debug && window.console) {
+                        console.log(code);
+                    }
+                    this.tools.exception("Error evaluating template: " + error, { template: name });
+                }
+                if (!tcompiled) {
+                    this.tools.exception("Error evaluating template: (IE?)" + error, { template: name });
+                }
+                this.compiled_templates[template] = tcompiled;
+                return this.render(template, dict);
+            } else {
+                return this.tools.exception("Template '" + template + "' not found");
+            }
+        },
+        extend : function(template, extend_node) {
+            if (!this.jQuery) {
+                return this.tools.exception("Can't extend template " + template + " without jQuery");
+            }
+            var template_dest = this.templates[template];
+            for (var i = 0, ilen = extend_node.childNodes.length; i < ilen; i++) {
+                var child = extend_node.childNodes[i];
+                if (child.nodeType === 1) {
+                    var jquery = child.getAttribute(this.prefix + '-jquery'),
+                        operation = child.getAttribute(this.prefix + '-operation'),
+                        target,
+                        error_msg = "Error while extending template '" + template;
+                    if (jquery) {
+                        target = this.jQuery(jquery, template_dest);
+                    } else {
+                        this.tools.exception(error_msg + "No expression given");
+                    }
+                    error_msg += "' (expression='" + jquery + "') : ";
+                    if (operation) {
+                        var allowed_operations = "append,prepend,before,after,replace,inner".split(',');
+                        if (this.tools.arrayIndexOf(allowed_operations, operation) == -1) {
+                            this.tools.exception(error_msg + "Invalid operation : '" + operation + "'");
+                        }
+                        operation = {'replace' : 'replaceWith', 'inner' : 'html'}[operation] || operation;
+                        target[operation](child.cloneNode(true).childNodes);
+                    } else {
+                        try {
+                            var f = new Function(['$', 'document'], this.tools.xml_node_to_string(child, true));
+                        } catch(error) {
+                            return this.tools.exception("Parse " + error_msg + error);
+                        }
+                        try {
+                            f.apply(target, [this.jQuery, template_dest.ownerDocument]);
+                        } catch(error) {
+                            return this.tools.exception("Runtime " + error_msg + error);
+                        }
+                    }
+                }
+            }
+        }
+    });
+    return Engine;
+})();
+
+QWeb2.Element = (function() {
+    function Element(engine, node) {
+        this.engine = engine;
+        this.node = node;
+        this.tag = node.tagName;
+        this.actions = {};
+        this.actions_done = [];
+        this.attributes = {};
+        this.children = [];
+        this._top = [];
+        this._bottom = [];
+        this._indent = 1;
+        this.process_children = true;
+        var childs = this.node.childNodes;
+        if (childs) {
+            for (var i = 0, ilen = childs.length; i < ilen; i++) {
+                this.children.push(new QWeb2.Element(this.engine, childs[i]));
+            }
+        }
+        var attrs = this.node.attributes;
+        if (attrs) {
+            for (var j = 0, jlen = attrs.length; j < jlen; j++) {
+                var attr = attrs[j];
+                var name = attr.name;
+                var m = name.match(new RegExp("^" + this.engine.prefix + "-(.+)"));
+                if (m) {
+                    name = m[1];
+                    if (name === 'name') {
+                        continue;
+                    }
+                    this.actions[name] = attr.value;
+                } else {
+                    this.attributes[name] = attr.value;
+                }
+            }
+        }
+        if (this.engine.preprocess_node) {
+            this.engine.preprocess_node.call(this);
+        }
+    }
+
+    QWeb2.tools.extend(Element.prototype, {
+        compile : function() {
+            var r = [],
+                instring = false,
+                lines = this._compile().split('\n');
+            for (var i = 0, ilen = lines.length; i < ilen; i++) {
+                var m, line = lines[i];
+                if (m = line.match(/^(\s*)\/\/@string=(.*)/)) {
+                    if (instring) {
+                        if (this.engine.debug) {
+                            // Split string lines in indented r.push arguments
+                            r.push((m[2].indexOf("\\n") != -1 ? "',\n\t" + m[1] + "'" : '') + m[2]);
+                        } else {
+                            r.push(m[2]);
+                        }
+                    } else {
+                        r.push(m[1] + "r.push('" + m[2]);
+                        instring = true;
+                    }
+                } else {
+                    if (instring) {
+                        r.push("');\n");
+                    }
+                    instring = false;
+                    r.push(line + '\n');
+                }
+            }
+            return r.join('');
+        },
+        _compile : function() {
+            switch (this.node.nodeType) {
+                case 3:
+                case 4:
+                    this.top_string(this.node.data);
+                break;
+                case 1:
+                    this.compile_element();
+            }
+            var r = this._top.join('');
+            if (this.process_children) {
+                for (var i = 0, ilen = this.children.length; i < ilen; i++) {
+                    var child = this.children[i];
+                    child._indent = this._indent;
+                    r += child._compile();
+                }
+            }
+            r += this._bottom.join('');
+            return r;
+        },
+        format_expression : function(e) {
+            /* Naive format expression builder. Replace reserved words and variables to dict[variable]
+             * Does not handle spaces before dot yet, and causes problems for anonymous functions. Use t-js="" for that */
+            if (QWeb2.expressions_cache[e]) {
+              return QWeb2.expressions_cache[e];
+            }
+            var chars = e.split(''),
+                instring = '',
+                invar = '',
+                invar_pos = 0,
+                r = '';
+            chars.push(' ');
+            for (var i = 0, ilen = chars.length; i < ilen; i++) {
+                var c = chars[i];
+                if (instring.length) {
+                    if (c === instring && chars[i - 1] !== "\\") {
+                        instring = '';
+                    }
+                } else if (c === '"' || c === "'") {
+                    instring = c;
+                } else if (c.match(/[a-zA-Z_\$]/) && !invar.length) {
+                    invar = c;
+                    invar_pos = i;
+                    continue;
+                } else if (c.match(/\W/) && invar.length) {
+                    // TODO: Should check for possible spaces before dot
+                    if (chars[invar_pos - 1] !== '.' && QWeb2.tools.arrayIndexOf(this.engine.reserved_words, invar) < 0) {
+                        invar = this.engine.word_replacement[invar] || ("dict['" + invar + "']");
+                    }
+                    r += invar;
+                    invar = '';
+                } else if (invar.length) {
+                    invar += c;
+                    continue;
+                }
+                r += c;
+            }
+            r = r.slice(0, -1);
+            QWeb2.expressions_cache[e] = r;
+            return r;
+        },
+        string_interpolation : function(s) {
+            if (!s) {
+              return "''";
+            }
+            var regex = /^{(.*)}(.*)/,
+                src = s.split(/#/),
+                r = [];
+            for (var i = 0, ilen = src.length; i < ilen; i++) {
+                var val = src[i],
+                    m = val.match(regex);
+                if (m) {
+                    r.push("(" + this.format_expression(m[1]) + ")");
+                    if (m[2]) {
+                        r.push(this.engine.tools.js_escape(m[2]));
+                    }
+                } else if (!(i === 0 && val === '')) {
+                    r.push(this.engine.tools.js_escape((i === 0 ? '' : '#') + val));
+                }
+            }
+            return r.join(' + ');
+        },
+        indent : function() {
+            return this._indent++;
+        },
+        dedent : function() {
+            if (this._indent !== 0) {
+                return this._indent--;
+            }
+        },
+        get_indent : function() {
+            return new Array(this._indent + 1).join("\t");
+        },
+        top : function(s) {
+            return this._top.push(this.get_indent() + s + '\n');
+        },
+        top_string : function(s) {
+            return this._top.push(this.get_indent() + "//@string=" + this.engine.tools.js_escape(s, true) + '\n');
+        },
+        bottom : function(s) {
+            return this._bottom.unshift(this.get_indent() + s + '\n');
+        },
+        bottom_string : function(s) {
+            return this._bottom.unshift(this.get_indent() + "//@string=" + this.engine.tools.js_escape(s, true) + '\n');
+        },
+        compile_element : function() {
+            for (var i = 0, ilen = this.engine.actions_precedence.length; i < ilen; i++) {
+                var a = this.engine.actions_precedence[i];
+                if (a in this.actions) {
+                    var value = this.actions[a];
+                    var key = 'compile_action_' + a;
+                    if (this[key]) {
+                        this[key](value);
+                    } else if (this.engine[key]) {
+                        this.engine[key].call(this, value);
+                    } else {
+                        this.engine.tools.exception("No handler method for action '" + a + "'");
+                    }
+                }
+            }
+            if (this.tag.toLowerCase() !== this.engine.prefix) {
+                var tag = "<" + this.tag;
+                for (var a in this.attributes) {
+                    tag += this.engine.tools.gen_attribute([a, this.attributes[a]]);
+                }
+                this.top_string(tag);
+                if (this.actions.att) {
+                    this.top("r.push(context.engine.tools.gen_attribute(" + (this.format_expression(this.actions.att)) + "));");
+                }
+                for (var a in this.actions) {
+                    var v = this.actions[a];
+                    var m = a.match(/att-(.+)/);
+                    if (m) {
+                        this.top("r.push(context.engine.tools.gen_attribute(['" + m[1] + "', (" + (this.format_expression(v)) + ")]));");
+                    }
+                    var m = a.match(/attf-(.+)/);
+                    if (m) {
+                        this.top("r.push(context.engine.tools.gen_attribute(['" + m[1] + "', (" + (this.string_interpolation(v)) + ")]));");
+                    }
+                }
+                if (this.children.length || this.actions.opentag === 'true') {
+                    this.top_string(">");
+                    this.bottom_string("</" + this.tag + ">");
+                } else {
+                    this.top_string("/>");
+                }
+            }
+        },
+        compile_action_if : function(value) {
+            this.top("if (" + (this.format_expression(value)) + ") {");
+            this.bottom("}");
+            this.indent();
+        },
+        compile_action_foreach : function(value) {
+            var as = this.actions['as'] || value.replace(/[^a-zA-Z0-9]/g, '_');
+            //TODO: exception if t-as not valid
+            this.top("context.engine.tools.foreach(context, " + (this.format_expression(value)) + ", " + (this.engine.tools.js_escape(as)) + ", dict, function(context, dict) {");
+            this.bottom("});");
+            this.indent();
+        },
+        compile_action_call : function(value) {
+            var _import = this.actions['import'] || '';
+            if (this.children.length === 0) {
+                return this.top("r.push(context.engine.tools.call(context, " + (this.engine.tools.js_escape(value)) + ", dict, " + (this.engine.tools.js_escape(_import)) + "));");
+            } else {
+                this.top("r.push(context.engine.tools.call(context, " + (this.engine.tools.js_escape(value)) + ", dict, " + (this.engine.tools.js_escape(_import)) + ", function(context, dict) {");
+                this.bottom("}));");
+                this.indent();
+                this.top("var r = [];");
+                return this.bottom("return r.join('');");
+            }
+        },
+        compile_action_set : function(value) {
+            var variable = this.format_expression(value);
+            if (this.actions['value']) {
+                if (this.children.length) {
+                    this.engine.tools.warning("@set with @value plus node chidren found. Children are ignored.");
+                }
+                this.top(variable + " = (" + (this.format_expression(this.actions['value'])) + ");");
+                this.process_children = false;
+            } else {
+                if (this.children.length === 0) {
+                    this.top(variable + " = '';");
+                } else if (this.children.length === 1 && this.children[0].node.nodeType === 3) {
+                    this.top(variable + " = " + (this.engine.tools.js_escape(this.children[0].node.data)) + ";");
+                    this.process_children = false;
+                } else {
+                    this.top(variable + " = (function(dict) {");
+                    this.bottom("})(dict);");
+                    this.indent();
+                    this.top("var r = [];");
+                    this.bottom("return r.join('');");
+                }
+            }
+        },
+        compile_action_esc : function(value) {
+            this.top("r.push(context.engine.tools.html_escape(" + (this.format_expression(value)) + "));");
+        },
+        compile_action_escf : function(value) {
+            this.top("r.push(context.engine.tools.html_escape(" + (this.string_interpolation(value)) + "));");
+        },
+        compile_action_raw : function(value) {
+            this.top("r.push(" + (this.format_expression(value)) + ");");
+        },
+        compile_action_rawf : function(value) {
+            this.top("r.push(" + (this.string_interpolation(value)) + ");");
+        },
+        compile_action_js : function(value) {
+            this.top("(function(" + value + ") {");
+            this.bottom("})(dict);");
+            this.indent();
+            var lines = this.engine.tools.xml_node_to_string(this.node, true).split(/\r?\n/);
+            for (var i = 0, ilen = lines.length; i < ilen; i++) {
+                this.top(lines[i]);
+            }
+            this.process_children = false;
+        },
+        compile_action_debug : function(value) {
+            this.top("debugger;");
+        },
+        compile_action_log : function(value) {
+            this.top("console.log(" + this.format_expression(value) + ");");
+        }
+    });
+    return Element;
+})();
+
+window.QWeb2 = QWeb2;
+
+})();
diff --git a/addons/im_livechat/static/ext/static/js/require.js b/addons/im_livechat/static/ext/static/lib/requirejs/require.js
similarity index 92%
rename from addons/im_livechat/static/ext/static/js/require.js
rename to addons/im_livechat/static/ext/static/lib/requirejs/require.js
index f46a9245d97..52c2b076b7b 100644
--- a/addons/im_livechat/static/ext/static/js/require.js
+++ b/addons/im_livechat/static/ext/static/lib/requirejs/require.js
@@ -1,18 +1,18 @@
 /** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.2 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.8 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 */
+/*global window, navigator, document, importScripts, setTimeout, opera */
 
 var requirejs, require, define;
 (function (global) {
     var req, s, head, baseElement, dataMain, src,
         interactiveScript, currentlyAddingScript, mainScript, subPath,
-        version = '2.1.2',
+        version = '2.1.8',
         commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
         cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
         jsSuffixRegExp = /\.js$/,
@@ -21,9 +21,8 @@ var requirejs, require, define;
         ostring = op.toString,
         hasOwn = op.hasOwnProperty,
         ap = Array.prototype,
-        aps = ap.slice,
         apsp = ap.splice,
-        isBrowser = !!(typeof window !== 'undefined' && navigator && document),
+        isBrowser = !!(typeof window !== 'undefined' && navigator && window.document),
         isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
         //PS3 indicates loaded and complete, but need to wait for complete
         //specifically. Sequence is 'loading', 'loaded', execution,
@@ -135,6 +134,10 @@ var requirejs, require, define;
         return document.getElementsByTagName('script');
     }
 
+    function defaultOnError(err) {
+        throw err;
+    }
+
     //Allow getting a global that expressed in
     //dot notation, like 'a.b.c'.
     function getGlobal(value) {
@@ -192,15 +195,21 @@ var requirejs, require, define;
         var inCheckLoaded, Module, context, handlers,
             checkLoadedTimeoutId,
             config = {
+                //Defaults. Do not set a default for map
+                //config to speed up normalize(), which
+                //will run faster if there is no default.
                 waitSeconds: 7,
                 baseUrl: './',
                 paths: {},
                 pkgs: {},
                 shim: {},
-                map: {},
                 config: {}
             },
             registry = {},
+            //registry of just enabled modules, to speed
+            //cycle breaking code when lots of modules
+            //are registered, but not activated.
+            enabledRegistry = {},
             undefEvents = {},
             defQueue = [],
             defined = {},
@@ -296,7 +305,7 @@ var requirejs, require, define;
             }
 
             //Apply map config if available.
-            if (applyMap && (baseParts || starMap) && map) {
+            if (applyMap && map && (baseParts || starMap)) {
                 nameParts = name.split('/');
 
                 for (i = nameParts.length; i > 0; i -= 1) {
@@ -495,7 +504,12 @@ var requirejs, require, define;
                     fn(defined[id]);
                 }
             } else {
-                getModule(depMap).on(name, fn);
+                mod = getModule(depMap);
+                if (mod.error && name === 'error') {
+                    fn(mod.error);
+                } else {
+                    mod.on(name, fn);
+                }
             }
         }
 
@@ -566,7 +580,13 @@ var requirejs, require, define;
                         id: mod.map.id,
                         uri: mod.map.url,
                         config: function () {
-                            return (config.config && getOwn(config.config, mod.map.id)) || {};
+                            var c,
+                                pkg = getOwn(config.pkgs, mod.map.id);
+                            // For packages, only support config targeted
+                            // at the main module.
+                            c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) :
+                                      getOwn(config.config, mod.map.id);
+                            return  c || {};
                         },
                         exports: defined[mod.map.id]
                     });
@@ -577,6 +597,7 @@ var requirejs, require, define;
         function cleanRegistry(id) {
             //Clean up machinery used for waiting modules.
             delete registry[id];
+            delete enabledRegistry[id];
         }
 
         function breakCycle(mod, traced, processed) {
@@ -625,7 +646,7 @@ var requirejs, require, define;
             inCheckLoaded = true;
 
             //Figure out the state of all the modules.
-            eachProp(registry, function (mod) {
+            eachProp(enabledRegistry, function (mod) {
                 map = mod.map;
                 modId = map.id;
 
@@ -806,7 +827,7 @@ var requirejs, require, define;
             },
 
             /**
-             * Checks is the module is ready to define itself, and if so,
+             * Checks if the module is ready to define itself, and if so,
              * define it.
              */
             check: function () {
@@ -834,8 +855,13 @@ var requirejs, require, define;
                     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) {
+                            //to that instead of throwing an error. However,
+                            //only do it for define()'d  modules. require
+                            //errbacks should not be called for failures in
+                            //their callbacks (#699). However if a global
+                            //onError is set, use that.
+                            if ((this.events.error && this.map.isDefine) ||
+                                req.onError !== defaultOnError) {
                                 try {
                                     exports = context.execCb(id, factory, depExports, exports);
                                 } catch (e) {
@@ -863,8 +889,8 @@ var requirejs, require, define;
 
                             if (err) {
                                 err.requireMap = this.map;
-                                err.requireModules = [this.map.id];
-                                err.requireType = 'define';
+                                err.requireModules = this.map.isDefine ? [this.map.id] : null;
+                                err.requireType = this.map.isDefine ? 'define' : 'require';
                                 return onError((this.error = err));
                             }
 
@@ -884,7 +910,7 @@ var requirejs, require, define;
                         }
 
                         //Clean up
-                        delete registry[id];
+                        cleanRegistry(id);
 
                         this.defined = true;
                     }
@@ -918,8 +944,7 @@ var requirejs, require, define;
                         name = this.map.name,
                         parentName = this.map.parentMap ? this.map.parentMap.name : null,
                         localRequire = context.makeRequire(map.parentMap, {
-                            enableBuildCallback: true,
-                            skipMap: true
+                            enableBuildCallback: true
                         });
 
                     //If current map is not normalized, wait for that
@@ -1017,8 +1042,11 @@ var requirejs, require, define;
                         try {
                             req.exec(text);
                         } catch (e) {
-                            throw new Error('fromText eval for ' + moduleName +
-                                            ' failed: ' + e);
+                            return onError(makeError('fromtexteval',
+                                             'fromText eval for ' + id +
+                                            ' failed: ' + e,
+                                             e,
+                                             [id]));
                         }
 
                         if (hasInteractive) {
@@ -1048,6 +1076,7 @@ var requirejs, require, define;
             },
 
             enable: function () {
+                enabledRegistry[this.map.id] = this;
                 this.enabled = true;
 
                 //Set flag mentioning that the module is enabling,
@@ -1084,7 +1113,7 @@ var requirejs, require, define;
                         }));
 
                         if (this.errback) {
-                            on(depMap, 'error', this.errback);
+                            on(depMap, 'error', bind(this, this.errback));
                         }
                     }
 
@@ -1207,6 +1236,7 @@ var requirejs, require, define;
             Module: Module,
             makeModuleMap: makeModuleMap,
             nextTick: req.nextTick,
+            onError: onError,
 
             /**
              * Set a configuration for the context.
@@ -1233,6 +1263,9 @@ var requirejs, require, define;
                 eachProp(cfg, function (value, prop) {
                     if (objs[prop]) {
                         if (prop === 'map') {
+                            if (!config.map) {
+                                config.map = {};
+                            }
                             mixin(config[prop], value, true, true);
                         } else {
                             mixin(config[prop], value, true);
@@ -1344,7 +1377,7 @@ var requirejs, require, define;
                         //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);
+                            return req.get(context, deps, relMap, localRequire);
                         }
 
                         //Normalize module name, if it contains . or ..
@@ -1395,16 +1428,20 @@ var requirejs, require, define;
                      * plain URLs like nameToUrl.
                      */
                     toUrl: function (moduleNamePlusExt) {
-                        var index = moduleNamePlusExt.lastIndexOf('.'),
-                            ext = null;
+                        var ext,
+                            index = moduleNamePlusExt.lastIndexOf('.'),
+                            segment = moduleNamePlusExt.split('/')[0],
+                            isRelative = segment === '.' || segment === '..';
 
-                        if (index !== -1) {
+                        //Have a file extension alias, and it is not the
+                        //dots from a relative path.
+                        if (index !== -1 && (!isRelative || index > 1)) {
                             ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
                             moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
                         }
 
                         return context.nameToUrl(normalize(moduleNamePlusExt,
-                                                relMap && relMap.id, true), ext);
+                                                relMap && relMap.id, true), ext,  true);
                     },
 
                     defined: function (id) {
@@ -1449,10 +1486,11 @@ var requirejs, require, define;
 
             /**
              * 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.
+             * awaiting enablement. A second arg, parent, the parent module,
+             * is passed in for context, when this method is overriden by
+             * the optimizer. Not shown here to keep code compact.
              */
-            enable: function (depMap, parent) {
+            enable: function (depMap) {
                 var mod = getOwn(registry, depMap.id);
                 if (mod) {
                     getModule(depMap).enable();
@@ -1522,7 +1560,7 @@ var requirejs, require, define;
              * 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) {
+            nameToUrl: function (moduleName, ext, skipExt) {
                 var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
                     parentPath;
 
@@ -1571,7 +1609,7 @@ var requirejs, require, define;
 
                     //Join the path parts together, then figure out if baseUrl is needed.
                     url = syms.join('/');
-                    url += (ext || (/\?/.test(url) ? '' : '.js'));
+                    url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
                     url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
                 }
 
@@ -1587,7 +1625,7 @@ var requirejs, require, define;
             },
 
             /**
-             * Executes a module callack function. Broken out as a separate function
+             * Executes a module callback 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.
              *
@@ -1625,7 +1663,7 @@ var requirejs, require, define;
             onScriptError: function (evt) {
                 var data = getScriptData(evt);
                 if (!hasPathFallback(data.id)) {
-                    return onError(makeError('scripterror', 'Script error', evt, [data.id]));
+                    return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
                 }
             }
         };
@@ -1754,8 +1792,19 @@ var requirejs, require, define;
      * function. Intercept/override it if you want custom error handling.
      * @param {Error} err the error object.
      */
-    req.onError = function (err) {
-        throw err;
+    req.onError = defaultOnError;
+
+    /**
+     * Creates the node for the load command. Only used in browser envs.
+     */
+    req.createNode = function (config, moduleName, url) {
+        var 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;
+        return node;
     };
 
     /**
@@ -1772,12 +1821,7 @@ var requirejs, require, define;
             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 = req.createNode(config, moduleName, url);
 
             node.setAttribute('data-requirecontext', context.contextName);
             node.setAttribute('data-requiremodule', moduleName);
@@ -1810,7 +1854,7 @@ var requirejs, require, define;
                 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
+                //the error handler, so that does not help. If addEventListener
                 //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,
@@ -1839,16 +1883,24 @@ var requirejs, require, define;
 
             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);
+            try {
+                //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);
+                //Account for anonymous modules
+                context.completeLoad(moduleName);
+            } catch (e) {
+                context.onError(makeError('importscripts',
+                                'importScripts failed for ' +
+                                    moduleName + ' at ' + url,
+                                e,
+                                [moduleName]));
+            }
         }
     };
 
@@ -1880,24 +1932,31 @@ var requirejs, require, define;
             //baseUrl, if it is not already set.
             dataMain = script.getAttribute('data-main');
             if (dataMain) {
+                //Preserve dataMain in case it is a path (i.e. contains '?')
+                mainScript = 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('/');
+                    src = mainScript.split('/');
                     mainScript = src.pop();
                     subPath = src.length ? src.join('/')  + '/' : './';
 
                     cfg.baseUrl = subPath;
-                    dataMain = mainScript;
                 }
 
-                //Strip off any trailing .js since dataMain is now
+                //Strip off any trailing .js since mainScript is now
                 //like a module name.
-                dataMain = dataMain.replace(jsSuffixRegExp, '');
+                mainScript = mainScript.replace(jsSuffixRegExp, '');
+
+                 //If mainScript is still a path, fall back to dataMain
+                if (req.jsExtRegExp.test(mainScript)) {
+                    mainScript = dataMain;
+                }
 
                 //Put the data-main script in the files to load.
-                cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain];
+                cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
 
                 return true;
             }
@@ -1925,12 +1984,13 @@ var requirejs, require, define;
         //This module may not have dependencies
         if (!isArray(deps)) {
             callback = deps;
-            deps = [];
+            deps = null;
         }
 
         //If no name, and callback is a function, then figure out if it a
         //CommonJS thing with dependencies.
-        if (!deps.length && isFunction(callback)) {
+        if (!deps && isFunction(callback)) {
+            deps = [];
             //Remove comments from the callback string,
             //look for require calls, and pull them into the dependencies,
             //but only if there are function args.
@@ -1990,4 +2050,4 @@ var requirejs, require, define;
 
     //Set up with config info.
     req(cfg);
-}(this));
\ No newline at end of file
+}(this));
diff --git a/addons/im_livechat/static/ext/static/js/underscore.js b/addons/im_livechat/static/ext/static/lib/underscore/underscore.js
similarity index 59%
rename from addons/im_livechat/static/ext/static/js/underscore.js
rename to addons/im_livechat/static/ext/static/lib/underscore/underscore.js
index c2517054bfb..208d4cd890c 100644
--- a/addons/im_livechat/static/ext/static/js/underscore.js
+++ b/addons/im_livechat/static/ext/static/lib/underscore/underscore.js
@@ -1,7 +1,10 @@
-//     Underscore.js 1.4.3
-//     http://underscorejs.org
+//     Underscore.js 1.3.1
 //     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore may be freely distributed under the MIT license.
+//     Underscore is freely distributable under the MIT license.
+//     Portions of Underscore are inspired or borrowed from Prototype,
+//     Oliver Steele's Functional, and John Resig's Micro-Templating.
+//     For all details and documentation:
+//     http://documentcloud.github.com/underscore
 
 (function() {
 
@@ -21,9 +24,8 @@
   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,
+  var slice            = ArrayProto.slice,
+      unshift          = ArrayProto.unshift,
       toString         = ObjProto.toString,
       hasOwnProperty   = ObjProto.hasOwnProperty;
 
@@ -44,11 +46,7 @@
     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;
-  };
+  var _ = function(obj) { return new wrapper(obj); };
 
   // Export the Underscore object for **Node.js**, with
   // backwards-compatibility for the old `require()` API. If we're in
@@ -60,11 +58,11 @@
     }
     exports._ = _;
   } else {
-    root._ = _;
+    root['_'] = _;
   }
 
   // Current version.
-  _.VERSION = '1.4.3';
+  _.VERSION = '1.3.1';
 
   // Collection Functions
   // --------------------
@@ -78,7 +76,7 @@
       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;
+        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
       }
     } else {
       for (var key in obj) {
@@ -98,11 +96,10 @@
     each(obj, function(value, index, list) {
       results[results.length] = iterator.call(context, value, index, list);
     });
+    if (obj.length === +obj.length) results.length = obj.length;
     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) {
@@ -120,7 +117,7 @@
         memo = iterator.call(context, memo, value, index, list);
       }
     });
-    if (!initial) throw new TypeError(reduceError);
+    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
     return memo;
   };
 
@@ -133,22 +130,9 @@
       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;
+    var reversed = _.toArray(obj).reverse();
+    if (context && !initial) iterator = _.bind(iterator, context);
+    return initial ? _.reduce(reversed, iterator, memo, context) : _.reduce(reversed, iterator);
   };
 
   // Return the first value which passes a truth test. Aliased as `detect`.
@@ -178,23 +162,25 @@
 
   // 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);
+    var results = [];
+    if (obj == null) return results;
+    each(obj, function(value, index, list) {
+      if (!iterator.call(context, value, index, list)) results[results.length] = value;
+    });
+    return results;
   };
 
   // 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;
+    return result;
   };
 
   // Determine if at least one element in the object matches a truth test.
@@ -211,21 +197,23 @@
     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;
+  // Determine if a given value is included in the array or object using `===`.
+  // Aliased as `contains`.
+  _.include = _.contains = function(obj, target) {
+    var found = false;
+    if (obj == null) return found;
     if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    return any(obj, function(value) {
+    found = any(obj, function(value) {
       return value === target;
     });
+    return found;
   };
 
   // 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);
+      return (_.isFunction(method) ? method || value : value[method]).apply(value, args);
     });
   };
 
@@ -234,27 +222,11 @@
     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 && _.isArray(obj)) return Math.max.apply(Math, obj);
     if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity, value: -Infinity};
+    var result = {computed : -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});
@@ -264,11 +236,9 @@
 
   // 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 && _.isArray(obj)) return Math.min.apply(Math, obj);
     if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity, value: Infinity};
+    var result = {computed : 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});
@@ -278,110 +248,81 @@
 
   // 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;
+    var shuffled = [], rand;
+    each(obj, function(value, index, list) {
+      if (index == 0) {
+        shuffled[0] = value;
+      } else {
+        rand = Math.floor(Math.random() * (index + 1));
+        shuffled[index] = 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);
+  _.sortBy = function(obj, iterator, context) {
     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;
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
     }), '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);
+  _.groupBy = function(obj, val) {
+    var result = {};
+    var iterator = _.isFunction(val) ? val : function(obj) { return obj[val]; };
+    each(obj, function(value, index) {
+      var key = iterator(value, index);
+      (result[key] || (result[key] = [])).push(value);
     });
+    return result;
   };
 
-  // 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);
+  // Use a comparator function to figure out at what index an object should
+  // be inserted so as to maintain order. Uses binary search.
+  _.sortedIndex = function(array, obj, iterator) {
+    iterator || (iterator = _.identity);
     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;
+      var mid = (low + high) >> 1;
+      iterator(array[mid]) < iterator(obj) ? 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);
+  _.toArray = function(iterable) {
+    if (!iterable)                return [];
+    if (iterable.toArray)         return iterable.toArray();
+    if (_.isArray(iterable))      return slice.call(iterable);
+    if (_.isArguments(iterable))  return slice.call(iterable);
+    return _.values(iterable);
   };
 
   // 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;
+    return _.toArray(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;
+  // values in the array. Aliased as `head`. The **guard** check allows it to work
+  // with `_.map`.
+  _.first = _.head = function(array, n, guard) {
     return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
   };
 
-  // Returns everything but the last entry of the array. Especially useful on
+  // Returns everything but the last entry of the array. Especcialy 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`.
@@ -392,7 +333,6 @@
   // 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 {
@@ -400,34 +340,26 @@
     }
   };
 
-  // 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**
+  // Returns everything but the first entry of the array. Aliased as `tail`.
+  // Especially useful on the arguments object. Passing an **index** will return
+  // the rest of the values in the array from that index onward. 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);
+  _.rest = _.tail = function(array, index, guard) {
+    return slice.call(array, (index == null) || guard ? 1 : index);
   };
 
   // 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 _.filter(array, function(value){ return !!value; });
   };
 
   // Return a completely flattened version of an array.
   _.flatten = function(array, shallow) {
-    return flatten(array, shallow, []);
+    return _.reduce(array, function(memo, value) {
+      if (_.isArray(value)) return memo.concat(shallow ? value : _.flatten(value));
+      memo[memo.length] = value;
+      return memo;
+    }, []);
   };
 
   // Return a version of the array that does not contain the specified value(s).
@@ -438,33 +370,28 @@
   // 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]);
+  _.uniq = _.unique = function(array, isSorted, iterator) {
+    var initial = iterator ? _.map(array, iterator) : array;
+    var result = [];
+    _.reduce(initial, function(memo, el, i) {
+      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
+        memo[memo.length] = el;
+        result[result.length] = array[i];
       }
-    });
-    return results;
+      return memo;
+    }, []);
+    return result;
   };
 
   // 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));
+    return _.uniq(_.flatten(arguments, true));
   };
 
   // Produce an array that contains every item shared between all the
-  // passed-in arrays.
-  _.intersection = function(array) {
+  // passed-in arrays. (Aliased as "intersect" for back-compat.)
+  _.intersection = _.intersect = function(array) {
     var rest = slice.call(arguments, 1);
     return _.filter(_.uniq(array), function(item) {
       return _.every(rest, function(other) {
@@ -476,8 +403,8 @@
   // 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); });
+    var rest = _.flatten(slice.call(arguments, 1));
+    return _.filter(array, function(value){ return !_.include(rest, value); });
   };
 
   // Zip together multiple lists into a single array -- elements that share
@@ -486,28 +413,10 @@
     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);
-    }
+    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.
@@ -516,29 +425,22 @@
   // for **isSorted** to use binary search.
   _.indexOf = function(array, item, isSorted) {
     if (array == null) return -1;
-    var i = 0, l = array.length;
+    var i, l;
     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;
-      }
+      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;
+    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
+    for (i = 0, l = array.length; i < l; i++) if (i in array && array[i] === item) return i;
     return -1;
   };
 
   // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item, from) {
+  _.lastIndexOf = function(array, item) {
     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;
+    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
+    var i = array.length;
+    while (i--) if (i in array && array[i] === item) return i;
     return -1;
   };
 
@@ -574,8 +476,8 @@
   // 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;
+  _.bind = function bind(func, context) {
+    var bound, args;
     if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
     if (!_.isFunction(func)) throw new TypeError;
     args = slice.call(arguments, 2);
@@ -583,7 +485,6 @@
       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;
@@ -613,7 +514,7 @@
   // it with the arguments supplied.
   _.delay = function(func, wait) {
     var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(null, args); }, wait);
+    return setTimeout(function(){ return func.apply(func, args); }, wait);
   };
 
   // Defers a function, scheduling it to run after the current call stack has
@@ -625,47 +526,39 @@
   // 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);
-    };
+    var context, args, timeout, throttling, more;
+    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
     return function() {
-      var now = new Date;
-      var remaining = wait - (now - previous);
-      context = this;
-      args = arguments;
-      if (remaining <= 0) {
-        clearTimeout(timeout);
+      context = this; args = arguments;
+      var later = function() {
         timeout = null;
-        previous = now;
-        result = func.apply(context, args);
-      } else if (!timeout) {
-        timeout = setTimeout(later, remaining);
+        if (more) func.apply(context, args);
+        whenDone();
+      };
+      if (!timeout) timeout = setTimeout(later, wait);
+      if (throttling) {
+        more = true;
+      } else {
+        func.apply(context, args);
       }
-      return result;
+      whenDone();
+      throttling = true;
     };
   };
 
   // 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;
+  // N milliseconds.
+  _.debounce = function(func, wait) {
+    var timeout;
     return function() {
       var context = this, args = arguments;
       var later = function() {
         timeout = null;
-        if (!immediate) result = func.apply(context, args);
+        func.apply(context, args);
       };
-      var callNow = immediate && !timeout;
       clearTimeout(timeout);
       timeout = setTimeout(later, wait);
-      if (callNow) result = func.apply(context, args);
-      return result;
     };
   };
 
@@ -676,9 +569,7 @@
     return function() {
       if (ran) return memo;
       ran = true;
-      memo = func.apply(this, arguments);
-      func = null;
-      return memo;
+      return memo = func.apply(this, arguments);
     };
   };
 
@@ -687,8 +578,7 @@
   // conditionally execute the original function.
   _.wrap = function(func, wrapper) {
     return function() {
-      var args = [func];
-      push.apply(args, arguments);
+      var args = [func].concat(slice.call(arguments, 0));
       return wrapper.apply(this, args);
     };
   };
@@ -710,9 +600,7 @@
   _.after = function(times, func) {
     if (times <= 0) return func();
     return function() {
-      if (--times < 1) {
-        return func.apply(this, arguments);
-      }
+      if (--times < 1) { return func.apply(this, arguments); }
     };
   };
 
@@ -730,23 +618,7 @@
 
   // 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 _.map(obj, _.identity);
   };
 
   // Return a sorted list of the function names available on the object.
@@ -762,42 +634,18 @@
   // 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];
-        }
+      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];
-        }
+      for (var prop in source) {
+        if (obj[prop] == null) obj[prop] = source[prop];
       }
     });
     return obj;
@@ -817,16 +665,19 @@
     return obj;
   };
 
-  // Internal recursive comparison function for `isEqual`.
-  var eq = function(a, b, aStack, bStack) {
+  // Internal recursive comparison function.
+  function eq(a, b, stack) {
     // 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;
+    if (a._chain) a = a._wrapped;
+    if (b._chain) b = b._wrapped;
+    // Invoke a custom `isEqual` method if one is provided.
+    if (a.isEqual && _.isFunction(a.isEqual)) return a.isEqual(b);
+    if (b.isEqual && _.isFunction(b.isEqual)) return b.isEqual(a);
     // Compare `[[Class]]` names.
     var className = toString.call(a);
     if (className != toString.call(b)) return false;
@@ -856,15 +707,14 @@
     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;
+    var length = stack.length;
     while (length--) {
       // Linear search. Performance is inversely proportional to the number of
       // unique nested structures.
-      if (aStack[length] == a) return bStack[length] == b;
+      if (stack[length] == a) return true;
     }
     // Add the first object to the stack of traversed objects.
-    aStack.push(a);
-    bStack.push(b);
+    stack.push(a);
     var size = 0, result = true;
     // Recursively compare objects and arrays.
     if (className == '[object Array]') {
@@ -874,24 +724,20 @@
       if (result) {
         // Deep compare the contents, ignoring non-numeric properties.
         while (size--) {
-          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
+          // Ensure commutative equality for sparse arrays.
+          if (!(result = size in a == size in b && eq(a[size], b[size], stack))) 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;
-      }
+      // Objects with different constructors are not equivalent.
+      if ('constructor' in a != 'constructor' in b || a.constructor != b.constructor) 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;
+          if (!(result = _.has(b, key) && eq(a[key], b[key], stack))) break;
         }
       }
       // Ensure that both objects contain the same number of properties.
@@ -903,20 +749,18 @@
       }
     }
     // Remove the first object from the stack of traversed objects.
-    aStack.pop();
-    bStack.pop();
+    stack.pop();
     return result;
-  };
+  }
 
   // Perform a deep comparison to check if two objects are equal.
   _.isEqual = function(a, b) {
-    return eq(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;
@@ -924,7 +768,7 @@
 
   // Is a given value a DOM element?
   _.isElement = function(obj) {
-    return !!(obj && obj.nodeType === 1);
+    return !!(obj && obj.nodeType == 1);
   };
 
   // Is a given value an array?
@@ -938,36 +782,35 @@
     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.
+  // Is a given variable an arguments object?
+  _.isArguments = function(obj) {
+    return toString.call(obj) == '[object Arguments]';
+  };
   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 a given value a function?
+  _.isFunction = function(obj) {
+    return toString.call(obj) == '[object Function]';
   };
 
-  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
+  // Is a given value a string?
+  _.isString = function(obj) {
+    return toString.call(obj) == '[object String]';
+  };
+
+  // Is a given value a number?
+  _.isNumber = function(obj) {
+    return toString.call(obj) == '[object Number]';
+  };
+
+  // Is the given value `NaN`?
   _.isNaN = function(obj) {
-    return _.isNumber(obj) && obj != +obj;
+    // `NaN` is the only value for which `===` is not reflexive.
+    return obj !== obj;
   };
 
   // Is a given value a boolean?
@@ -975,6 +818,16 @@
     return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
   };
 
+  // Is a given value a date?
+  _.isDate = function(obj) {
+    return toString.call(obj) == '[object Date]';
+  };
+
+  // Is the given value a regular expression?
+  _.isRegExp = function(obj) {
+    return toString.call(obj) == '[object RegExp]';
+  };
+
   // Is a given value equal to null?
   _.isNull = function(obj) {
     return obj === null;
@@ -985,8 +838,7 @@
     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 own property?
   _.has = function(obj, key) {
     return hasOwnProperty.call(obj, key);
   };
@@ -1007,67 +859,20 @@
   };
 
   // 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;
+  _.times = function (n, iterator, context) {
+    for (var i = 0; i < n; i++) iterator.call(context, i);
   };
 
-  // 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));
+  // Escape a string for HTML interpolation.
+  _.escape = function(string) {
+    return (''+string).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27;').replace(/\//g,'&#x2F;');
   };
 
-  // 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.
+  // Add your own custom functions to the Underscore object, ensuring that
+  // they're correctly added to the OOP wrapper as well.
   _.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));
-      };
+      addToWrapper(name, _[name] = obj[name]);
     });
   };
 
@@ -1075,7 +880,7 @@
   // Useful for temporary DOM ids.
   var idCounter = 0;
   _.uniqueId = function(prefix) {
-    var id = '' + ++idCounter;
+    var id = idCounter++;
     return prefix ? prefix + id : id;
   };
 
@@ -1090,79 +895,41 @@
   // 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 = /(.)^/;
+  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'
+  // Within an interpolation, evaluation, or escaping, remove HTML escaping
+  // that had been previously added.
+  var unescape = function(code) {
+    return code.replace(/\\\\/g, '\\').replace(/\\'/g, "'");
   };
 
-  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, _);
+  _.template = function(str, data) {
+    var c  = _.templateSettings;
+    var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
+      'with(obj||{}){__p.push(\'' +
+      str.replace(/\\/g, '\\\\')
+         .replace(/'/g, "\\'")
+         .replace(c.escape || noMatch, function(match, code) {
+           return "',_.escape(" + unescape(code) + "),'";
+         })
+         .replace(c.interpolate || noMatch, function(match, code) {
+           return "'," + unescape(code) + ",'";
+         })
+         .replace(c.evaluate || noMatch, function(match, code) {
+           return "');" + unescape(code).replace(/[\r\n\t]/g, ' ') + ";__p.push('";
+         })
+         .replace(/\r/g, '\\r')
+         .replace(/\n/g, '\\n')
+         .replace(/\t/g, '\\t')
+         + "');}return __p.join('');";
+    var func = new Function('obj', '_', tmpl);
+    if (data) return func(data, _);
+    return function(data) {
+      return func.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.
@@ -1170,15 +937,29 @@
     return _(obj).chain();
   };
 
-  // OOP
+  // The OOP Wrapper
   // ---------------
+
   // 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.
+  var wrapper = function(obj) { this._wrapped = obj; };
+
+  // Expose `wrapper.prototype` as `_.prototype`
+  _.prototype = wrapper.prototype;
 
   // Helper function to continue chaining intermediate results.
-  var result = function(obj) {
-    return this._chain ? _(obj).chain() : obj;
+  var result = function(obj, chain) {
+    return chain ? _(obj).chain() : obj;
+  };
+
+  // A method to easily add functions to the OOP wrapper.
+  var addToWrapper = function(name, func) {
+    wrapper.prototype[name] = function() {
+      var args = slice.call(arguments);
+      unshift.call(args, this._wrapped);
+      return result(func.apply(_, args), this._chain);
+    };
   };
 
   // Add all of the Underscore functions to the wrapper object.
@@ -1187,35 +968,32 @@
   // 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);
+    wrapper.prototype[name] = function() {
+      var wrapped = this._wrapped;
+      method.apply(wrapped, arguments);
+      var length = wrapped.length;
+      if ((name == 'shift' || name == 'splice') && length === 0) delete wrapped[0];
+      return result(wrapped, this._chain);
     };
   });
 
   // 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));
+    wrapper.prototype[name] = function() {
+      return result(method.apply(this._wrapped, arguments), this._chain);
     };
   });
 
-  _.extend(_.prototype, {
+  // Start chaining a wrapped Underscore object.
+  wrapper.prototype.chain = function() {
+    this._chain = true;
+    return this;
+  };
 
-    // Start chaining a wrapped Underscore object.
-    chain: function() {
-      this._chain = true;
-      return this;
-    },
+  // Extracts the result from a wrapped and chained object.
+  wrapper.prototype.value = function() {
+    return this._wrapped;
+  };
 
-    // Extracts the result from a wrapped and chained object.
-    value: function() {
-      return this._wrapped;
-    }
-
-  });
-
-}).call(this);
\ No newline at end of file
+}).call(this);
diff --git a/addons/im_livechat/static/ext/test.html b/addons/im_livechat/static/ext/test.html
index c6047ded77d..22d33261227 100644
--- a/addons/im_livechat/static/ext/test.html
+++ b/addons/im_livechat/static/ext/test.html
@@ -1,8 +1,8 @@
 <!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>
+    <script type="text/javascript" src="http://localhost/im_livechat/static/ext/static/lib/requirejs/require.js"></script>
+    <script type="text/javascript" src='http://localhost/im_livechat/loader?p={"db":"testtrunk","channel":1}'></script>
 </head>
 <body style="height:100%; margin:0; padding:0;">
     <iframe src="http://openerp.com" height="100%" width=100%"></iframe>
diff --git a/addons/knowledge/i18n/th.po b/addons/knowledge/i18n/th.po
new file mode 100644
index 00000000000..3b5327841d8
--- /dev/null
+++ b/addons/knowledge/i18n/th.po
@@ -0,0 +1,118 @@
+# 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-06-21 18:52+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-06-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Documents"
+msgstr "เอกสาร"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_config_settings
+msgid "knowledge.config.settings"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_webdav:0
+msgid ""
+"Access your documents in OpenERP through WebDAV.\n"
+"                This installs the module document_webdav."
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_page:0
+msgid "This installs the module document_page."
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
+#: view:knowledge.config.settings:0
+msgid "Configure Knowledge"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Knowledge and Documents Management"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document:0
+msgid ""
+"This is a complete document management system, with: user authentication,\n"
+"                full document search (but pptx and docx are not supported), "
+"and a document dashboard.\n"
+"                This installs the module document."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_page:0
+msgid "Create static web pages"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_ftp:0
+msgid "Share repositories (FTP)"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document:0
+msgid "Manage documents"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Cancel"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "Apply"
+msgstr "ปรับใช้"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "ตั้งค่า"
+
+#. module: knowledge
+#: help:knowledge.config.settings,module_document_ftp:0
+msgid ""
+"Access your documents in OpenERP through an FTP interface.\n"
+"                This installs the module document_ftp."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.config.settings:0
+msgid "or"
+msgstr "หรือ"
+
+#. module: knowledge
+#: field:knowledge.config.settings,module_document_webdav:0
+msgid "Share repositories (WebDAV)"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
+msgid "Knowledge"
+msgstr "ความรู้"
diff --git a/addons/knowledge/static/src/img/icon.png b/addons/knowledge/static/description/icon.png
similarity index 100%
rename from addons/knowledge/static/src/img/icon.png
rename to addons/knowledge/static/description/icon.png
diff --git a/addons/l10n_ar/static/src/img/icon.png b/addons/l10n_ar/static/description/icon.png
similarity index 100%
rename from addons/l10n_ar/static/src/img/icon.png
rename to addons/l10n_ar/static/description/icon.png
diff --git a/addons/l10n_at/static/src/img/icon.png b/addons/l10n_at/static/description/icon.png
similarity index 100%
rename from addons/l10n_at/static/src/img/icon.png
rename to addons/l10n_at/static/description/icon.png
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index a956ea7ebe0..cd822045e64 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -58,6 +58,7 @@ Wizards provided by this module:
         'base_iban',
         'account_chart',
         'l10n_be_coda',
+        'l10n_multilang',
     ],
     'data': [
         'account_financial_report.xml',
@@ -68,11 +69,11 @@ Wizards provided by this module:
         'wizard/l10n_be_account_vat_declaration_view.xml',
         'wizard/l10n_be_vat_intra_view.xml',
         'wizard/l10n_be_partner_vat_listing.xml',
+        'wizard/account_wizard.xml',
         'l10n_be_sequence.xml',
         'fiscal_templates.xml',
         'account_fiscal_position_tax_template.xml',
         'security/ir.model.access.csv',
-        'l10n_be_wizard.yml'
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_be/account_chart_template.xml b/addons/l10n_be/account_chart_template.xml
index 5c803ac3df3..55726fdc335 100644
--- a/addons/l10n_be/account_chart_template.xml
+++ b/addons/l10n_be/account_chart_template.xml
@@ -12,6 +12,7 @@
             <field name="property_account_payable" ref="a_pay"/>
             <field name="property_account_expense_categ" ref="a_expense"/>
             <field name="property_account_income_categ" ref="a_sale"/>
+            <field name="spoken_languages" eval="'nl_BE'"/>
         </record>
 
 
diff --git a/addons/l10n_be/i18n_extra/nl_BE.po b/addons/l10n_be/i18n_extra/nl_BE.po
new file mode 100644
index 00000000000..7b60578713d
--- /dev/null
+++ b/addons/l10n_be/i18n_extra/nl_BE.po
@@ -0,0 +1,5104 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * l10n_be
+# Geert <info@kobaltwit.be>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-14 13:31+0000\n"
+"PO-Revision-Date: 2013-03-14 16:41+0100\n"
+"Last-Translator: Geert Janssens <geert@kobaltwit.be>\n"
+"Language-Team: \n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1
+msgid "CLASSE 1"
+msgstr ""
+"KLASSE 1 - EIGEN VERMOGEN, VOORZIENINGEN VOOR RISICO'S EN KOSTEN EN SCHULDEN "
+"OP MEER DAN ÉÉN JAAR"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a10
+msgid "CAPITAL"
+msgstr "KAPITAAL"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a100
+msgid "Capital souscrit ou capital personnel"
+msgstr "Geplaatst of persoonlijk kapitaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1000
+msgid "Capital non amorti"
+msgstr "Niet-afgeschreven kapitaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1001
+msgid "Capital amorti"
+msgstr "Afgeschreven kapitaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a101
+msgid "Capital non appelé"
+msgstr "Niet-opgevraagd kapitaal (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a109
+msgid "Compte de l'exploitant"
+msgstr "Rekening van de uitbater"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1090
+msgid "Opérations courantes"
+msgstr "Lopende rekeningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1091
+msgid "Impôts personnels"
+msgstr "Persoonlijke belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1092
+msgid "Rémunérations et autres avantages"
+msgstr "Vergoedingen en andere voordelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a11
+msgid "PRIMES D'EMISSION"
+msgstr "Uitgiftepremies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a12
+msgid "PLUS-VALUES DE REEVALUATION"
+msgstr "Vergoedingen en andere voordelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a120
+msgid "Plus-values de réévaluation sur immobilisations incorporelles"
+msgstr "Herwaarderingsmeerwaarden op immateriële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1200
+#: model:account.account.template,name:l10n_be.a1210
+#: model:account.account.template,name:l10n_be.a1220
+msgid "Plus-values de réévaluation"
+msgstr "Vergoedingen en andere voordelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1201
+#: model:account.account.template,name:l10n_be.a1211
+#: model:account.account.template,name:l10n_be.a1221
+msgid "Reprises de réductions de valeur"
+msgstr "Terugneming van waardeverminderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a121
+msgid "Plus-values de réévaluation sur immobilisations corporelles"
+msgstr "Herwaarderingsmeerwaarden op materiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a122
+msgid "Plus-values de réévaluation sur immobilisations financières"
+msgstr "Herwaarderingsmeerwaarden op financiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a123
+msgid "Plus-values de réévaluation sur stocks"
+msgstr "Herwaarderingsmeerwaarden op voorraden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a124
+msgid "Reprises de réductions de valeur sur placements de trésorerie"
+msgstr "Terugneming van waardeverminderingen op geldbeleggingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a13
+msgid "RESERVES"
+msgstr "Reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a130
+msgid "Réserve légale"
+msgstr "Wettelijke reserve"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a131
+msgid "Réserves indisponibles"
+msgstr "Onbeschikbare reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1310
+msgid "Réserve pour actions propres"
+msgstr "Reserve voor eigen aandelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1311
+msgid "Autres réserves indisponibles"
+msgstr "Andere onbeschikbare reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a132
+msgid "Réserves immunisées"
+msgstr "Belastingvrije reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a133
+msgid "Réserves disponibles"
+msgstr "Beschikbare reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1330
+msgid "Réserve pour régularisation de dividendes"
+msgstr "Reserve voor regularisering van dividenden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1331
+msgid "Réserve pour renouvellement des immobilisations"
+msgstr "Reserve voor de vernieuwing van vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1332
+msgid "Réserve pour installations en faveur du personnel  1333 Réserves libres"
+msgstr ""
+"Reserve voor installaties ten behoeve van het personeel  1333 Vrije reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a14
+msgid "BENEFICE (PERTE) REPORTE(E)"
+msgstr "Overgedragen winst (of Overgedragen verlies (-) )"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a140
+msgid "Bénéfice reporté"
+msgstr "Overgedragen winst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a141
+msgid "Perte reportée"
+msgstr "Overgedragen verlies (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a15
+msgid "SUBSIDES EN CAPITAL"
+msgstr "Kapitaalsubsidies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a150
+msgid "Montants obtenus"
+msgstr "Ontvangen bedragen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a151
+msgid "Montants transférés aux résultats"
+msgstr "Bedragen komende van het resultaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a16
+msgid "PROVISIONS POUR RISQUES ET CHARGES"
+msgstr "Voorzieningen en uitgestelde belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a160
+#: model:account.account.template,name:l10n_be.a635
+msgid "Provisions pour pensions et obligations similaires"
+msgstr "Voorzieningen voor pensioenen en soortgelijke verplichtingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a161
+msgid "Provisions pour charges fiscales"
+msgstr "Voorzieningen voor belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a162
+#: model:account.account.template,name:l10n_be.a636
+msgid "Provisions pour grosses réparations et gros entretiens"
+msgstr "Voorzieningen voor grote herstellingswerken en grote onderhoudswerken"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a163
+#: model:account.account.template,name:l10n_be.a169
+#: model:account.account.template,name:l10n_be.a637
+msgid "Provisions pour autres risques et charges"
+msgstr "Voorzieningen voor overige risico's en kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a164
+msgid ""
+"Provisions pour sûretés personnelles ou réelles constituées à l'appui de "
+"dettes et d'engagements de tiers"
+msgstr ""
+"Voorzieningen voor persoonlijke of zakelijke zekerheden om de schuld "
+"en verplichtingen van derden te ondersteunen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a165
+msgid ""
+"Provisions pour engagements relatifs à l'acquisition ou à la cession "
+"d'immobilisations"
+msgstr ""
+"Voorzieningen voor engagementen met betrekking tot de aankoop of verkoop van "
+"vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a166
+msgid "Provisions pour exécution de commandes passées ou reçues"
+msgstr "Voorzieningen voor uitvoering van geplaatste of ontvangen bestellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a167
+msgid ""
+"Provisions pour positions et marchés à terme en devises ou positions et "
+"marchés à terme en marchandises"
+msgstr "Voorzieningen voor posities en futures in valuta of handelsgoederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a168
+msgid ""
+"Provisions pour garanties techniques attachées aux ventes et prestations "
+"déjà effectuées par l'entreprise"
+msgstr ""
+"Voorzieningen voor technische garanties gekoppeld aan verkopen en reeds "
+"geleverde prestaties door de firma"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1690
+msgid "Pour litiges en cours"
+msgstr "Voor hangende geschillen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1691
+msgid "Pour amendes, doubles droits, pénalités"
+msgstr "Voor boetes en dubbele rechten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1692
+msgid "Pour propre assureur"
+msgstr "Voor eigen verzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1693
+msgid "Pour risques inhérents aux opérations de crédits à moyen ou long terme"
+msgstr ""
+"Voor risico's die inherent zijn aan krediettransacties op de middellange of "
+"lange termijn"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1695
+msgid "Provision pour charge de liquidation"
+msgstr "Voorziening voor kosten van vereffening"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1696
+msgid "Provision pour départ de personnel"
+msgstr "Voorziening voor ontslag personeel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1699
+msgid "Pour risques divers "
+msgstr "Voor diverse risico's"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a17
+msgid "DETTES A PLUS D'UN AN"
+msgstr "Schulden op meer dan één jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a170
+#: model:account.account.template,name:l10n_be.a420
+msgid "Emprunts subordonnés"
+msgstr "Achtergestelde leningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1700
+#: model:account.account.template,name:l10n_be.a1710
+#: model:account.account.template,name:l10n_be.a4200
+#: model:account.account.template,name:l10n_be.a4210
+msgid "Convertibles"
+msgstr "Converteerbaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1701
+#: model:account.account.template,name:l10n_be.a1711
+#: model:account.account.template,name:l10n_be.a4201
+#: model:account.account.template,name:l10n_be.a4211
+msgid "Non convertibles"
+msgstr "Niet converteerbaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a171
+#: model:account.account.template,name:l10n_be.a421
+msgid "Emprunts obligataires non subordonnés"
+msgstr "Niet-achtergestelde obligatieleningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a172
+msgid "Dettes de location-financement et assimilés"
+msgstr "Leasingschulden en soortgelijke"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1720
+msgid "Dettes de location-financement de biens immobiliers"
+msgstr "Leasingschulden van onroerende goederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1721
+msgid "Dettes de location-financement de biens mobiliers"
+msgstr "Leasingschulden van roerende goederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1722
+msgid "Dettes sur droits réels sur immeubles"
+msgstr "Schulden op zakelijke rechten op gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a173
+#: model:account.account.template,name:l10n_be.a423
+msgid "Etablissements de crédit"
+msgstr "Kredietinstellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1730
+#: model:account.account.template,name:l10n_be.a4230
+msgid "Dettes en compte"
+msgstr "Schulden op rekeningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a17300
+#: model:account.account.template,name:l10n_be.a17310
+#: model:account.account.template,name:l10n_be.a17320
+msgid "Banque A"
+msgstr "Bank A"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a17301
+#: model:account.account.template,name:l10n_be.a17311
+#: model:account.account.template,name:l10n_be.a17321
+msgid "Banque B"
+msgstr "Bank B"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1731
+#: model:account.account.template,name:l10n_be.a4231
+msgid "Promesses"
+msgstr "Promessen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1732
+#: model:account.account.template,name:l10n_be.a4232
+msgid "Crédits d'acceptation"
+msgstr "Acceptkredieten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a174
+#: model:account.account.template,name:l10n_be.a424
+#: model:account.account.template,name:l10n_be.a439
+msgid "Autres emprunts"
+msgstr "Overige leningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a175
+#: model:account.account.template,name:l10n_be.a425
+msgid "Dettes commerciales"
+msgstr "Handelsschulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1750
+msgid "Fournisseurs : dettes en compte"
+msgstr "Leveranciers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a17500
+#: model:account.account.template,name:l10n_be.a17510
+#: model:account.account.template,name:l10n_be.a4400
+#: model:account.account.template,name:l10n_be.a4410
+msgid "Entreprises apparentées"
+msgstr "Aanverwante bedrijven"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a175000
+#: model:account.account.template,name:l10n_be.a175100
+#: model:account.account.template,name:l10n_be.a1790
+#: model:account.account.template,name:l10n_be.a4020
+#: model:account.account.template,name:l10n_be.a4030
+#: model:account.account.template,name:l10n_be.a4290
+#: model:account.account.template,name:l10n_be.a44100
+#: model:account.account.template,name:l10n_be.a_pay
+msgid "Entreprises liées"
+msgstr "Aanverwante bedrijven"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a175001
+#: model:account.account.template,name:l10n_be.a175101
+#: model:account.account.template,name:l10n_be.a4291
+#: model:account.account.template,name:l10n_be.a44001
+#: model:account.account.template,name:l10n_be.a44101
+msgid "Entreprises avec lesquelles il existe un lien de participation"
+msgstr "Bedrijven waarin een participatie is"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a17501
+#: model:account.account.template,name:l10n_be.a17511
+#: model:account.account.template,name:l10n_be.a4401
+#: model:account.account.template,name:l10n_be.a4411
+msgid "Fournisseurs ordinaires"
+msgstr "Vaste leveranciers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a175010
+#: model:account.account.template,name:l10n_be.a175110
+#: model:account.account.template,name:l10n_be.a44010
+#: model:account.account.template,name:l10n_be.a44110
+msgid "Fournisseurs belges"
+msgstr "Belgische leveranciers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a175011
+#: model:account.account.template,name:l10n_be.a175111
+msgid "Fournisseurs C.E.E."
+msgstr "EEG leveranciers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a175012
+#: model:account.account.template,name:l10n_be.a175112
+#: model:account.account.template,name:l10n_be.a44012
+#: model:account.account.template,name:l10n_be.a44112
+msgid "Fournisseurs importation"
+msgstr "Import leveranciers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1751
+#: model:account.account.template,name:l10n_be.a4251
+#: model:account.account.template,name:l10n_be.a441
+msgid "Effets à payer"
+msgstr "Te betalen wissels"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a176
+msgid "Acomptes reçus sur commandes"
+msgstr "Ontvangen vooruitbetalingen op bestellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a178
+#: model:account.account.template,name:l10n_be.a426
+#: model:account.account.template,name:l10n_be.a488
+msgid "Cautionnements reçus en numéraires"
+msgstr "Borgtochten ontvangen in contanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a179
+#: model:account.account.template,name:l10n_be.a429
+msgid "Dettes diverses"
+msgstr "Overige schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1791
+#: model:account.account.template,name:l10n_be.a4021
+#: model:account.account.template,name:l10n_be.a4031
+msgid "Autres entreprises avec lesquelles il existe un lien de participation"
+msgstr "Overige bedrijven waarin een participatie is"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1792
+#: model:account.account.template,name:l10n_be.a4292
+msgid "Administrateurs, gérants, associés"
+msgstr "Bestuurders, zaakvoerders, partners"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1794
+msgid "Rentes viagères capitalisées"
+msgstr "Geactiveerde lijfrenten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1798
+msgid ""
+"Dettes envers les coparticipants des associations momentanées et en "
+"participation"
+msgstr "Schulden aan deelnemers van tijdelijke verenigingen en participaties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a1799
+#: model:account.account.template,name:l10n_be.a489
+msgid "Autres dettes diverses"
+msgstr "Overige diverse schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a18
+msgid "COMPTES DE LIAISON DES ETABLISSEMENTS ET SUCCURSALES"
+msgstr "VESTIGINGEN EN FILIALEN"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2
+msgid ""
+"CLASSE 2. FRAIS D'ETABLISSEMENT. ACTIFS IMMOBILISES ET CREANCES A PLUS D'UN "
+"AN"
+msgstr ""
+"KLASSE 2. OPRICHTINGSKOSTEN, VASTE ACTIVA EN VORDERINGEN OP MEER DAN ÉÉN JAAR"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a20
+msgid "FRAIS D'ETABLISSEMENT"
+msgstr "Oprichtingskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a200
+#: model:account.account.template,name:l10n_be.a2000
+msgid "Frais de constitution et d'augmentation de capital"
+msgstr "Oprichtingskosten en kapitaalverhoging"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2009
+msgid "Amortissements sur frais de constitution et d'augmentation de capital"
+msgstr "Afschrijvingen op oprichtingskosten en kapitaalverhoging"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a201
+msgid "Frais d'émission d'emprunts et primes de remboursement"
+msgstr "Kosten bij uitgifte van leningen en terugbetalingspremies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2010
+msgid "Agios sur emprunts et frais d'émission d'emprunts"
+msgstr "Premies op leningen en kosten op uitgifte van leningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2019
+msgid "Amortissements sur agios sur emprunts et frais d'émission d'emprunts"
+msgstr ""
+"Afschrijving van premies op leningen en kosten op uitgifte van leningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a202
+#: model:account.account.template,name:l10n_be.a2020
+msgid "Autres frais d'établissement"
+msgstr "Overige oprichtingskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2029
+msgid "Amortissements sur autres frais d'établissement"
+msgstr "Afschrijvingen op overige oprichtingskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a203
+#: model:account.account.template,name:l10n_be.a2030
+msgid "Intérêts intercalaires"
+msgstr "Bouwrente"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2039
+msgid "Amortissements sur intérêts intercalaires"
+msgstr "Afschrijving van bouwrente"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a204
+msgid "Frais de restructuration"
+msgstr "Herstructureringskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2040
+msgid "Coût des frais de restructuration"
+msgstr "Kosten op herstructureringskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2049
+msgid "Amortissements sur frais de restructuration"
+msgstr "Afschrijving op herstructureringskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a21
+msgid "IMMOBILISATIONS INCORPORELLES"
+msgstr "Immateriële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a210
+msgid "Frais de recherche et de développement"
+msgstr "Kosten van onderzoek en ontwikkeling"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2100
+msgid "Frais de recherche et de mise au point"
+msgstr "Kosten van onderzoek en ontwikkeling"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2108
+msgid "Plus-values actées sur frais de recherche et de mise au point"
+msgstr "Gerealiseerde meerwaarden op onderzoek en ontwikkeling"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2109
+msgid "Amortissements sur frais de recherche et de mise au point"
+msgstr "Afschrijving van kosten van onderzoek en ontwikkeling"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a211
+msgid ""
+"Concessions, brevets, licences, savoir-faire, marques et droits similaires"
+msgstr ""
+"Concessies, octrooien, licenties, know-how, merken en soortgelijke rechten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2110
+msgid "Concessions, brevets, licences, savoir-faire, marques, etc..."
+msgstr "Consessies, octrooien, licenties, ..."
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2118
+msgid "Plus-values actées sur concessions, brevets, etc..."
+msgstr "Gerealiseerde meerwaarden op consessies, octrooien, licenties, ..."
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2119
+msgid "Amortissements sur concessions, brevets, etc..."
+msgstr "Afschrijvingen op consessies, octrooien, licenties, ..."
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a212
+msgid "Goodwill"
+msgstr "Goodwill"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2120
+msgid "Coût d'acquisition"
+msgstr "Overnameprijs"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2128
+#: model:account.account.template,name:l10n_be.a2218
+#: model:account.account.template,name:l10n_be.a2228
+#: model:account.account.template,name:l10n_be.a2238
+#: model:account.account.template,name:l10n_be.a238
+#: model:account.account.template,name:l10n_be.a2408
+#: model:account.account.template,name:l10n_be.a2808
+#: model:account.account.template,name:l10n_be.a2828
+#: model:account.account.template,name:l10n_be.a2848
+msgid "Plus-values actées"
+msgstr "Gerealiseerde meerwaarden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2129
+msgid "Amortissements sur goodwill"
+msgstr "Afschrijvingen op goodwill"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a213
+#: model:account.account.template,name:l10n_be.a2906
+#: model:account.account.template,name:l10n_be.a360
+#: model:account.account.template,name:l10n_be.a406
+msgid "Acomptes versés"
+msgstr "Vooruitbetalingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22
+msgid "TERRAINS ET CONSTRUCTIONS"
+msgstr "Terreinen en gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a220
+#: model:account.account.template,name:l10n_be.a2200
+#: model:account.account.template,name:l10n_be.a2500
+msgid "Terrains"
+msgstr "Terreinen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2201
+msgid "Frais d'acquisition sur terrains"
+msgstr "Verwervingskosten van terreinen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2208
+msgid "Plus-values actées sur terrains"
+msgstr "Gerealiseerde meerwaarden op terreinen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2209
+msgid "Amortissements et réductions de valeur"
+msgstr "Afschrijvingen & waardeverminderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22090
+msgid "Amortissements sur frais d'acquisition"
+msgstr "Afschrijvingen op verwervingskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22091
+msgid "Réductions de valeur sur terrains"
+msgstr "Waardevermindering van terreinen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a221
+#: model:account.account.template,name:l10n_be.a2501
+#: model:account.account.template,name:l10n_be.a2700
+msgid "Constructions"
+msgstr "Gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2210
+#: model:account.account.template,name:l10n_be.a22200
+msgid "Bâtiments industriels"
+msgstr "Industriële gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2211
+#: model:account.account.template,name:l10n_be.a22201
+msgid "Bâtiments administratifs et commerciaux"
+msgstr "Administratieve en commerciële gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2212
+#: model:account.account.template,name:l10n_be.a22202
+msgid "Autres bâtiments d'exploitation"
+msgstr "Andere uitbatingsgebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2213
+#: model:account.account.template,name:l10n_be.a22203
+msgid "Voies de transport et ouvrages d'art"
+msgstr "Transportwegen en kunstwerken"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2215
+msgid "Constructions sur sol d'autrui"
+msgstr "Gebouwen in buitenland"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2216
+msgid "Frais d'acquisition sur constructions"
+msgstr "Verwervingskosten van gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22180
+#: model:account.account.template,name:l10n_be.a22190
+#: model:account.account.template,name:l10n_be.a22280
+#: model:account.account.template,name:l10n_be.a22290
+msgid "Sur bâtiments industriels"
+msgstr "Op industriële gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22181
+#: model:account.account.template,name:l10n_be.a22191
+#: model:account.account.template,name:l10n_be.a22281
+#: model:account.account.template,name:l10n_be.a22291
+msgid "Sur bâtiments administratifs et commerciaux"
+msgstr "Op administratieve en commerciële gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22182
+#: model:account.account.template,name:l10n_be.a22192
+#: model:account.account.template,name:l10n_be.a22282
+#: model:account.account.template,name:l10n_be.a22292
+msgid "Sur autres bâtiments d'exploitation"
+msgstr "Op andere uitbatingsgebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22184
+#: model:account.account.template,name:l10n_be.a22194
+#: model:account.account.template,name:l10n_be.a22283
+#: model:account.account.template,name:l10n_be.a22293
+msgid "Sur voies de transport et ouvrages d'art"
+msgstr "Op transportwegen en kunstwerken"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2219
+msgid "Amortissements sur constructions"
+msgstr "Afschrijvingen op gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22195
+msgid "Sur constructions sur sol d'autrui"
+msgstr "Op gebouwen in het buitenland"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22196
+msgid "Sur frais d'acquisition sur constructions"
+msgstr "Op verwervingskosten van gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a222
+msgid "Terrains bâtis"
+msgstr "Bebouwde terreinen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2220
+#: model:account.account.template,name:l10n_be.a2230
+#: model:account.account.template,name:l10n_be.a2800
+#: model:account.account.template,name:l10n_be.a2820
+#: model:account.account.template,name:l10n_be.a2840
+#: model:account.account.template,name:l10n_be.a300
+#: model:account.account.template,name:l10n_be.a310
+#: model:account.account.template,name:l10n_be.a320
+#: model:account.account.template,name:l10n_be.a330
+#: model:account.account.template,name:l10n_be.a340
+#: model:account.account.template,name:l10n_be.a350
+#: model:account.account.template,name:l10n_be.a370
+#: model:account.account.template,name:l10n_be.a510
+#: model:account.account.template,name:l10n_be.a520
+msgid "Valeur d'acquisition"
+msgstr "Aanschaffingswaarde"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22204
+msgid "Frais d'acquisition des terrains à bâtir"
+msgstr "Verwervingskosten van bouwgronden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2229
+msgid "Amortissements sur terrains bâtis"
+msgstr "Afschrijvingen op bebouwde terreinen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a22294
+msgid "Sur frais d'acquisition des terrains bâtis"
+msgstr "Op verwervingskosten van bebouwde terreinen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a223
+msgid "Autres droits réels sur des immeubles"
+msgstr "Overige zakelijke rechten op onroerende goederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2239
+#: model:account.account.template,name:l10n_be.a239
+#: model:account.account.template,name:l10n_be.a2409
+msgid "Amortissements"
+msgstr "Afschijvingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a23
+msgid "INSTALLATIONS, MACHINES ET OUTILLAGE"
+msgstr "Installaties, machines en uitrusting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a230
+#: model:account.account.template,name:l10n_be.a2510
+msgid "Installations"
+msgstr "Installaties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2300
+msgid "Installation d'eau"
+msgstr "Waterinstallatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2301
+msgid "Installation d'électricité"
+msgstr "Electriciteitsinstallatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2302
+msgid "Installation de vapeur"
+msgstr "Stoominstallatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2303
+msgid "Installation de gaz"
+msgstr "Gasinstallatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2304
+msgid "Installation de chauffage"
+msgstr "Verwarmingsinstallatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2305
+msgid "Installation de conditionnement d'air"
+msgstr "Luchtverversingsinstallatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2306
+msgid "Installation de chargement"
+msgstr "Oplaadinstallatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a231
+#: model:account.account.template,name:l10n_be.a2511
+msgid "Machines"
+msgstr "Machines"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2310
+#: model:account.account.template,name:l10n_be.a2370
+msgid "Division A"
+msgstr "Divisie A"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2311
+#: model:account.account.template,name:l10n_be.a2371
+msgid "Division B"
+msgstr "Divisie B"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a237
+#: model:account.account.template,name:l10n_be.a2512
+msgid "Outillage"
+msgstr "Uitrusting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2380
+#: model:account.account.template,name:l10n_be.a2390
+msgid "Sur installations"
+msgstr "Op installaties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2381
+#: model:account.account.template,name:l10n_be.a2391
+msgid "Sur machines"
+msgstr "Op machines"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2382
+#: model:account.account.template,name:l10n_be.a2392
+msgid "Sur outillage"
+msgstr "Op uitrusting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24
+msgid "MOBILIER ET MATERIEL ROULANT"
+msgstr "Meubilair en rollend materieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a240
+#: model:account.account.template,name:l10n_be.a2400
+#: model:account.account.template,name:l10n_be.a2520
+msgid "Mobilier"
+msgstr "Meubilair"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24000
+msgid "Mobilier des bâtiments industriels"
+msgstr "Van industriële gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24001
+msgid "Mobilier des bâtiments administratifs et commerciaux"
+msgstr "Van administratieve en commerciële gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24002
+msgid "Mobilier des autres bâtiments d'exploitation"
+msgstr "Van andere uitbatingsgebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24003
+msgid "Mobilier oeuvres sociales"
+msgstr "Van sociale werkplaatsen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2401
+msgid "Matériel de bureau et de service social"
+msgstr "Kantoormateriaal en materiaal van sociale dienst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24010
+msgid "Des bâtiments industriels"
+msgstr "Van industriële gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24011
+msgid "Des bâtiments administratifs et commerciaux"
+msgstr ""
+"Van administratieve en commerciële gebouwenDes bâtiments administratifs et "
+"commerciaux"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24012
+msgid "Des autres bâtiments d'exploitation"
+msgstr "Van andere uitbatingsgebouwenDes autres bâtiments d'exploitation"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24013
+msgid "Des oeuvres sociales"
+msgstr "Van sociale werkplaatsenDes oeuvres sociales"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24080
+msgid "Plus-values actées sur mobilier"
+msgstr "Gerealiseerde meerwaarden op meubilair"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24081
+msgid "Plus-values actées sur matériel de bureau et service social"
+msgstr ""
+"Gerealiseerde meerwaarden op kantoormateriaal en materiaal van sociale dienst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24090
+msgid "Amortissements sur mobilier"
+msgstr "Afschrijvingen op meubilair"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24091
+msgid "Amortissements sur matériel de bureau et service social"
+msgstr "Afschrijvingen op kantoormateriaal en materiaal van sociale dienst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a241
+#: model:account.account.template,name:l10n_be.a2521
+msgid "Matériel roulant"
+msgstr "Rollend materieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2410
+msgid "Matériel automobile"
+msgstr "Wagens"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24100
+msgid "Voitures"
+msgstr "Wagens"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24105
+msgid "Camions"
+msgstr "Vrachtwagens"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2411
+msgid "Matériel ferroviaire"
+msgstr "Spoorwegmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2412
+msgid "Matériel fluvial"
+msgstr "Binnenscheepvaartmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2413
+msgid "Matériel naval"
+msgstr "Scheepvaartmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2414
+msgid "Matériel aérien"
+msgstr "Luchtvaartmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2418
+msgid "Plus-values sur matériel roulant"
+msgstr "Gerealiseerde meerwaarden op rollend materieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24180
+msgid "Plus-values sur matériel automobile"
+msgstr "Gerealiseerde meerwaarden op wagenuitrusting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24181
+#: model:account.account.template,name:l10n_be.a24191
+msgid "Idem sur matériel ferroviaire"
+msgstr "Idem op spoorwegmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24182
+#: model:account.account.template,name:l10n_be.a24192
+msgid "Idem sur matériel fluvial"
+msgstr "Idem op binnenscheepvaartmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24183
+#: model:account.account.template,name:l10n_be.a24193
+msgid "Idem sur matériel naval"
+msgstr "Idem op scheepvaartmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24184
+#: model:account.account.template,name:l10n_be.a24194
+msgid "Idem sur matériel aérien"
+msgstr "Idem op luchtvaartmaterieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2419
+msgid "Amortissements sur matériel roulant"
+msgstr "Afschrijvingen op rollend materieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a24190
+msgid "Amortissements sur matériel automobile"
+msgstr "Afschrijvingen op wagenuitrusting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a25
+msgid "IMMOBILISATION DETENUES EN LOCATION-FINANCEMENT ET DROITS SIMILAIRES"
+msgstr "Vaste activa in leasing of op grond van een soortgelijk recht"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a250
+msgid "Terrains et constructions"
+msgstr "Terreinen en gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2508
+msgid ""
+"Plus-values sur emphytéose, leasing et droits similaires : terrains et "
+"constructions"
+msgstr ""
+"Winsten op erfpacht, leasing en soortgelijke rechten: terreinen en gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2509
+msgid ""
+"Amortissements et réductions de valeur sur terrains et constructions en "
+"leasing"
+msgstr ""
+"Afschrijvingen en waardeverminderingen op terreinen en gehuurde gebouwen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a251
+#: model:account.account.template,name:l10n_be.a2701
+msgid "Installations, machines et outillage"
+msgstr "Installaties, machines en uitrusting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2518
+msgid ""
+"Plus-values actées sur installations, machines et outillage pris en leasing"
+msgstr ""
+"Gerealiseerde meerwaarden op geleasde installaties, machines en gereeddschap"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2519
+msgid "Amortissements sur installations, machines et outillage pris en leasing"
+msgstr "Afschrijvingen op geleasde installaties, machines en gereeddschap"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a252
+#: model:account.account.template,name:l10n_be.a2702
+msgid "Mobilier et matériel roulant"
+msgstr "Meubilair en rollend materieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2528
+msgid "Plus-values actées sur mobilier et matériel roulant en leasing"
+msgstr "Gerealiseerde meerwaarden op geleasd rollend materieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2529
+msgid "Amortissements sur mobilier et matériel roulant en leasing"
+msgstr "Afschrijvingen op geleasd rollend materieel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a26
+msgid "AUTRES IMMOBILISATIONS CORPORELLES"
+msgstr "Andere materiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a260
+msgid "Frais d'aménagements de locaux pris en location"
+msgstr "Inrichtingskosten gehuurde lokalen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a261
+msgid "Maison d'habitation"
+msgstr "Woonhuis"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a262
+msgid "Réserve immobilière"
+msgstr "Vastgoed reserve"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a263
+msgid "Matériel d'emballage"
+msgstr "Verpakkingsmateriaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a264
+#: model:account.account.template,name:l10n_be.a31061
+msgid "Emballages récupérables"
+msgstr "Herbruikbare verpakkingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a268
+msgid "Plus-values actées sur autres immobilisations corporelles"
+msgstr "Gerealiseerde meerwaarden op overige vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a269
+msgid "Amortissements sur autres immobilisations corporelles"
+msgstr "Afschrijvingen overige vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2690
+msgid "Amortissements sur frais d'aménagement des locaux pris en location"
+msgstr "Op inrichtingskosten gehuurde lokalen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2691
+msgid "Amortissements sur maison d'habitation"
+msgstr "Op woonhuis"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2692
+msgid "Amortissements sur réserve immobilière"
+msgstr "Op vastgoed reserve"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2693
+msgid "Amortissements sur matériel d'emballage"
+msgstr "Op verpakkingsmateriaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2694
+msgid "Amortissements sur emballages récupérables"
+msgstr "Op Herbruikbare verpakkingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a27
+msgid "IMMOBILISATIONS CORPORELLES EN COURS ET ACOMPTES VERSES"
+msgstr "Vaste activa in aanbouw en vooruitbetalingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a270
+msgid "Immobilisations en cours"
+msgstr "Gebouwen in aanbouw"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2703
+msgid "Autres immobilisations corporelles"
+msgstr "Overige vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a271
+msgid "Avances et acomptes versés sur immobilisations en cours"
+msgstr "Voorschotten en vooruitbetalingen bestemd voor gebouwen in aanbouw"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a28
+msgid "IMMOBILISATIONS FINANCIERES"
+msgstr "Financiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a280
+msgid "Participations dans des entreprises liées"
+msgstr "Deelnemingen in verbonden ondernemingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2801
+#: model:account.account.template,name:l10n_be.a2821
+#: model:account.account.template,name:l10n_be.a2841
+#: model:account.account.template,name:l10n_be.a511
+msgid "Montants non appelés"
+msgstr "Nog te storten bedragen (-) "
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2809
+#: model:account.account.template,name:l10n_be.a2819
+#: model:account.account.template,name:l10n_be.a2829
+#: model:account.account.template,name:l10n_be.a2839
+#: model:account.account.template,name:l10n_be.a359
+msgid "Réductions de valeurs actées"
+msgstr "Geboekte waardeverminderingen (-) "
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a281
+msgid "Créances sur des entreprises liées"
+msgstr "Vorderingen op verbonden ondernemingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2810
+#: model:account.account.template,name:l10n_be.a2830
+#: model:account.account.template,name:l10n_be.a2850
+#: model:account.account.template,name:l10n_be.a2910
+msgid "Créances en compte"
+msgstr "Vorderingen op rekening"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2811
+#: model:account.account.template,name:l10n_be.a2831
+#: model:account.account.template,name:l10n_be.a2851
+#: model:account.account.template,name:l10n_be.a2901
+#: model:account.account.template,name:l10n_be.a2911
+#: model:account.account.template,name:l10n_be.a401
+#: model:account.account.template,name:l10n_be.a4010
+msgid "Effets à recevoir"
+msgstr "Te innen wissels"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2812
+msgid "Titres à revenu fixes"
+msgstr "Vastrentende effecten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2817
+#: model:account.account.template,name:l10n_be.a2837
+#: model:account.account.template,name:l10n_be.a2857
+#: model:account.account.template,name:l10n_be.a2907
+#: model:account.account.template,name:l10n_be.a2917
+#: model:account.account.template,name:l10n_be.a407
+#: model:account.account.template,name:l10n_be.a417
+msgid "Créances douteuses"
+msgstr "Dubieuze debiteuren"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a282
+msgid ""
+"Participations dans des entreprises avec lesquelles il existe un lien de "
+"participation"
+msgstr ""
+"Deelnemingen in ondernemingen waarmee een deelnemingsverhouding bestaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a283
+msgid ""
+"Créances sur des entreprises avec lesquelles il existe un lien de "
+"participation"
+msgstr "Vorderingen op ondernemingen waarmee een deelnemingsverhouding bestaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2832
+#: model:account.account.template,name:l10n_be.a2852
+msgid "Titres à revenu fixe"
+msgstr "Vastrentende effecten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a284
+msgid "Autres actions et parts"
+msgstr "Andere aandelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2849
+#: model:account.account.template,name:l10n_be.a2859
+#: model:account.account.template,name:l10n_be.a2909
+#: model:account.account.template,name:l10n_be.a2919
+#: model:account.account.template,name:l10n_be.a309
+#: model:account.account.template,name:l10n_be.a319
+#: model:account.account.template,name:l10n_be.a329
+#: model:account.account.template,name:l10n_be.a339
+#: model:account.account.template,name:l10n_be.a349
+#: model:account.account.template,name:l10n_be.a369
+#: model:account.account.template,name:l10n_be.a379
+#: model:account.account.template,name:l10n_be.a409
+#: model:account.account.template,name:l10n_be.a419
+#: model:account.account.template,name:l10n_be.a519
+#: model:account.account.template,name:l10n_be.a529
+#: model:account.account.template,name:l10n_be.a539
+msgid "Réductions de valeur actées"
+msgstr "Geboekte waardeverminderingen (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a285
+#: model:account.account.template,name:l10n_be.a291
+#: model:account.account.template,name:l10n_be.a41671
+msgid "Autres créances"
+msgstr "Overige vorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a288
+#: model:account.account.template,name:l10n_be.a418
+msgid "Cautionnements versés en numéraires"
+msgstr "Borgtochten betaald in contanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2880
+msgid "Téléphone, télefax, télex"
+msgstr "Telefoon, fax, telex"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2881
+#: model:account.account.template,name:l10n_be.a61201
+msgid "Gaz"
+msgstr "Gas"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2882
+#: model:account.account.template,name:l10n_be.a61200
+msgid "Eau"
+msgstr "Water"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2883
+#: model:account.account.template,name:l10n_be.a61202
+msgid "Electricité"
+msgstr "Elektriciteit"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2887
+msgid "Autres cautionnements versés en numéraires"
+msgstr "Andere borgtochten betaald in contanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29
+msgid "CREANCES A PLUS D'UN AN"
+msgstr "Vorderingen op meer dan één jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a290
+msgid "Créances commerciales"
+msgstr "Handelsvorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2900
+#: model:account.account.template,name:l10n_be.a400
+#: model:account.account.template,name:l10n_be.a_recv
+msgid "Clients"
+msgstr "Klanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29000
+msgid "Créances en compte sur entreprises liées"
+msgstr "Vorderingen voor rekening van verbonden ondernemingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29001
+#: model:account.account.template,name:l10n_be.a29011
+#: model:account.account.template,name:l10n_be.a29111
+msgid "Sur entreprises avec lesquelles il existe un lien de participation"
+msgstr "Op bedrijven waarin een deelneming bestaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29002
+#: model:account.account.template,name:l10n_be.a29012
+msgid "Sur clients Belgique"
+msgstr "Op Belgische klanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29003
+#: model:account.account.template,name:l10n_be.a29013
+msgid "Sur clients C.E.E."
+msgstr "Op klanten binnen de EEG"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29004
+#: model:account.account.template,name:l10n_be.a29014
+msgid "Sur clients exportation hors C.E.E."
+msgstr "Op exportklanten buiten de EEG"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29005
+msgid "Créances sur les coparticipants"
+msgstr "Op co-participanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29010
+#: model:account.account.template,name:l10n_be.a29110
+msgid "Sur entreprises liées"
+msgstr "Op verbonden ondernemingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2905
+msgid "Retenues sur garanties"
+msgstr "Inhoudingen op garanties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29100
+msgid "Créances entreprises liées"
+msgstr "Lening aan verbonden ondernemingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29101
+msgid "Créances entreprises avec lesquelles il existe un lien de participation"
+msgstr "Op bedrijven waarin een deelneming bestaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29102
+msgid "Créances autres débiteurs"
+msgstr "Lening aan andere debiteuren"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a29112
+msgid "Sur autres débiteurs"
+msgstr "Op andere debiteuren"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a2912
+msgid "Créances résultant de la cession d'immobilisations données en leasing"
+msgstr "Vorderingen als gevolg van de verkoop van geleased vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3
+msgid "CLASSE 3. STOCK ET COMMANDES EN COURS D'EXECUTION"
+msgstr "KLASSE 3 - VOORRADEN EN BESTELLINGEN IN UITVOERING"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a30
+msgid "APPROVISIONNEMENTS - MATIERES PREMIERES"
+msgstr "Grondstoffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a31
+msgid "APPROVISIONNEMENTS ET FOURNITURES"
+msgstr "Hulpstoffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3100
+msgid "Matières d'approvisionnement"
+msgstr "Aan te leveren materiaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3101
+msgid "Energie, charbon, coke, Mazout, essence, propane"
+msgstr "Energie, steenkool, cokes, stookolie, benzine, propaan"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3102
+msgid "Produits d'entretien"
+msgstr "Onderhoudsproducten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3103
+msgid "Fournitures diverses et petit outillage"
+msgstr "Diverse benodigdheden en klein gereedschap"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3104
+#: model:account.account.template,name:l10n_be.a6123
+msgid "Imprimés et fournitures de bureau"
+msgstr "Printers en kantoorbenodigdheden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3105
+msgid "Fournitures de services sociaux"
+msgstr "Sociale diensten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3106
+msgid "Emballages commerciaux"
+msgstr "Commerciele verpakking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a31060
+msgid "Emballages perdus"
+msgstr "Verloren verpakking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a32
+msgid "EN COURS DE FABRICATION"
+msgstr "Goederen in bewerking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3200
+msgid "Produits semi-ouvrés"
+msgstr "Halffabrikaten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3201
+msgid "Produits en cours de fabrication"
+msgstr "Goederen in productie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3202
+msgid "Travaux en cours"
+msgstr "Werken in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3205
+msgid "Déchets"
+msgstr "Afval"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3206
+msgid "Rebuts"
+msgstr "Restmateriaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3209
+msgid "Travaux en association momentanée"
+msgstr "Werken in joint-venture"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a33
+msgid "PRODUITS FINIS"
+msgstr "Gereed product"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3300
+msgid "Produits finis"
+msgstr "Gereed product"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a34
+msgid "MARCHANDISES"
+msgstr "Handelsgoederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3400
+msgid "Groupe A"
+msgstr "Groep A"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3401
+msgid "Groupe B"
+msgstr "Groep B"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a35
+msgid "IMMEUBLES DESTINES A LA VENTE"
+msgstr "Onroerende goederen bestemd voor verkoop"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3500
+#: model:account.account.template,name:l10n_be.a3510
+msgid "Immeuble A"
+msgstr "Onroerend goed A"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a3501
+#: model:account.account.template,name:l10n_be.a3511
+msgid "Immeuble B"
+msgstr "Onroerend goed B"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a351
+msgid "Immeubles construits en vue de leur revente"
+msgstr "Vastgoed gebouwd om te verkopen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a36
+msgid "ACOMPTES VERSES SUR ACHATS POUR STOCKS"
+msgstr "Vooruitbetalingen op voorraadinkopen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a37
+msgid "COMMANDES EN COURS D'EXECUTION"
+msgstr "Bestellingen in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a371
+msgid "Bénéfice pris en compte"
+msgstr "Toegerekende winst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4
+msgid "CLASSE 4. CREANCES ET DETTES A UN AN AU PLUS"
+msgstr "KLASSE 4 - VORDERINGEN EN SCHULDEN OP TEN HOOGSTE EEN JAAR"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a40
+msgid "CREANCES COMMERCIALES"
+msgstr "Handelsvorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4007
+msgid ""
+"Rabais, remises, ristournes à accorder et autres notes de crédit à établir"
+msgstr "Kortingen, rabatten en andere op te maken creditnota's"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4008
+msgid "Créances résultant de livraisons de biens"
+msgstr "Vorderingen op geleverde goederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4013
+msgid "Effets à l'encaissement"
+msgstr "Wissels aan toonder"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4015
+msgid "Effets à l'escompte"
+msgstr "Wissels op rekening"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a402
+msgid ""
+"Clients, créances courantes, entreprises apparentées, administrateurs et "
+"gérants"
+msgstr ""
+"Klanten, vorderingen, gerelateerde bedrijven, bestuurders en zaakvoerders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4022
+msgid "Administrateurs et gérants d'entreprise"
+msgstr "Bestuurders en zaakvoerders van de onderneming"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a403
+msgid ""
+"Effets à recevoir sur entreprises apparentées et administrateurs et gérants"
+msgstr ""
+"Te ontvangen wissels van gerelateerde bedrijven, bestuurders en zaakvoerders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4032
+msgid "Administrateurs et gérants de l'entreprise"
+msgstr "Bestuurders en zaakvoerders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a404
+#: model:account.account.template,name:l10n_be.a414
+msgid "Produits à recevoir"
+msgstr "Te innen opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a405
+msgid "Clients : retenues sur garanties"
+msgstr "Klanten : inhouding op garanties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a408
+msgid "Compensation clients"
+msgstr "Klanten compensatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a41
+msgid "AUTRES CREANCES"
+msgstr "Overige vorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a410
+msgid "Capital appelé, non versé"
+msgstr "Opgevraagd, niet-gestort kapitaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4100
+msgid "Appels de fonds"
+msgstr "Opvraging fondsen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4101
+msgid "Actionnaires défaillants"
+msgstr "Falende aandeelhouders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a411
+msgid "T.V.A. à récupérer"
+msgstr "Terug te vorderen BTW"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a411059
+msgid "T.V.A Déductible"
+msgstr "Aftrekbare BTW"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4112
+#: model:account.account.template,name:l10n_be.a4512
+msgid "Compte courant administration T.V.A."
+msgstr "Rekening Courant BTW-Administratie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4118
+#: model:account.account.template,name:l10n_be.a4518
+msgid "Taxe d'égalisation due"
+msgstr "Verschuldigde egalisatiebelasting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a412
+msgid "Impôts et versements fiscaux à récupérer"
+msgstr "Terug te vorderen belastingen en voorheffingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4120
+msgid "à 4124 Impôts belges sur le résultat"
+msgstr "tot 4124 Belgische winstbelastingen "
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4125
+msgid "à 4127 Autres impôts belges"
+msgstr "tot 4127 Andere Belgische belastingen "
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4128
+msgid "Impôts étrangers"
+msgstr "Buitenlandse belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a416
+msgid "Créances diverses"
+msgstr "Diverse vorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4160
+msgid "Associés"
+msgstr "Vennoten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4161
+msgid "Avances et prêts au personnel"
+msgstr "Voorschotten en leningen aan het personeel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4162
+msgid "Compte courant des associés en S.P.R.L."
+msgstr "Rekening courant vennoten in B.V.B.A"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4163
+msgid "Compte courant des administrateurs et gérants"
+msgstr "Rekening courant bestuurders en zaakvoerders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4164
+msgid "Créances sur sociétés apparentées"
+msgstr "Vorderingen op gerelateerde bedrijven"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4166
+msgid "Emballages et matériel à rendre"
+msgstr "Terug te geven materiaal en verpakkingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4167
+msgid "Etat et établissements publics"
+msgstr "Overheid en openbare instellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a41670
+msgid "Subsides à recevoir"
+msgstr "Te ontvangen subsidies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4168
+msgid "Rabais, ristournes, remises à obtenir et autres avoirs non encore reçus"
+msgstr "Kortingen, rabatten en andere nog te ontvangen tegoeden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a42
+msgid "DETTES A PLUS D'UN AN ECHEANT DANS L'ANNEE"
+msgstr "Schulden op meer dan één jaar die binnen het jaar vervallen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a422
+msgid "Dettes de location-financement et assimilées"
+msgstr "Leasingschulden en soortgelijke"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4220
+msgid "Financement de biens immobiliers"
+msgstr "Financiering vastgoed"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4221
+msgid "Financement de biens mobiliers"
+msgstr "Financiering roerend goed"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4250
+#: model:account.account.template,name:l10n_be.a440
+msgid "Fournisseurs"
+msgstr "Leveranciers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4299
+msgid "Autres dettes"
+msgstr "Overige schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a43
+msgid "DETTES FINANCIERES"
+msgstr "Financiële schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a430
+msgid "Etablissements de crédit. Emprunts en compte à terme fixe"
+msgstr "Kredietinstellingen - Leningen op rekeningen met vaste termijn"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a431
+msgid "Etablissements de crédit. Promesses"
+msgstr "Kredietinstellingen - Promessen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a432
+msgid "Etablissements de crédit. Crédits d'acceptation"
+msgstr "Kredietinstellingen - Acceptkredieten "
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a433
+msgid "Etablissements de crédit. Dettes en compte courant"
+msgstr "Kredietinstellingen - Schulden in rekening courant"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a44
+msgid "DETTES COMMERCIALES"
+msgstr "Handelsschulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a44011
+#: model:account.account.template,name:l10n_be.a44111
+msgid "Fournisseurs CEE"
+msgstr "Leveranciers EEG"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4402
+msgid "Dettes envers les coparticipants"
+msgstr "Schulden aan mede participanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4403
+msgid "Fournisseurs - retenues de garanties"
+msgstr "Levernaciers - inhoudingen op garanties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a444
+msgid "Factures à recevoir"
+msgstr "Te ontvangen facturen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a446
+msgid "Acomptes reçus"
+msgstr "Ontvangen voorschotten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a448
+msgid "Compensations fournisseurs"
+msgstr "Compensaties leveranciers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45
+msgid "DETTES FISCALES, SALARIALES ET SOCIALES"
+msgstr ""
+"Schulden met betrekking tot belastingen, bezoldigingen en sociale lasten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a450
+msgid "Dettes fiscales estimées"
+msgstr "Geraamd bedrag der belastingschulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4501
+msgid "à 4504 Impôts sur le résultat"
+msgstr "tot 4504 Belgische winstbelastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4505
+msgid "à 4507 Autres impôts en Belgique"
+msgstr "tot 4507 Andere Belgische belastingen en taksen "
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4508
+msgid "Impôts à l'étranger"
+msgstr "Buitenlandse belastingen en taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a451
+#: model:account.account.template,name:l10n_be.a451054
+msgid "T.V.A. à payer"
+msgstr "Te betalen BTW"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a451055
+msgid "T.V.A. à payer - Intra-communautaire"
+msgstr "Te betalen BTW - Intracommunautair"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a451056
+msgid "T.V.A. à payer - Cocontractant"
+msgstr "Te betalen BTW -  Medecontractant"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a451057
+msgid "T.V.A. à payer - Import"
+msgstr "Te betalen BTW - Import"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a452
+msgid "Impôts et taxes à payer"
+msgstr "Te betalen belastingen en taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4520
+msgid "Autres impôts sur le résultat"
+msgstr "Andere Belgische winstbelastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4525
+msgid "Autres impôts et taxes en Belgique"
+msgstr "Andere Belgische belastingen en taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45250
+msgid "Précompte immobilier"
+msgstr "Onroerende voorheffing"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45251
+msgid "Impôts communaux à payer"
+msgstr "Te betalen gemeentebelasting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45252
+msgid "Impôts provinciaux à payer"
+msgstr "Te betalen provinciale belasting"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45253
+msgid "Autres impôts et taxes à payer"
+msgstr "Andere te betalen belastingen en taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4528
+msgid "Impôts et taxes à l'étranger"
+msgstr "Buitenlandse belastingen en taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a453
+msgid "Précomptes retenus"
+msgstr "Ingehouden voorheffingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4530
+msgid "Précompte professionnel retenu sur rémunérations"
+msgstr "Bedrijfsvoorheffing ingehouden op bezoldigingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4531
+msgid "Précompte professionnel retenu sur tantièmes"
+msgstr "Bedrijfsvoorheffing ingehouden op tantièmes"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4532
+msgid "Précompte mobilier retenu sur dividendes attribués"
+msgstr "Roerende voorheffing ingehouden op uitgekeerde dividenden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4533
+msgid "Précompte mobilier retenu sur intérêts payés"
+msgstr "Roerende voorheffing ingehouden op betaalde intresten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4538
+msgid "Autres précomptes retenus"
+msgstr "Andere ingehouden voorheffingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a454
+msgid "Office National de la Sécurité Sociale"
+msgstr "Rijksdienst voor Sociale Zekerheid"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4540
+msgid "Arriérés"
+msgstr "Achterstallen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4541
+msgid "1er trimestre"
+msgstr "1e kwartaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4542
+msgid "2ème trimestre"
+msgstr "2e kwartaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4543
+msgid "3ème trimestre"
+msgstr "3e kwartaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4544
+msgid "4ème trimestre"
+msgstr "4e kwartaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a455
+msgid "Rémunérations"
+msgstr "Bezoldigingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4550
+msgid "Administrateurs, gérants et commissaires"
+msgstr "Bestuurders, zaakvoerders en commissarissen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4551
+#: model:account.account.template,name:l10n_be.a4560
+msgid "Direction"
+msgstr "Directiepersoneel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4552
+#: model:account.account.template,name:l10n_be.a4561
+#: model:account.account.template,name:l10n_be.a6202
+msgid "Employés"
+msgstr "Bedienden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4553
+#: model:account.account.template,name:l10n_be.a4562
+#: model:account.account.template,name:l10n_be.a6203
+msgid "Ouvriers"
+msgstr "Arbeiders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a456
+msgid "Pécules de vacances"
+msgstr "Vakantiegeld"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a459
+msgid "Autres dettes sociales"
+msgstr "Andere sociale schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4590
+msgid "Provision pour gratifications de fin d'année"
+msgstr "Voorziening voor eindejaarspremie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4591
+msgid "Départs de personnel"
+msgstr "Ontslag personeel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4592
+msgid "Oppositions sur rémunérations"
+msgstr "Loonbeslag"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4593
+msgid "Assurances relatives au personnel"
+msgstr "Personeelsverzekeringen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45930
+msgid "Assurance loi"
+msgstr "Wetsverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45931
+msgid "Assurance salaire garanti "
+msgstr "Verzekering gewaarborgd inkomen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45932
+msgid "Assurance groupe "
+msgstr "Groepsverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a45933
+#: model:account.account.template,name:l10n_be.a62302
+msgid "Assurances individuelles"
+msgstr "Individuele verzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4594
+msgid "Caisse d'assurances sociales pour travailleurs indépendants"
+msgstr "Sociale kas voor zelfstandigen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4597
+msgid "Dettes et provisions sociales diverses"
+msgstr "Diverse sociale schulden en provisies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a46
+msgid "ACOMPTES RECUS SUR COMMANDES"
+msgstr "Ontvangen vooruitbetalingen op bestellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a47
+msgid "DETTES DECOULANT DE L'AFFECTATION DES RESULTATS"
+msgstr "Schulden uit de bestemming van het resultaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a470
+msgid "Dividendes et tantièmes d'exercices antérieurs"
+msgstr "Dividenden en tantièmes over vorige boekjaren"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a471
+msgid "Dividendes de l'exercice"
+msgstr "Dividenden over het boekjaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a472
+msgid "Tantièmes de l'exercice"
+msgstr "Tantièmes over het boekjaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a473
+#: model:account.account.template,name:l10n_be.a696
+msgid "Autres allocataires"
+msgstr "Andere rechthebbenden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a48
+msgid "DETTES DIVERSES"
+msgstr "Diverse schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a480
+msgid "Obligations et coupons échus"
+msgstr "Vervallen obligaties en coupons"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a481
+msgid "Actionnaires - capital à rembourser"
+msgstr "Aandeelhouders : terug te betalen kapitaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a482
+msgid "Participation du personnel à payer"
+msgstr "Personeelsparticipatie te betalen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a483
+msgid "Acomptes reçus d'autres tiers à moins d'un an"
+msgstr "Ontvangen voorschotten van derden minder dan 1 jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a486
+msgid "Emballages et matériel consignés"
+msgstr "Verpakkingen en materiaal in consignatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a49
+msgid "COMPTES DE REGULARISATION ET COMPTES D'ATTENTE"
+msgstr "Overlopende rekeningen en wachtrekeningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a490
+msgid "Charges à reporter"
+msgstr "Over te dragen kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a491
+msgid "Produits acquis"
+msgstr "Verkregen opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4910
+msgid "Produits d'exploitation"
+msgstr "Bedrijfsopbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a49100
+msgid "Ristournes, rabais à obtenir"
+msgstr "Te ontvangen kortingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a49101
+msgid "Commissions à obtenir"
+msgstr "Te ontvangen commissies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a49102
+msgid "Autres produits d'exploitation"
+msgstr "Andere bedrijfsopbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4911
+msgid "Produits financiers"
+msgstr "Financiële opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a49110
+msgid "Intérêts courus et non échus sur prêts et débits"
+msgstr "Oplopende en onbetaalde rente op leningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a49111
+msgid "Autres produits financiers"
+msgstr "Overige financiële opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a492
+msgid "Charges à imputer"
+msgstr "Toe te rekenen kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a493
+msgid "Produits à reporter"
+msgstr "Over te dragen opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4930
+msgid "Produits d'exploitation à reporter"
+msgstr "Over te dragen bedrijfsopbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4931
+msgid "Produits financiers à reporter"
+msgstr "Over te dragen financiële opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a499
+msgid "Comptes d'attente"
+msgstr "Wachtrekeningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4990
+msgid "Compte d'attente"
+msgstr "Wachtrekening"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4991
+msgid "Compte de répartition périodique des charges"
+msgstr "Staat van periodieke kostenverdeling"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a4999
+msgid "Transferts d'exercice"
+msgstr "Fiscale transfers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a5
+msgid "CLASSE 5. PLACEMENTS DE TRESORERIE ET DE VALEURS DISPONIBLES"
+msgstr "KLASSE 5 - GELDBELEGGINGEN EN LIQUIDE MIDDELEN"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a50
+msgid "ACTIONS PROPRES"
+msgstr "Eigen aandelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a51
+msgid "ACTIONS ET PARTS"
+msgstr "Aandelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a52
+msgid "TITRES A REVENUS FIXES"
+msgstr "Vastrentende effecten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a53
+msgid "DEPOTS A TERME"
+msgstr "Termijndeposito's"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a530
+msgid "De plus d'un an"
+msgstr "Op meer dan één jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a531
+msgid "De plus d'un mois et à un an au plus"
+msgstr "Op meer dan één maand en op ten hoogste één jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a532
+msgid "D'un mois au plus"
+msgstr "Op ten hoogste één maand"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a54
+msgid "VALEURS ECHUES A L'ENCAISSEMENT"
+msgstr "Te incasseren vervallen waarden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a540
+msgid "Chèques à encaisser"
+msgstr "Te incasseren cheques"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a541
+msgid "Coupons à encaisser"
+msgstr "Te incasseren coupons"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a55
+msgid "ETABLISSEMENTS DE CREDIT."
+msgstr "Kredietinstellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a550
+msgid "Comptes ouverts auprès des divers établissements"
+msgstr " Rekeningen geopend bij verschillende instellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a56
+msgid "OFFICE DES CHEQUES POSTAUX"
+msgstr "Postcheque en girodienst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a560
+msgid "Compte courant"
+msgstr "Rekening-courant"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a561
+msgid "Chèques émis"
+msgstr "Uitgeschreven cheques (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a57
+msgid "CAISSES"
+msgstr "Kassen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a570
+msgid "Caisses - espèces"
+msgstr "Kassen-contanten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a578
+msgid "Caisses - timbres"
+msgstr "Kassen-zegels"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a58
+msgid "VIREMENTS INTERNES"
+msgstr "Interne overboekingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6
+msgid "CLASSE 6. - CHARGES"
+msgstr "KLASSE 6 - KOSTEN"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a60
+msgid "APPROVISIONNEMENTS ET MARCHANDISES"
+msgstr "Handelsgoederen, grond- en hulpstoffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a601
+msgid "Achats de fournitures"
+msgstr "Aankopen van hulpstoffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a602
+msgid "Achats de services, travaux et études"
+msgstr "Aankopen van diensten, werk en studies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a603
+msgid "Sous-traitances générales"
+msgstr "Algemene onderaannemingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a604
+msgid "Achats de marchandises"
+msgstr "Aankopen van handelsgoederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a605
+msgid "Achats d'immeubles destinés à la revente"
+msgstr "Aankopen van onroerende goederen bestemd voor verkoop"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a608
+msgid "Remises, ristournes et rabais obtenus sur achats"
+msgstr "Ontvangen kortingen, ristorno's en rabatten (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a609
+msgid "Variations de stocks"
+msgstr "Voorraadwijzigingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6090
+msgid "De matières premières"
+msgstr "van grondstoffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6091
+msgid "De fournitures"
+msgstr "van hulpstoffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6094
+msgid "De marchandises"
+msgstr "van handelsgoederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6095
+msgid "D'immeubles destinés à la vente"
+msgstr "van gekochte onroerende goederen bestemd voor verkoop"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61
+msgid "SERVICES ET BIENS DIVERS"
+msgstr "Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a610
+msgid "Loyers et charges locatives"
+msgstr "Huur en huurlasten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6100
+msgid "Loyers divers"
+msgstr "Diverse huren"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6101
+msgid "Charges locatives"
+msgstr "Huurlasten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a611
+msgid "Entretien et réparation"
+msgstr "Onderhoud en herstellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a612
+msgid "Fournitures faites à l'entreprise"
+msgstr "Leveringen aan de onderneming"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6120
+msgid "Eau, gaz, électricité, vapeur"
+msgstr "Water, gas, electriciteit, stoom"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61203
+msgid "Vapeur"
+msgstr "Stoom"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6121
+msgid "Téléphone, télégrammes, télex, téléfax, frais postaux"
+msgstr "Telefoon, telegram, telex, telefax, portkosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61210
+msgid "Téléphone"
+msgstr "Telefoon"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61211
+msgid "Télégrammes"
+msgstr "Telegram"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61212
+msgid "Télex et téléfax"
+msgstr "Telex en telefax"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61213
+msgid "Frais postaux"
+msgstr "Portkosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6122
+msgid "Livres, bibliothèque"
+msgstr "Boeken en documentatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a613
+msgid "Rétributions de tiers"
+msgstr "Vergoedingen aan derden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6130
+msgid "Redevances et royalties"
+msgstr "Commissies en auteursrechten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61300
+msgid "Redevances pour brevets, licences, marques, accessoires"
+msgstr "Commissies voor brevetten, licencies, merken en accessoires"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61301
+msgid "Autres redevances"
+msgstr "Andere commissies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6131
+msgid "Assurances non relatives au personnel"
+msgstr "Verzekeringen niet personeelsgerelateerd"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61310
+msgid "Assurance incendie"
+msgstr "Brandverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61311
+msgid "Assurance vol"
+msgstr "Diefstalverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61312
+msgid "Assurance autos"
+msgstr "Autoverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61313
+msgid "Assurance crédit"
+msgstr "Kredietverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61314
+msgid "Assurances frais généraux"
+msgstr "Kostenverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6132
+#: model:account.account.template,name:l10n_be.a62322
+msgid "Divers"
+msgstr "Diversen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61320
+msgid "Commissions aux tiers"
+msgstr "Commisie aan derden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61321
+msgid "Honoraires d'avocats, d'experts, etc ..."
+msgstr "Erelonen advocaten, experten, ..."
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61322
+msgid "Cotisations aux groupements professionnels"
+msgstr "Bijdragen aan beroepsverenigingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61323
+msgid "Dons, libéralités, ..."
+msgstr "Giften en schenkingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61324
+msgid "Frais de contentieux"
+msgstr "Juridische kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61325
+msgid "Publications légales"
+msgstr "Wettelijke publicaties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6133
+msgid "Transports et déplacements"
+msgstr "Transport en verplaatsingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61330
+msgid "Transports de personnel"
+msgstr "Personeelsverplaatsingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61331
+msgid "Voyages, déplacements, représentations"
+msgstr "Reizen, verplaatsingen, vertegenwoordigingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6134
+msgid "Personnel intérimaire"
+msgstr "Interim personeel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a614
+msgid "Annonces, publicité, propagande et documentation"
+msgstr "Advertenties, publiciteit, propaganda en documentatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6140
+msgid "Annonces et insertions"
+msgstr "Advertenties en inlassingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6141
+msgid "Catalogues et imprimés"
+msgstr "Catalogi en drukwerken"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6142
+msgid "Echantillons"
+msgstr "Stalen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6143
+msgid "Foires et expositions"
+msgstr "Beurzen en tentoonstellingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6144
+msgid "Primes"
+msgstr "Premies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6145
+msgid "Cadeaux à la clientèle"
+msgstr "Relatiegeschenken"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6146
+msgid "Missions et réceptions"
+msgstr "Onthaalkosten en recepties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6147
+msgid "Documentation"
+msgstr "Documentatie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a615
+msgid "Sous-traitants"
+msgstr "Onderaannemers"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6150
+msgid "Sous-traitants pour activités propres"
+msgstr "Onderaannemers voor eigen activiteiten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6151
+msgid "Sous-traitants d'associations momentanées"
+msgstr "Onderaannemers voor joint-ventures"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6152
+msgid "Quote-part bénéficiaire des coparticipants"
+msgstr "Aandeel in het resultaat van de joint-venture"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61700
+msgid ""
+"Personnel intérimaire et personnes mises à la disposition  de l'entreprise"
+msgstr "Uitzendkrachten en personen ter beschikking gesteld van de onderneming"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a61800
+msgid "Rémunérations, primes pour assurances extralégales"
+msgstr ""
+"Bezoldigingen, premies voor buitenwettelijke verzekeringen, ouderdoms- en "
+"overlevingspensioenen van bestuurders, zaakvoerders en werkende vennoten, "
+"die niet worden toegekend uit hoofde van een arbeidsovereenkomst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62
+msgid "REMUNERATIONS, CHARGES SOCIALES ET PENSIONS"
+msgstr "Bezoldigingen, sociale lasten en pensioenen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a620
+msgid "Rémunérations et avantages sociaux directs"
+msgstr "Bezoldigingen en rechtstreekse sociale voordelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6200
+#: model:account.account.template,name:l10n_be.a695
+msgid "Administrateurs ou gérants"
+msgstr "Bestuurders of zaakvoerders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6201
+msgid "Personnel de direction"
+msgstr "Directiepersoneel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6204
+msgid "Autres membres du personnel"
+msgstr "Andere personeelsleden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a621
+msgid "Cotisations patronales d'assurances sociales"
+msgstr "Werkgeversbijdragen voor sociale verzekeringen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6210
+msgid "Sur salaires"
+msgstr "Op lonen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6211
+msgid "Sur appointements et commissions"
+msgstr "Op uitkeringen en commissies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a622
+msgid "Primes patronales pour assurances extralégales"
+msgstr "Werkgeverspremies voor bovenwettelijke verzekeringen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a623
+msgid "Autres frais de personnel"
+msgstr "Andere personeelskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6230
+msgid "Assurances du personnel"
+msgstr "Peronseelsverzekering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62300
+msgid "Assurances loi, responsabilité civile, chemin du travail"
+msgstr "Wettelijke verzekeringen, burgerlijke aansprakelijkheid, woon-werk"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62301
+msgid "Assurance salaire garanti"
+msgstr "Verzekering gewaarborgd inkomen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6231
+msgid "Charges sociales diverses"
+msgstr "Diverse sociale kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62310
+msgid "Jours fériés payés"
+msgstr "Betaalde feestdagen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62311
+msgid "Salaire hebdomadaire garanti"
+msgstr "Gegarandeerd weekloon"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62312
+msgid "Allocations familiales complémentaires"
+msgstr "Extra kinderbijslag"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6232
+msgid "Charges sociales des administrateurs, gérants et commissaires"
+msgstr "Sociale kosten voor bestuurders, zaakvoerders en commissarissen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62320
+msgid "Allocations familiales complémentaires pour non salariés"
+msgstr "Extra kinderbijslag voor niet-loontrekkenden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a62321
+msgid "Lois sociales pour indépendants"
+msgstr "Sociale wetgevingen voor zelfstandigen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a624
+msgid "Pensions de retraite et de survie"
+msgstr "Ouderdoms- en overlevingspensioenen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6240
+msgid "Administrateurs et gérants"
+msgstr "Bestuurders en zaakvoerders"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6241
+msgid "Personnel"
+msgstr "Personeel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a625
+msgid "Provision pour pécule de vacances"
+msgstr "Voorziening voor vakantiegeld"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6250
+#: model:account.account.template,name:l10n_be.a6310
+#: model:account.account.template,name:l10n_be.a6320
+#: model:account.account.template,name:l10n_be.a6330
+#: model:account.account.template,name:l10n_be.a6340
+#: model:account.account.template,name:l10n_be.a6350
+#: model:account.account.template,name:l10n_be.a6360
+msgid "Dotations"
+msgstr "Waardeverminderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6251
+#: model:account.account.template,name:l10n_be.a6351
+#: model:account.account.template,name:l10n_be.a6361
+#: model:account.account.template,name:l10n_be.a6371
+msgid "Utilisations et reprises"
+msgstr "Toewijzingen en terugnames"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a63
+msgid ""
+"AMORTISSEMENTS, REDUCTIONS DE VALEUR ET PROVISIONS POUR RISQUES ET CHARGES"
+msgstr ""
+"Afschrijvingen, waardeverminderingen en voorzieningen voor risico's en kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a630
+msgid ""
+"Dotations aux amortissements et aux réductions de valeur sur immobilisations"
+msgstr "Afschrijvingen en waardeverminderingen op vaste activa - Toevoeging"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6300
+msgid "Dotations aux amortissements sur frais d'établissement"
+msgstr "Afschrijvingen op oprichtingskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6301
+msgid "Dotations aux amortissements sur immobilisations incorporelles"
+msgstr "Afschrijvingen op immateriële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6302
+msgid "Dotations aux amortissements sur immobilisations corporelles"
+msgstr "Afschrijvingen op materiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6308
+msgid "Dotations aux réductions de valeur sur immobilisations incorporelles"
+msgstr "Waardeverminderingen op immateriële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6309
+msgid "Dotations aux réductions de valeur sur immobilisations corporelles"
+msgstr "Waardeverminderingen op materiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a631
+msgid "Réductions de valeur sur stocks"
+msgstr "Waardeverminderingen op voorraden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6311
+#: model:account.account.template,name:l10n_be.a6321
+#: model:account.account.template,name:l10n_be.a6331
+#: model:account.account.template,name:l10n_be.a6341
+#: model:account.account.template,name:l10n_be.a6511
+msgid "Reprises"
+msgstr "Terugneming (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a632
+msgid "Réductions de valeur sur commandes en cours d'exécution"
+msgstr "Waardeverminderingen op bestellingen in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a633
+msgid "Réductions de valeur sur créances commerciales à plus d'un an"
+msgstr "Waardeverminderingen op handelsvorderingen op meer dan één jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a634
+msgid "Réductions de valeur sur créances commerciales à un an au plus"
+msgstr "Waardeverminderingen op handelsvorderingen op ten hoogste één jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6370
+#: model:account.account.template,name:l10n_be.a6510
+msgid "Dotations "
+msgstr "Toevoeging"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a64
+msgid "AUTRES CHARGES D'EXPLOITATION"
+msgstr "Andere bedrijfskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a640
+msgid "Charges fiscales d'exploitation"
+msgstr "Bedrijfsbelastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6400
+msgid "Taxes et impôts directs"
+msgstr "Directe belastingen en taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a64000
+msgid "Taxes sur autos et camions"
+msgstr "Verkeersbelasting bedrijfswagens"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6401
+msgid "Taxes et impôts indirects"
+msgstr "Indirecte belastingen en taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a64010
+msgid "Timbres fiscaux pris en charge par la firme"
+msgstr "Fiscale zegels ten laste van de onderneming"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a64011
+msgid "Droits d'enregistrement"
+msgstr "Registratierechten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a64012
+msgid "T.V.A. non déductible"
+msgstr "Niet aftrekbare BTW"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6402
+msgid "Impôts provinciaux et communaux"
+msgstr "Provinciale en gemeentelijke belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a64020
+msgid "Taxe sur la force motrice"
+msgstr "Roerende voorheffing"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a64021
+msgid "Taxe sur le personnel occupé"
+msgstr "Taks op tewerkgesteld personeel"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6403
+msgid "Taxes diverses"
+msgstr "Diverse taksen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a641
+msgid "Moins-values sur réalisations courantes d'immobilisations corporelles"
+msgstr "Minderwaarden op de courante realisatie van vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a642
+msgid "Moins-values sur réalisations de créances commerciales"
+msgstr "Minderwaarden op de realisatie van handelsvorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a643
+msgid "à 648 Charges d'exploitations diverses"
+msgstr "tot 648 Diverse bedrijfskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a649
+msgid "Charges d'exploitation portées à l'actif au titre de restructuration"
+msgstr "Als herstructureringskosten geactiveerde bedrijfskosten (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a65
+msgid "CHARGES FINANCIERES"
+msgstr "Financiële kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a650
+msgid "Charges des dettes"
+msgstr "Kosten van schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6500
+msgid "Intérêts, commissions et frais afférents aux dettes"
+msgstr "Rente, commissies en kosten verbonden aan schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6501
+msgid "Amortissements des agios et frais d'émission d'emprunts"
+msgstr "Afschrijving van kosten bij uitgifte van leningen en van disagio"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6502
+msgid "Autres charges de dettes"
+msgstr "Andere kosten van schulden"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6503
+msgid "Intérêts intercalaires portés à l'actif"
+msgstr "Geactiveerde intercalaire interesten (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a651
+msgid "Réductions de valeur sur actifs circulants"
+msgstr "Waardeverminderingen op vlottende activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a652
+msgid "Moins-values sur réalisation d'actifs circulants"
+msgstr "Minderwaarden op de realisatie van vlottende activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a653
+msgid "Charges d'escompte de créances"
+msgstr "Discontokosten op vorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a654
+#: model:account.account.template,name:l10n_be.a754
+msgid "Différences de change"
+msgstr "Wisselresultaten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a655
+#: model:account.account.template,name:l10n_be.a755
+msgid "Ecarts de conversion des devises"
+msgstr "Resultaten uit de omrekening van vreemde valuta"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a656
+msgid "Frais de banques, de chèques postaux"
+msgstr "Bank en chequekosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a657
+msgid "Commissions sur ouvertures de crédit, cautions, avals"
+msgstr "Commissies bij opening van krediet"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a658
+msgid "Frais de vente des titres"
+msgstr "Verkoop van effecten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a66
+msgid "CHARGES EXCEPTIONNELLES"
+msgstr "Uitzonderlijke kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a660
+msgid "Amortissements et réductions de valeur exceptionnels"
+msgstr "Uitzonderlijke afschrijvingen en waardeverminderingen (toevoeging)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6600
+msgid "Sur frais d'établissement"
+msgstr "op oprichtingskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6601
+#: model:account.account.template,name:l10n_be.a6630
+#: model:account.account.template,name:l10n_be.a7600
+#: model:account.account.template,name:l10n_be.a7630
+msgid "Sur immobilisations incorporelles"
+msgstr "op immateriële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6602
+#: model:account.account.template,name:l10n_be.a6631
+#: model:account.account.template,name:l10n_be.a7601
+#: model:account.account.template,name:l10n_be.a7631
+msgid "Sur immobilisations corporelles"
+msgstr "op materiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a661
+msgid "Réductions de valeur sur immobilisations financières"
+msgstr "Waardeverminderingen op financiële vaste activa (toevoeging)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a662
+msgid "Provisions pour risques et charges exceptionnels"
+msgstr "Voorzieningen voor uitzonderlijke risico's en kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a663
+msgid "Moins-values sur réalisation d'actifs immobilisés"
+msgstr "Minderwaarden op de realisatie van vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6632
+msgid ""
+"Sur immobilisations détenues en location-financement et droits similaires"
+msgstr "Op financiele leasing en gelijkaardige rechten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6633
+#: model:account.account.template,name:l10n_be.a7632
+msgid "Sur immobilisations financières"
+msgstr "Op financiele vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6634
+msgid "Sur immeubles acquis ou construits en vue de la revente"
+msgstr "Op onroerende goederen bestemd voor verkoop"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a664
+msgid "Pénalités et amendes diverses"
+msgstr "Diverse boetes en straffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a665
+msgid "Différence de charge"
+msgstr "Kostenverschillen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a668
+msgid "Autres charges exceptionnelles"
+msgstr "Andere uitzonderlijke kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a669
+msgid ""
+"Charges exceptionnelles transférées à l'actif en frais de restructuration"
+msgstr ""
+"Uitzonderlijke kosten als herstructureringskosten opgenomen onder de activa "
+"(-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a67
+msgid "IMPOTS SUR LE RESULTAT"
+msgstr "Belastingen op het resultaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a670
+msgid "Impôts belges sur le résultat de l'exercice"
+msgstr "Belgische belastingen op het resultaat van het boekjaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6700
+msgid "Impôts et précomptes dus ou versés"
+msgstr "Verschuldigde of gestorte belastingen en voorheffingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6701
+msgid "Excédent de versements d'impôts et précomptes porté à l'actif"
+msgstr ""
+"Geactiveerde overschotten van betaalde belastingen en voorheffingen (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6702
+msgid "Charges fiscales estimées"
+msgstr "Geraamde belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a671
+msgid "Impôts belges sur le résultat d'exercices antérieurs"
+msgstr "Belgische belastingen op het resultaat van vorige boekjaren"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6710
+msgid "Suppléments d'impôts dus ou versés"
+msgstr "Verschuldigde of gestorte belastingsupplementen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6711
+msgid "Suppléments d'impôts estimés"
+msgstr "Geraamde belastingsupplementen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a6712
+msgid "Provisions fiscales constituées"
+msgstr "Gevormde fiscale voorzieningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a672
+msgid "Impôts étrangers sur le résultat de l'exercice"
+msgstr "Buitenlandse belastingen op het resultaat van het boekjaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a673
+msgid "Impôts étrangers sur le résultat d'exercices antérieurs"
+msgstr "Buitenlandse belastingen op het resultaat van vorige boekjaren"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a68
+msgid "TRANSFERTS AUX RESERVES IMMUNISEES"
+msgstr ""
+"Overboeking naar de uitgestelde belastingen en naar de belastingvrije "
+"reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a69
+msgid "AFFECTATION DES RESULTATS"
+msgstr "Resultaatverwerking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a690
+msgid "Perte reportée de l'exercice précédent"
+msgstr "Overgedragen verlies van het vorige boekjaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a691
+msgid "Dotation à la réserve légale"
+msgstr "Toevoeging aan het kapitaal en aan de uitgiftepremie"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a692
+msgid "Dotation aux autres réserves"
+msgstr "Toevoeging aan de reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a693
+msgid "Bénéfice à reporter"
+msgstr "Over te dragen winst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a694
+msgid "Rémunération du capital"
+msgstr "Vergoeding van het kapitaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7
+msgid "CLASSE 7. - PRODUITS"
+msgstr "KLASSE 7 - OPBRENGSTEN"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a70
+msgid "CHIFFRE D'AFFAIRES"
+msgstr "Omzet"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a700
+msgid "Ventes de marchandises"
+msgstr "Verkopen van handelsgoederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7000
+#: model:account.account.template,name:l10n_be.a7020
+#: model:account.account.template,name:l10n_be.a_sale
+msgid "Ventes en Belgique"
+msgstr "Verkopen in België"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7001
+#: model:account.account.template,name:l10n_be.a7011
+#: model:account.account.template,name:l10n_be.a7021
+msgid "Ventes dans les pays membres de la C.E.E."
+msgstr "Verkopen in lidstaten van de E.E.G."
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7002
+#: model:account.account.template,name:l10n_be.a7012
+#: model:account.account.template,name:l10n_be.a7022
+msgid "Ventes à l'exportation"
+msgstr "Verkopen buiten de E.E.G. (export)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a701
+msgid "Ventes de produits finis"
+msgstr "Verkopen van afgewerkte produkten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a702
+msgid "Ventes de déchets et rebuts"
+msgstr "Verkoop van afval en restmateriaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a703
+msgid "Ventes d'emballages récupérables"
+msgstr "Verkoop van herbruikbare verpakking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a704
+msgid "Facturations des travaux en cours"
+msgstr "Facturatie werk in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a705
+#: model:account.account.template,name:l10n_be.a746
+msgid "Prestations de services"
+msgstr "Dienstverlening"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7050
+msgid "Prestations de services en Belgique"
+msgstr "Dienstverlening in België"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7051
+msgid "Prestations de services dans les pays membres de la C.E.E."
+msgstr "Dienstverlening in lidstaten van de E.E.G."
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7052
+msgid "Prestations de services en vue de l'exportation"
+msgstr "Dienstverlening buiten de E.E.G. (export)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a706
+msgid "Pénalités et dédits obtenus par l'entreprise"
+msgstr "Boeten en verbeurdverklaringen verkregen door de onderneming"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a708
+msgid "Remises, ristournes et rabais accordés"
+msgstr "Toegekende kortingen, ristorno's en rabatten (-)"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7080
+msgid "Sur ventes de marchandises"
+msgstr "op handelsgoederen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7081
+msgid "Sur ventes de produits finis"
+msgstr "op afgewerkte produkten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7082
+msgid "Sur ventes de déchets et rebuts"
+msgstr "op afval en restmateriaal"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7083
+msgid "Sur prestations de services"
+msgstr "op dienstverlening"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7084
+msgid "Mali sur travaux facturés aux associations momentanées"
+msgstr "Mali op gefactureerde werken in joint-venture"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a71
+msgid "VARIATION DES STOCKS ET DES COMMANDES EN COURS D'EXECUTION"
+msgstr "Wijzigingen in de voorraden en in de bestellingen in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a712
+msgid "Des en cours de fabrication"
+msgstr "In de voorraad goederen in bewerking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a713
+msgid "Des produits finis"
+msgstr "In de voorraad gereed product"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a715
+msgid "Des immeubles construits destinés à la vente"
+msgstr "In de voorraad onroerende goederen bestemd voor verkoop"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a717
+msgid "Des commandes en cours d'exécution"
+msgstr "In de bestellingen in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7170
+msgid "Commandes en cours - Coût de revient"
+msgstr "Aanschafwaarde"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a71700
+msgid "Coût des commandes en cours d'exécution"
+msgstr "Kost van bestellingen in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a71701
+msgid "Coût des travaux en cours des associations momentanées"
+msgstr "Kost van werken in uitvoering in joint-ventures"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7171
+msgid "Bénéfices portés en compte sur commandes en cours"
+msgstr "Toegerekende winst"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a71710
+msgid "Sur commandes en cours d'exécution"
+msgstr "Op bestellingen in uitvoering"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a71711
+msgid "Sur travaux en cours des associations momentanées"
+msgstr "Op werken in uitvoering in joint-ventures"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a72
+msgid "PRODUCTION IMMOBILISEE"
+msgstr "Geproduceerde vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a720
+msgid "En frais d'établissement"
+msgstr "In oprichtingskosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a721
+msgid "En immobilisations incorporelles"
+msgstr "In immateriële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a722
+msgid "En immobilisations corporelles"
+msgstr "In materiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a723
+msgid "En immobilisations en cours"
+msgstr "In vaste activa in aanbouw"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a74
+msgid "AUTRES PRODUITS D'EXPLOITATION"
+msgstr "Andere bedrijfsopbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a740
+msgid "Subsides d'exploitation et montants compensatoires"
+msgstr "Bedrijfssubsidies en compenserende bedragen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a741
+msgid "Plus-values sur réalisations courantes d'immobilisations corporelles"
+msgstr "Meerwaarden op de courante realisatie van materiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a742
+msgid "Plus-values sur réalisations de créances commerciales"
+msgstr "Meerwaarden op de realisatie van handelsvorderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a743
+msgid "Produits de services exploités dans l'intérêt du personnel"
+msgstr "Recuperatie personeelskost"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a744
+msgid "Commissions et courtages"
+msgstr "Commissies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a745
+msgid "Redevances pour brevets et licences"
+msgstr "Commissies voor brevetten en licenties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a747
+msgid "Revenus des immeubles affectés aux activités non professionnelles"
+msgstr "Inkomsten uit vastgoed verbonden aan niet-professionele activiteiten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a748
+msgid "Locations diverses à caractère professionnel"
+msgstr "Diverse verhuring met professioneel karakter"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a749
+msgid "Produits divers"
+msgstr "Diverse opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7490
+msgid "Bonis sur reprises d'emballages consignés"
+msgstr "Boni bij terugneming herbruikbare verpakking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7491
+msgid "Bonis sur travaux en associations momentanées"
+msgstr "Boni op werken in joint-venture"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a75
+msgid "PRODUITS FINANCIERS"
+msgstr "Financiële opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a750
+msgid "Produits des immobilisations financières"
+msgstr "Opbrengsten uit financiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7500
+msgid "Revenus des actions"
+msgstr "Opbrengsten uit aandelen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7501
+msgid "Revenus des obligations"
+msgstr "Opbrengsten uit obligaties"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7502
+msgid "Revenus des créances à plus d'un an"
+msgstr "Inkomsten uit schuld > 1 jaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a751
+msgid "Produits des actifs circulants"
+msgstr "Opbrengsten uit vlottende activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a752
+msgid "Plus-values sur réalisations d'actifs circulants"
+msgstr "Meerwaarden op de realisatie van vlottende activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a753
+msgid "Subsides en capital et en intérêts"
+msgstr "Kapitaal- en interestsubsidies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a756
+msgid "Produits des autres créances"
+msgstr "Diverse financiële opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a757
+msgid "Escomptes obtenus"
+msgstr "Bekomen kortingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a76
+msgid "PRODUITS EXCEPTIONNELS"
+msgstr "Uitzonderlijke opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a760
+msgid "Reprises d'amortissements et de réductions de valeur"
+msgstr "Terugneming van afschrijvingen en waardeverminderingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a761
+msgid "Reprises de réductions de valeur sur immobilisations financières"
+msgstr "Terugneming van waardeverminderingen op financiële vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a762
+msgid "Reprises de provisions pour risques et charges exceptionnelles"
+msgstr "Terugneming van voorzieningen voor uitzonderlijke risico's en kosten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a763
+msgid "Plus-values sur réalisation d'actifs immobilisés"
+msgstr "Meerwaarden op de realisatie van vaste activa"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a764
+msgid "Autres produits exceptionnels"
+msgstr "Andere uitzonderlijke opbrengsten"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a77
+msgid "REGULARISATIONS D'IMPOTS ET REPRISES DE PROVISIONS FISCALES"
+msgstr ""
+"Regularisering van belastingen en terugneming van fiscale voorzieningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a771
+msgid "Impôts belges sur le résultat"
+msgstr "Belgische belastingen op het resultaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7710
+msgid "Régularisations d'impôts dus ou versés"
+msgstr "Regularisering van verschuldigde of betaalde belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7711
+msgid "Régularisations d'impôts estimés"
+msgstr "Regularisering van geraamde belastingen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a7712
+msgid "Reprises de provisions fiscales"
+msgstr "Terugneming van fiscale voorzieningen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a773
+msgid "Impôts étrangers sur le résultat"
+msgstr "Buitenlandse belastingen op het resultaat"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a79
+msgid "AFFECTATION AUX RESULTATS"
+msgstr "Resultaatverwerking"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a790
+msgid "Bénéfice reporté de l'exercice précédent"
+msgstr "Overgedragen winst van het vorige boekjaar"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a791
+msgid "Prélèvement sur le capital et les primes d'émission"
+msgstr "Onttrekking aan het kapitaal en aan de uitgiftepremies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a792
+msgid "Prélèvement sur les réserves"
+msgstr "Onttrekking aan de reserves"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a793
+msgid "Perte à reporter"
+msgstr "Over te dragen verlies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a794
+msgid "Intervention d'associés"
+msgstr "Tussenkomst van vennoten (of van de eigenaar) in het verlies"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a_expense
+msgid "Achats de matières premières"
+msgstr "Aankopen van grondstoffen"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.a_root
+msgid "PLAN COMPTABLE MINIMUM NORMALISE"
+msgstr "MINIMUM GENORMALISEERD REKENINGSTELSEL"
+
+#. module: l10n_be
+#: model:account.account.template,name:l10n_be.cash
+msgid "Caisse principale"
+msgstr "Kas"
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
+msgid "Régime National"
+msgstr "Nationaal"
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr "Export"
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_3
+msgid "Régime Intra-Communautaire"
+msgstr "Intra-Communautair"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_00
+#: model:account.tax.code.template,name:l10n_be.atctn_IIA
+msgid "Opérations soumises à un régime particulier"
+msgstr "Handelingen onderworpen aan een bijzondere regeling"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_01
+msgid "Opérations avec TVA à 6%"
+msgstr "Aan het tarief van 6%"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_02
+msgid "Opérations avec TVA à 12%"
+msgstr "Aan het tarief van 12%"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_03
+msgid "Opérations avec TVA à 21%"
+msgstr "Aan het tarief van 21%"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_44
+msgid "Services intra-communautaires"
+msgstr ""
+"Diensten waarvoor de buitenlandse btw verschuldigd is door de medecontractant"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_45
+#: model:account.tax.code.template,name:l10n_be.atctn_IID
+msgid "Opérations avec TVA due par le cocontractant"
+msgstr "Handelingen waarvoor de btw verschuldigd is door de medecontractant"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_46
+#: model:account.tax.code.template,name:l10n_be.atctn_IIE
+msgid "Livraisons intra-communautaire exemptées"
+msgstr ""
+"Vrijgestelde intracommunautaire leveringen verricht in België en ABC-verkopen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_46L
+msgid "Livraisons biens intra-communautaire exemptées"
+msgstr "Vrijgestelde intracommunautaire leveringen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_46T
+msgid "ABC intra-communautaires"
+msgstr "Vrijgestelde intracommunautaire ABC-verkopen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_47
+#: model:account.tax.code.template,name:l10n_be.atctn_IIF
+msgid "Autres opérations exemptées"
+msgstr ""
+"Andere vrijgestelde handelingen en andere handelingen verricht in het "
+"buitenland"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_48
+msgid "Notes de crédit aux opérations grilles [44] et [46]"
+msgstr "Met betrekking tot de handelingen ingeschreven in de roosters 44 en 46"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_48s44
+msgid "Notes de crédit aux opérations grille [44]"
+msgstr "Met betrekking tot de handelingen ingeschreven in rooster 44"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_48s46L
+msgid "Notes de crédit aux opérations grille [46L]"
+msgstr "Met betrekking tot de handelingen ingeschreven in rooster 46L"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_48s46T
+msgid "Notes de crédit aux opérations grille [46T]"
+msgstr "Met betrekking tot de handelingen ingeschreven in rooster 46T"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_49
+msgid "Notes de crédit aux opérations du point II"
+msgstr "Met betrekking tot de andere handelingen van kader II"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_54
+msgid "TVA sur opérations des grilles [01], [02], [03]"
+msgstr "Btw op de handelingen aangegeven in de roosters 01, 02 en 03"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_55
+msgid "TVA sur opérations des grilles [86] et [88]"
+msgstr "Btw op de handelingen aangegeven in de roosters 86 en 88"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_56
+msgid "TVA sur opérations de la grille [87]"
+msgstr ""
+"Btw op de handelingen aangegeven in rooster 87, met uitzondering van "
+"invoeren met verlegging van heffing"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_57
+#: model:account.tax.code.template,name:l10n_be.atctn_IVB
+msgid "TVA relatives aux importations"
+msgstr "Btw op invoeren met verlegging van heffing"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_59
+#: model:account.tax.code.template,name:l10n_be.atctn_VA
+msgid "TVA déductible"
+msgstr "Aftrekbare BTW"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_61
+#: model:account.tax.code.template,name:l10n_be.atctn_IVC
+msgid "Diverses régularisations en faveur de l'Etat"
+msgstr "Diverse btw-regularisaties in het voordeel van de Staat"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_62
+#: model:account.tax.code.template,name:l10n_be.atctn_VB
+msgid "Régularisations TVA en faveur du déclarant"
+msgstr "Diverse btw-regularisaties in het voordeel van de aangever"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_63
+#: model:account.tax.code.template,name:l10n_be.atctn_IVD
+msgid "TVA à reverser sur notes de crédit reçues"
+msgstr "Terug te storten btw vermeld op ontvangen creditnota's"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_64
+#: model:account.tax.code.template,name:l10n_be.atctn_VC
+msgid "TVA à recuperer sur notes de crédit delivrées"
+msgstr "Te recupereren btw vermeld op uitgereikte creditnota's"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_81
+msgid "Marchandises, matières premières et auxiliaires"
+msgstr "Handelsgoederen, grond- en hulpstoffen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_82
+msgid "Services et biens divers"
+msgstr "Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_83
+msgid "Biens d'investissement"
+msgstr "Bedrijfsmiddelen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_84
+msgid "Notes de crédits sur opérations case [86] et [88]"
+msgstr ""
+"Creditnota's met betrekking tot de handelingen ingeschreven in de roosters "
+"86 en 88"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_85
+msgid "Notes de crédits autres opérations"
+msgstr "Creditnota's met betrekking tot de andere handelingen van kader III"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_86
+#: model:account.tax.code.template,name:l10n_be.atctn_IIIC
+msgid "Acquisition intra-communautaires et ventes ABC"
+msgstr "Intracommunautaire verwervingen verricht in België en ABC-verkopen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_87
+msgid "Autres opérations"
+msgstr ""
+"Andere inkomende handelingen waarvoor de btw verschuldigd is door de aangever"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_88
+msgid "Acquisition services intra-communautaires"
+msgstr "Intracommunautaire diensten met verlegging van heffing"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_91
+msgid "TVA due pour la période du 1er au 20 décembre"
+msgstr "Werkelijk verschuldigde btw voor de periode van 1 tot 20 december"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_I
+msgid "Plan de Taxes Belge"
+msgstr "Belgisch BTW stelsel"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_II
+msgid "Opérations à la sortie"
+msgstr "Uitgaande handelingen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IIB
+msgid "TVA due par le déclarant"
+msgstr "Handelingen waarvoor de btw verschuldigd is door de aangever"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IIC
+msgid "TVA étrangère due par le cocontractant"
+msgstr ""
+"Diensten waarvoor de buitenlandse btw verschuldigd is door de medecontractant"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IIG
+msgid "Notes de crédit délivrées et corrections négatives"
+msgstr "Uitgereikte creditnota's en de negatieve verbeteringen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_III
+msgid "Opérations a l'entrée"
+msgstr "Inkomende handelingen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IIIA
+msgid "Opérations à l'entrée y compris notes de crédit et corrections"
+msgstr ""
+"Inkomende handelingen rekening houdend met de ontvangen creditnota's en "
+"andere verbeteringen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IIIB
+msgid "Notes de crédit reçues et corrections négatives"
+msgstr "Ontvangen creditnota's en de negatieve verbeteringen"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IIID
+msgid "Autres opérations à l'entrée avec TVA due par le déclarant"
+msgstr ""
+"Andere inkomende handelingen waarvoor de btw verschuldigd is door de aangever"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IIIE
+msgid "Services intracommunautaires avec report de perception"
+msgstr "Intracommunautaire diensten met verlegging van heffing"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_IVA
+msgid "TVA aux opérations en grilles 01, 02, 03, 86 et 87"
+msgstr "Btw op de handelingen aangegeven in rooster 01, 02, 03, 86 et 87"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_VI
+msgid "Solde (71-72)"
+msgstr "Saldo (71-72)"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_VII
+msgid "Acompte"
+msgstr "Voorschot"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_XX
+msgid "A payer - Total"
+msgstr "Te betalen - Totaal"
+
+#. module: l10n_be
+#: model:account.tax.code.template,name:l10n_be.atctn_YY
+msgid "A déduire - Total"
+msgstr "Af te trekken - Totaal"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00
+msgid "TVA à l'entrée 0% - Approvisionn. et marchandises"
+msgstr "BTW inkomend 0% - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-C1
+msgid "VAT-IN-V81-00-C1"
+msgstr "VAT-IN-V81-00-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-C2
+msgid "VAT-IN-V81-00-C2"
+msgstr "VAT-IN-V81-00-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-CC
+msgid "TVA à l'entrée 0% Cocontract. - Approvisionn. et marchandises"
+msgstr "BTW inkomend 0% Medecontr. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-CC-C1
+msgid "VAT-IN-V81-00-CC-C1"
+msgstr "VAT-IN-V81-00-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-CC-C2
+msgid "VAT-IN-V81-00-CC-C2"
+msgstr "VAT-IN-V81-00-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-CC-C3
+msgid "VAT-IN-V81-00-CC-C3"
+msgstr "VAT-IN-V81-00-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-EU
+msgid "TVA à l'entrée 0% Intracomm. - Approvisionn. et marchandises"
+msgstr "BTW inkomend 0% Intracomm. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-EU-C1
+msgid "VAT-IN-V81-00-EU-C1"
+msgstr "VAT-IN-V81-00-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-EU-C2
+msgid "VAT-IN-V81-00-EU-C2"
+msgstr "VAT-IN-V81-00-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-EU-C3
+msgid "VAT-IN-V81-00-EU-C3"
+msgstr "VAT-IN-V81-00-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-ROW-CC
+msgid "TVA à l'entrée 0% Hors EU - Approvisionn. et marchandises"
+msgstr "BTW inkomend 0% Buiten EU - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-ROW-CC-C1
+msgid "VAT-IN-V81-00-ROW-CC-C1"
+msgstr "VAT-IN-V81-00-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-00-ROW-CC-C2
+msgid "VAT-IN-V81-00-ROW-CC-C2"
+msgstr "VAT-IN-V81-00-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06
+msgid "TVA Déductible 6% - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 6% - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-C1
+msgid "VAT-IN-V81-06-C1"
+msgstr "VAT-IN-V81-06-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-C2
+msgid "VAT-IN-V81-06-C2"
+msgstr "VAT-IN-V81-06-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-CC
+msgid "TVA Déductible 6% Cocontract. - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 6% Medecontr. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-CC-C1
+msgid "VAT-IN-V81-06-CC-C1"
+msgstr "VAT-IN-V81-06-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-CC-C2
+msgid "VAT-IN-V81-06-CC-C2"
+msgstr "VAT-IN-V81-06-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-CC-C3
+msgid "VAT-IN-V81-06-CC-C3"
+msgstr "VAT-IN-V81-06-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-EU
+msgid "TVA Déductible 6% Intracomm. - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 6% Intracomm. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-EU-C1
+msgid "VAT-IN-V81-06-EU-C1"
+msgstr "VAT-IN-V81-06-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-EU-C2
+msgid "VAT-IN-V81-06-EU-C2"
+msgstr "VAT-IN-V81-06-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-EU-C3
+msgid "VAT-IN-V81-06-EU-C3"
+msgstr "VAT-IN-V81-06-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-ROW-CC
+msgid "TVA Déductible 6% Hors EU - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 6% Buiten EU - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-ROW-CC-C1
+msgid "VAT-IN-V81-06-ROW-CC-C1"
+msgstr "VAT-IN-V81-06-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-ROW-CC-C2
+msgid "VAT-IN-V81-06-ROW-CC-C2"
+msgstr "VAT-IN-V81-06-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-06-ROW-CC-C3
+msgid "VAT-IN-V81-06-ROW-CC-C3"
+msgstr "VAT-IN-V81-06-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12
+msgid "TVA Déductible 12% - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 12% - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-C1
+msgid "VAT-IN-V81-12-C1"
+msgstr "VAT-IN-V81-12-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-C2
+msgid "VAT-IN-V81-12-C2"
+msgstr "VAT-IN-V81-12-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-CC
+msgid "TVA Déductible 12% Cocontract. - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 12% Medecontr. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-CC-C1
+msgid "VAT-IN-V81-12-CC-C1"
+msgstr "VAT-IN-V81-12-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-CC-C2
+msgid "VAT-IN-V81-12-CC-C2"
+msgstr "VAT-IN-V81-12-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-CC-C3
+msgid "VAT-IN-V81-12-CC-C3"
+msgstr "VAT-IN-V81-12-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-EU
+msgid "TVA Déductible 12% Intracomm. - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 12% Intracomm. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-EU-C1
+msgid "VAT-IN-V81-12-EU-C1"
+msgstr "VAT-IN-V81-12-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-EU-C2
+msgid "VAT-IN-V81-12-EU-C2"
+msgstr "VAT-IN-V81-12-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-EU-C3
+msgid "VAT-IN-V81-12-EU-C3"
+msgstr "VAT-IN-V81-12-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-ROW-CC
+msgid "TVA Déductible 12% Hors EU - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 12% Buiten EU - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-ROW-CC-C1
+msgid "VAT-IN-V81-12-ROW-CC-C1"
+msgstr "VAT-IN-V81-12-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-ROW-CC-C2
+msgid "VAT-IN-V81-12-ROW-CC-C2"
+msgstr "VAT-IN-V81-12-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-12-ROW-CC-C3
+msgid "VAT-IN-V81-12-ROW-CC-C3"
+msgstr "VAT-IN-V81-12-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21
+msgid "TVA Déductible 21% - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 21% - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-C1
+msgid "VAT-IN-V81-21-C1"
+msgstr "VAT-IN-V81-21-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-C2
+msgid "VAT-IN-V81-21-C2"
+msgstr "VAT-IN-V81-21-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-CC
+msgid "TVA Déductible 21% Cocontract. - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 21% Medecontr. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-CC-C1
+msgid "VAT-IN-V81-21-CC-C1"
+msgstr "VAT-IN-V81-21-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-CC-C2
+msgid "VAT-IN-V81-21-CC-C2"
+msgstr "VAT-IN-V81-21-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-CC-C3
+msgid "VAT-IN-V81-21-CC-C3"
+msgstr "VAT-IN-V81-21-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-EU
+msgid "TVA Déductible 21% Intracomm. - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 21% Intracomm. - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-EU-C1
+msgid "VAT-IN-V81-21-EU-C1"
+msgstr "VAT-IN-V81-21-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-EU-C2
+msgid "VAT-IN-V81-21-EU-C2"
+msgstr "VAT-IN-V81-21-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-EU-C3
+msgid "VAT-IN-V81-21-EU-C3"
+msgstr "VAT-IN-V81-21-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-ROW-CC
+msgid "TVA Déductible 21% Hors EU - Approvisionn. et marchandises"
+msgstr "BTW aftrekbaar 21% Buiten EU - Grondstoffen en handelsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-ROW-CC-C1
+msgid "VAT-IN-V81-21-ROW-CC-C1"
+msgstr "VAT-IN-V81-21-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-ROW-CC-C2
+msgid "VAT-IN-V81-21-ROW-CC-C2"
+msgstr "VAT-IN-V81-21-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V81-21-ROW-CC-C3
+msgid "VAT-IN-V81-21-ROW-CC-C3"
+msgstr "VAT-IN-V81-21-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-CC
+msgid "TVA à l'entrée 0% Cocontract. - Services and other goods"
+msgstr "BTW inkomend 0% Medecontr. - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-CC-C1
+msgid "VAT-IN-V82-00-CC-C1"
+msgstr "VAT-IN-V82-00-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-CC-C2
+msgid "VAT-IN-V82-00-CC-C2"
+msgstr "VAT-IN-V82-00-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-CC-C3
+msgid "VAT-IN-V82-00-CC-C3"
+msgstr "VAT-IN-V82-00-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-G
+msgid "TVA à l'entrée 0% Intracomm. - Biens divers"
+msgstr "BTW inkomend 0% Intracomm. - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-G-C1
+msgid "VAT-IN-V82-00-EU-G-C1"
+msgstr "VAT-IN-V82-00-EU-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-G-C2
+msgid "VAT-IN-V82-00-EU-G-C2"
+msgstr "VAT-IN-V82-00-EU-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-G-C3
+msgid "VAT-IN-V82-00-EU-G-C3"
+msgstr "VAT-IN-V82-00-EU-G-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-S
+msgid "TVA à l'entrée 0% Intracomm. - Services"
+msgstr "BTW inkomend 0% Intracomm. - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-S-C1
+msgid "VAT-IN-V82-00-EU-S-C1"
+msgstr "VAT-IN-V82-00-EU-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-S-C2
+msgid "VAT-IN-V82-00-EU-S-C2"
+msgstr "VAT-IN-V82-00-EU-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-EU-S-C3
+msgid "VAT-IN-V82-00-EU-S-C3"
+msgstr "VAT-IN-V82-00-EU-S-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-G
+msgid "TVA à l'entrée 0% - Biens divers"
+msgstr "BTW inkomend 0% - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-G-C1
+msgid "VAT-IN-V82-00-G-C1"
+msgstr "VAT-IN-V82-00-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-G-C2
+msgid "VAT-IN-V82-00-G-C2"
+msgstr "VAT-IN-V82-00-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-ROW-CC
+msgid "TVA à l'entrée 0% Hors EU - Services and other goods"
+msgstr "BTW inkomend 0% Buiten EU - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-ROW-CC-C1
+msgid "VAT-IN-V82-00-ROW-CC-C1"
+msgstr "VAT-IN-V82-00-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-ROW-CC-C2
+msgid "VAT-IN-V82-00-ROW-CC-C2"
+msgstr "VAT-IN-V82-00-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-S
+msgid "TVA à l'entrée 0% - Services"
+msgstr "BTW inkomend 0% - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-S-C1
+msgid "VAT-IN-V82-00-S-C1"
+msgstr "VAT-IN-V82-00-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-00-S-C2
+msgid "VAT-IN-V82-00-S-C2"
+msgstr "VAT-IN-V82-00-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-CC
+msgid "TVA Déductible 6% Cocontract. - Services and other goods"
+msgstr "BTW aftrekbaar 6% Medecontr. - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-CC-C1
+msgid "VAT-IN-V82-06-CC-C1"
+msgstr "VAT-IN-V82-06-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-CC-C2
+msgid "VAT-IN-V82-06-CC-C2"
+msgstr "VAT-IN-V82-06-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-CC-C3
+msgid "VAT-IN-V82-06-CC-C3"
+msgstr "VAT-IN-V82-06-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-G
+msgid "TVA Déductible 6% Intracomm. - Biens divers"
+msgstr "BTW aftrekbaar 6% Intracomm. - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-G-C1
+msgid "VAT-IN-V82-06-EU-G-C1"
+msgstr "VAT-IN-V82-06-EU-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-G-C2
+msgid "VAT-IN-V82-06-EU-G-C2"
+msgstr "VAT-IN-V82-06-EU-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-G-C3
+msgid "VAT-IN-V82-06-EU-G-C3"
+msgstr "VAT-IN-V82-06-EU-G-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-S
+msgid "TVA Déductible 6% Intracomm. - Services"
+msgstr "BTW aftrekbaar 6% Intracomm. - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-S-C1
+msgid "VAT-IN-V82-06-EU-S-C1"
+msgstr "VAT-IN-V82-06-EU-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-S-C2
+msgid "VAT-IN-V82-06-EU-S-C2"
+msgstr "VAT-IN-V82-06-EU-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-EU-S-C3
+msgid "VAT-IN-V82-06-EU-S-C3"
+msgstr "VAT-IN-V82-06-EU-S-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-G
+msgid "TVA Déductible 6% - Biens divers"
+msgstr "BTW aftrekbaar 6% - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-G-C1
+msgid "VAT-IN-V82-06-G-C1"
+msgstr "VAT-IN-V82-06-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-G-C2
+msgid "VAT-IN-V82-06-G-C2"
+msgstr "VAT-IN-V82-06-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-ROW-CC
+msgid "TVA Déductible 6% Hors EU - Services and other goods"
+msgstr "BTW afrekbaar 6% Buiten EU - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-ROW-CC-C1
+msgid "VAT-IN-V82-06-ROW-CC-C1"
+msgstr "VAT-IN-V82-06-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-ROW-CC-C2
+msgid "VAT-IN-V82-06-ROW-CC-C2"
+msgstr "VAT-IN-V82-06-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-ROW-CC-C3
+msgid "VAT-IN-V82-06-ROW-CC-C3"
+msgstr "VAT-IN-V82-06-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-S
+msgid "TVA Déductible 6% - Services"
+msgstr "BTW aftrekbaar 6% - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-S-C1
+msgid "VAT-IN-V82-06-S-C1"
+msgstr "VAT-IN-V82-06-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-06-S-C2
+msgid "VAT-IN-V82-06-S-C2"
+msgstr "VAT-IN-V82-06-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-CC
+msgid "TVA Déductible 12% Cocontract. - Services and other goods"
+msgstr "BTW aftrekbaar 12% Medecontr. - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-CC-C1
+msgid "VAT-IN-V82-12-CC-C1"
+msgstr "VAT-IN-V82-12-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-CC-C2
+msgid "VAT-IN-V82-12-CC-C2"
+msgstr "VAT-IN-V82-12-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-CC-C3
+msgid "VAT-IN-V82-12-CC-C3"
+msgstr "VAT-IN-V82-12-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-G
+msgid "TVA Déductible 12% Intracomm. - Biens divers"
+msgstr "BTW aftrekbaar 12% Intracomm. - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-G-C1
+msgid "VAT-IN-V82-12-EU-G-C1"
+msgstr "VAT-IN-V82-12-EU-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-G-C2
+msgid "VAT-IN-V82-12-EU-G-C2"
+msgstr "VAT-IN-V82-12-EU-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-G-C3
+msgid "VAT-IN-V82-12-EU-G-C3"
+msgstr "VAT-IN-V82-12-EU-G-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-S
+msgid "TVA Déductible 12% Intracomm. - Services"
+msgstr "BTW aftrekbaar 12% Intracomm. - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-S-C1
+msgid "VAT-IN-V82-12-EU-S-C1"
+msgstr "VAT-IN-V82-12-EU-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-S-C2
+msgid "VAT-IN-V82-12-EU-S-C2"
+msgstr "VAT-IN-V82-12-EU-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-EU-S-C3
+msgid "VAT-IN-V82-12-EU-S-C3"
+msgstr "VAT-IN-V82-12-EU-S-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-G
+msgid "TVA Déductible 12% - Biens divers"
+msgstr "BTW aftrekbaar 12% - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-G-C1
+msgid "VAT-IN-V82-12-G-C1"
+msgstr "VAT-IN-V82-12-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-G-C2
+msgid "VAT-IN-V82-12-G-C2"
+msgstr "VAT-IN-V82-12-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-ROW-CC
+msgid "TVA Déductible 12% Hors EU - Services and other goods"
+msgstr "BTW afrekbaar 12% Buiten EU - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-ROW-CC-C1
+msgid "VAT-IN-V82-12-ROW-CC-C1"
+msgstr "VAT-IN-V82-12-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-ROW-CC-C2
+msgid "VAT-IN-V82-12-ROW-CC-C2"
+msgstr "VAT-IN-V82-12-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-ROW-CC-C3
+msgid "VAT-IN-V82-12-ROW-CC-C3"
+msgstr "VAT-IN-V82-12-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-S
+msgid "TVA Déductible 12% - Services"
+msgstr "BTW aftrekbaar 12% - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-S-C1
+msgid "VAT-IN-V82-12-S-C1"
+msgstr "VAT-IN-V82-12-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-12-S-C2
+msgid "VAT-IN-V82-12-S-C2"
+msgstr "VAT-IN-V82-12-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-CC
+msgid "TVA Déductible 21% Cocontract. - Services and other goods"
+msgstr "BTW aftrekbaar 21% Medecontr. - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-CC-C1
+msgid "VAT-IN-V82-21-CC-C1"
+msgstr "VAT-IN-V82-21-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-CC-C2
+msgid "VAT-IN-V82-21-CC-C2"
+msgstr "VAT-IN-V82-21-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-CC-C3
+msgid "VAT-IN-V82-21-CC-C3"
+msgstr "VAT-IN-V82-21-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-G
+msgid "TVA Déductible 21% Intracomm. - Biens divers"
+msgstr "BTW aftrekbaar 21% Intracomm. - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-G-C1
+msgid "VAT-IN-V82-21-EU-G-C1"
+msgstr "VAT-IN-V82-21-EU-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-G-C2
+msgid "VAT-IN-V82-21-EU-G-C2"
+msgstr "VAT-IN-V82-21-EU-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-G-C3
+msgid "VAT-IN-V82-21-EU-G-C3"
+msgstr "VAT-IN-V82-21-EU-G-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-S
+msgid "TVA Déductible 21% Intracomm. - Services"
+msgstr "BTW aftrekbaar 21% Intracomm. - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-S-C1
+msgid "VAT-IN-V82-21-EU-S-C1"
+msgstr "VAT-IN-V82-21-EU-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-S-C2
+msgid "VAT-IN-V82-21-EU-S-C2"
+msgstr "VAT-IN-V82-21-EU-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-EU-S-C3
+msgid "VAT-IN-V82-21-EU-S-C3"
+msgstr "VAT-IN-V82-21-EU-S-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-G
+msgid "TVA Déductible 21% - Biens divers"
+msgstr "BTW aftrekbaar 21% - Diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-G-C1
+msgid "VAT-IN-V82-21-G-C1"
+msgstr "VAT-IN-V82-21-G-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-G-C2
+msgid "VAT-IN-V82-21-G-C2"
+msgstr "VAT-IN-V82-21-G-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-ROW-CC
+msgid "TVA Déductible 21% Hors EU - Services and other goods"
+msgstr "BTW afrekbaar 21% Buiten EU - Diensten en diverse goederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-ROW-CC-C1
+msgid "VAT-IN-V82-21-ROW-CC-C1"
+msgstr "VAT-IN-V82-21-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-ROW-CC-C2
+msgid "VAT-IN-V82-21-ROW-CC-C2"
+msgstr "VAT-IN-V82-21-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-ROW-CC-C3
+msgid "VAT-IN-V82-21-ROW-CC-C3"
+msgstr "VAT-IN-V82-21-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-S
+msgid "TVA Déductible 21% - Services"
+msgstr "BTW aftrekbaar 21% - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-S-C1
+msgid "VAT-IN-V82-21-S-C1"
+msgstr "VAT-IN-V82-21-S-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-21-S-C2
+msgid "VAT-IN-V82-21-S-C2"
+msgstr "VAT-IN-V82-21-S-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-CAR-EXC
+msgid "TVA Entrant - Frais de voiture - VAT 50% Non Deductible (Price Excl.)"
+msgstr "BTW inkomend - onkosten wagen - BTW 50% Niet-aftrekbaar (Prijs Excl.)"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-CAR-EXC-C1
+msgid "Frais de voiture - VAT 50% Non Deductible"
+msgstr "Onkosten wagen - BTW 50% Niet aftrekbaar"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-CAR-EXC-C2
+msgid "Frais de voiture - VAT 50% Deductible (Price Excl.)"
+msgstr "Onkosten wagen - BTW 50% Aftrekbaar (Prijs Excl.)"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-CAR-EXC-C3
+msgid "Frais de voiture - Montant de la note de crédit (Price Excl.)"
+msgstr "Onkosten wagen - Bedrag creditnota (Prijs Excl.)"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-CAR-INC
+msgid "TVA Entrant - Frais de voiture - VAT 50% Non Deductible (Price Incl.)"
+msgstr "BTW inkomend - onkosten wagen - BTW 50% Niet aftrekbaar (Prijs Incl.)"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-CAR-INC-C1
+msgid "Frais de voiture - VAT 50% Deductible"
+msgstr "Onkosten wagen - BTW 50% Aftrekbaar"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V82-CAR-INC-C2
+msgid "Frais de voiture - Montant de la note de crédit"
+msgstr "Onkosten wagen - Bedrag creditnota"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00
+msgid "TVA à l'entrée 0% - Biens d'investissement"
+msgstr "BTW inkomend 0% - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-C1
+msgid "VAT-IN-V83-00-C1"
+msgstr "VAT-IN-V83-00-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-C2
+msgid "VAT-IN-V83-00-C2"
+msgstr "VAT-IN-V83-00-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-CC
+msgid "TVA à l'entrée 0% Cocontract. - Biens d'investissement"
+msgstr "BTW inkomend 0% Medecontr. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-CC-C1
+msgid "VAT-IN-V83-00-CC-C1"
+msgstr "VAT-IN-V83-00-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-CC-C2
+msgid "VAT-IN-V83-00-CC-C2"
+msgstr "VAT-IN-V83-00-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-CC-C3
+msgid "VAT-IN-V83-00-CC-C3"
+msgstr "VAT-IN-V83-00-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-EU
+msgid "TVA à l'entrée 0% Intracomm. - Biens d'investissement"
+msgstr "BTW inkomend 0% Intracomm. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-EU-C1
+msgid "VAT-IN-V83-00-EU-C1"
+msgstr "VAT-IN-V83-00-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-EU-C2
+msgid "VAT-IN-V83-00-EU-C2"
+msgstr "VAT-IN-V83-00-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-EU-C3
+msgid "VAT-IN-V83-00-EU-C3"
+msgstr "VAT-IN-V83-00-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-ROW-CC
+msgid "TVA à l'entrée 0% Hors EU - Biens d'investissement"
+msgstr "BTW inkomend 0% Buiten EU - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-ROW-CC-C1
+msgid "VAT-IN-V83-00-ROW-CC-C1"
+msgstr "VAT-IN-V83-00-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-00-ROW-CC-C2
+msgid "VAT-IN-V83-00-ROW-CC-C2"
+msgstr "VAT-IN-V83-00-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06
+msgid "TVA Déductible 6% - Biens d'investissement"
+msgstr "BTW aftrekbaar 6% - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-C1
+msgid "VAT-IN-V83-06-C1"
+msgstr "VAT-IN-V83-06-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-C2
+msgid "VAT-IN-V83-06-C2"
+msgstr "VAT-IN-V83-06-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-CC
+msgid "TVA Déductible 6% Cocontract. - Biens d'investissement"
+msgstr "BTW aftrekbaar 6% Medecontr. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-CC-C1
+msgid "VAT-IN-V83-06-CC-C1"
+msgstr "VAT-IN-V83-06-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-CC-C2
+msgid "VAT-IN-V83-06-CC-C2"
+msgstr "VAT-IN-V83-06-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-CC-C3
+msgid "VAT-IN-V83-06-CC-C3"
+msgstr "VAT-IN-V83-06-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-EU
+msgid "TVA Déductible 6% Intracomm. - Biens d'investissement"
+msgstr "BTW aftrekbaar 6% Intracomm. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-EU-C1
+msgid "VAT-IN-V83-06-EU-C1"
+msgstr "VAT-IN-V83-06-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-EU-C2
+msgid "VAT-IN-V83-06-EU-C2"
+msgstr "VAT-IN-V83-06-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-EU-C3
+msgid "VAT-IN-V83-06-EU-C3"
+msgstr "VAT-IN-V83-06-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-ROW-CC
+msgid "TVA Déductible 6% Hors EU - Biens d'investissement"
+msgstr "BTW aftrekbaar 6% Buiten EU - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-ROW-CC-C1
+msgid "VAT-IN-V83-06-ROW-CC-C1"
+msgstr "VAT-IN-V83-06-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-ROW-CC-C2
+msgid "VAT-IN-V83-06-ROW-CC-C2"
+msgstr "VAT-IN-V83-06-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-06-ROW-CC-C3
+msgid "VAT-IN-V83-06-ROW-CC-C3"
+msgstr "VAT-IN-V83-06-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12
+msgid "TVA Déductible 12% - Biens d'investissement"
+msgstr "BTW aftrekbaar 12% - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-C1
+msgid "VAT-IN-V83-12-C1"
+msgstr "VAT-IN-V83-12-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-C2
+msgid "VAT-IN-V83-12-C2"
+msgstr "VAT-IN-V83-12-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-CC
+msgid "TVA Déductible 12% Cocontract. - Biens d'investissement"
+msgstr "BTW aftrekbaar 12% Medecontr. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-CC-C1
+msgid "VAT-IN-V83-12-CC-C1"
+msgstr "VAT-IN-V83-12-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-CC-C2
+msgid "VAT-IN-V83-12-CC-C2"
+msgstr "VAT-IN-V83-12-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-CC-C3
+msgid "VAT-IN-V83-12-CC-C3"
+msgstr "VAT-IN-V83-12-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-EU
+msgid "TVA Déductible 12% Intracomm. - Biens d'investissement"
+msgstr "BTW aftrekbaar 12% Intracomm. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-EU-C1
+msgid "VAT-IN-V83-12-EU-C1"
+msgstr "VAT-IN-V83-12-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-EU-C2
+msgid "VAT-IN-V83-12-EU-C2"
+msgstr "VAT-IN-V83-12-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-EU-C3
+msgid "VAT-IN-V83-12-EU-C3"
+msgstr "VAT-IN-V83-12-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-ROW-CC
+msgid "TVA Déductible 12% Hors EU - Biens d'investissement"
+msgstr "BTW aftrekbaar 12% Buiten EU - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-ROW-CC-C1
+msgid "VAT-IN-V83-12-ROW-CC-C1"
+msgstr "VAT-IN-V83-12-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-ROW-CC-C2
+msgid "VAT-IN-V83-12-ROW-CC-C2"
+msgstr "VAT-IN-V83-12-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-12-ROW-CC-C3
+msgid "VAT-IN-V83-12-ROW-CC-C3"
+msgstr "VAT-IN-V83-12-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21
+msgid "TVA Déductible 21% - Biens d'investissement"
+msgstr "BTW aftrekbaar 21% - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-C1
+msgid "VAT-IN-V83-21-C1"
+msgstr "VAT-IN-V83-21-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-C2
+msgid "VAT-IN-V83-21-C2"
+msgstr "VAT-IN-V83-21-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-CC
+msgid "TVA Déductible 21% Cocontract. - Biens d'investissement"
+msgstr "BTW aftrekbaar 21% Medecontr. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-CC-C1
+msgid "VAT-IN-V83-21-CC-C1"
+msgstr "VAT-IN-V83-21-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-CC-C2
+msgid "VAT-IN-V83-21-CC-C2"
+msgstr "VAT-IN-V83-21-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-CC-C3
+msgid "VAT-IN-V83-21-CC-C3"
+msgstr "VAT-IN-V83-21-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-EU
+msgid "TVA Déductible 21% Intracomm. - Biens d'investissement"
+msgstr "BTW aftrekbaar 21% Intracomm. - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-EU-C1
+msgid "VAT-IN-V83-21-EU-C1"
+msgstr "VAT-IN-V83-21-EU-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-EU-C2
+msgid "VAT-IN-V83-21-EU-C2"
+msgstr "VAT-IN-V83-21-EU-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-EU-C3
+msgid "VAT-IN-V83-21-EU-C3"
+msgstr "VAT-IN-V83-21-EU-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-ROW-CC
+msgid "TVA Déductible 21% Hors EU - Biens d'investissement"
+msgstr "BTW aftrekbaar 21% Buiten EU - Investeringsgoederen"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-ROW-CC-C1
+msgid "VAT-IN-V83-21-ROW-CC-C1"
+msgstr "VAT-IN-V83-21-ROW-CC-C1"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-ROW-CC-C2
+msgid "VAT-IN-V83-21-ROW-CC-C2"
+msgstr "VAT-IN-V83-21-ROW-CC-C2"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-IN-V83-21-ROW-CC-C3
+msgid "VAT-IN-V83-21-ROW-CC-C3"
+msgstr "VAT-IN-V83-21-ROW-CC-C3"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-00-CC
+msgid "VAT 0% Cocontractant"
+msgstr "BTW 0% Medecontractant"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-00-EU-L
+msgid "Marchandises EU (Code L)"
+msgstr "Handelsgoederen EU (Code L)"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-00-EU-S
+msgid "Services EU"
+msgstr "Diensten EU"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-00-EU-T
+msgid "Marchandises EU (Code T)"
+msgstr "Handelsgoederen EU (Code T)"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-00-L
+msgid "VAT 0%"
+msgstr "BTW 0%"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-00-ROW
+msgid "Export hors EU"
+msgstr "Export Buiten EU"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-00-S
+msgid "VAT 0% - Services"
+msgstr "BTW 0% - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-06-L
+msgid "VAT 6%"
+msgstr "BTW 6%"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-06-S
+msgid "VAT 6% - Services"
+msgstr "BTW 6% - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-12-L
+msgid "VAT 12%"
+msgstr "BTW 12%"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-12-S
+msgid "VAT 12% - Services"
+msgstr "BTW 12% - Diensten"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-21-L
+msgid "VAT 21%"
+msgstr "BTW 21%"
+
+#. module: l10n_be
+#: model:account.tax.template,name:l10n_be.attn_VAT-OUT-21-S
+msgid "VAT 21% - Services"
+msgstr "BTW 21% - Diensten"
diff --git a/addons/l10n_be/static/src/img/icon.png b/addons/l10n_be/static/description/icon.png
similarity index 100%
rename from addons/l10n_be/static/src/img/icon.png
rename to addons/l10n_be/static/description/icon.png
diff --git a/addons/l10n_be/wizard/account_wizard.xml b/addons/l10n_be/wizard/account_wizard.xml
new file mode 100644
index 00000000000..dde7a77516a
--- /dev/null
+++ b/addons/l10n_be/wizard/account_wizard.xml
@@ -0,0 +1,7 @@
+<openerp>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
+    </data>
+</openerp>
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 b74cfa21b8a..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:]
 
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 29a1a1508a4..0ffa0c16a24 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -60,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
@@ -90,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']
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index 703ab9db59b..56ed91e13fb 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:]
@@ -202,11 +202,11 @@ class partner_vat_intra(osv.osv_memory):
                                         'vatnum': row['vat'][2:].replace(' ','').upper(),
                                         'vat': row['vat'],
                                         'country': row['vat'][:2],
-                                        'amount': amt,
+                                        'amount': round(amt,2),
                                         'intra_code': row['intra_code'],
                                         'code': intra_code})
 
-        xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': amount_sum, 'partner_wo_vat': p_count})
+        xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': round(amount_sum,2), 'partner_wo_vat': p_count})
         return xmldict
 
     def create_xml(self, cursor, user, ids, context=None):
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
index ff1a2c2064d..a25f01ff348 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
@@ -105,7 +105,7 @@
             <para style="terp_default_9">[[ l['vat'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ l['code'] (l['intra_code']) ]]</para>
+            <para style="terp_default_9">[[ l['code'] ]]([[ l['intra_code'] ]])</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l['amount'], currency_obj=company.currency_id) ]]</para>
diff --git a/addons/l10n_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml
index 8c11913b14d..e7b4c02ef70 100644
--- a/addons/l10n_be_coda/l10n_be_coda_view.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_view.xml
@@ -35,24 +35,24 @@
 			</form>
 			</field>
     	</record>
-    	<record id="view_account_bank_statement_line_coda_tree" model="ir.ui.view">
+        <record id="view_account_bank_statement_line_coda_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.line.coda.tree</field>
             <field name="model">account.bank.statement.line</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Statement lines">
-                	<field name="statement_id" readonly="1" invisible="1"/>
-			        <field name="sequence" readonly="1" invisible="1"/>
-			        <field name="date"/>
-			        <field name="name"/>
-			        <field name="ref"/>
-			        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-			        <field name="type" on_change="onchange_type(partner_id, type)"/>
-			        <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
-			        <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
-			        <field name="amount"/>
-			        <field name="note"/>
-			    </tree>
+                <tree editable="bottom" string="Statement lines" create="0">
+                    <field name="sequence" readonly="1" invisible="1"/>
+                    <field name="statement_id" readonly="1" />
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="ref"/>
+                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                    <field name="type" on_change="onchange_type(partner_id, type)"/>
+                    <field name="account_id" options='{"no_open":True}' domain="[('type', '&lt;&gt;', 'view')]"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type', '&lt;&gt;', 'view')]"/>
+                    <field name="amount"/>
+                    <field name="note"/>
+                </tree>
             </field>
         </record>
         
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index 8aabe601bc8..aed99345fba 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -117,6 +117,8 @@ class account_coda_import(osv.osv_memory):
                     # and so a 'like' operator would return the first account number in the database which matches.
                     cr.execute("select id from res_partner_bank where replace(replace(acc_number,' ',''),'-','') = %s", (statement['acc_number'],))
                 bank_ids = [id[0] for id in cr.fetchall()]
+                # Filter bank accounts which are not allowed
+                bank_ids = self.pool.get('res.partner.bank').search(cr, uid, [('id', 'in', bank_ids)])
                 if bank_ids and len(bank_ids) > 0:
                     bank_accs = self.pool.get('res.partner.bank').browse(cr, uid, bank_ids)
                     for bank_acc in bank_accs:
@@ -248,7 +250,7 @@ class account_coda_import(osv.osv_memory):
             elif line[0] == '9':
                 statement['balanceMin'] = float(rmspaces(line[22:37])) / 1000
                 statement['balancePlus'] = float(rmspaces(line[37:52])) / 1000
-                if not statement['balance_end_real']:
+                if not statement.get('balance_end_real'):
                     statement['balance_end_real'] = statement['balance_start'] + statement['balancePlus'] - statement['balanceMin']
         for i, statement in enumerate(statements):
             statement['coda_note'] = ''
@@ -266,6 +268,8 @@ class account_coda_import(osv.osv_memory):
                     raise osv.except_osv(_('Error'), _("Configuration Error in journal %s!\nPlease verify the Default Debit and Credit Account settings.") % statement['journal_id'].name)
             if balance_start_check != statement['balance_start']:
                 statement['coda_note'] = _("The CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s!") % (statement['description'] + ' #' + statement['paperSeqNumber'], statement['balance_start'], balance_start_check, statement['journal_id'].name)
+            if not(statement.get('period_id')):
+                raise osv.except_osv(_('Error') + ' R3006', _(' No transactions or no period in coda file !'))
             data = {
                 'name': statement['paperSeqNumber'],
                 'date': statement['date'],
diff --git a/addons/l10n_be_hr_payroll/i18n/zh_CN.po b/addons/l10n_be_hr_payroll/i18n/zh_CN.po
new file mode 100644
index 00000000000..e753e1e1bb2
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/i18n/zh_CN.po
@@ -0,0 +1,148 @@
+# Chinese (Simplified) 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-11-24 02:53+0000\n"
+"PO-Revision-Date: 2013-06-23 05:44+0000\n"
+"Last-Translator: Calvin <mceiba@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-06-24 04:43+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_spouse_bool:0
+msgid "if recipient spouse is declared disabled by law"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_children_bool:0
+msgid "if recipient children is/are declared disabled by law"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_onss_deduction:0
+msgid "Miscellaneous exempt ONSS "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "员工"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_spouse_bool:0
+msgid "Disabled Spouse"
+msgstr "残疾人配偶"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,retained_net_amount:0
+msgid "Net retained "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,resident_bool:0
+msgid "Nonresident"
+msgstr "非常住人口"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,resident_bool:0
+msgid "if recipient lives in a foreign country"
+msgstr "如果接受者居住在国外"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "if spouse has professionnel income or not"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,insurance_employee_deduction:0
+msgid "Insurance Group - by worker "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "With Income"
+msgstr "有收入"
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "Without Income"
+msgstr "无收入"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_number:0
+msgid "Number of disabled children"
+msgstr "残疾儿童个数"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,additional_net_amount:0
+msgid "Net supplements"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_company_amount:0
+msgid "Company car employer"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_advantage_amount:0
+msgid "Benefits of various nature "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_employee_deduction:0
+msgid "Company Car Deduction for Worker"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_bool:0
+msgid "Disabled Children"
+msgstr "残疾儿童"
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "合约"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_amount:0
+msgid "Check Value Meal "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,travel_reimbursement_amount:0
+msgid "Reimbursement of travel expenses"
+msgstr "差旅花费补贴"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr "错误！联系人开始日期必须小于结束日期"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,spouse_fiscal_status:0
+msgid "Tax status for spouse"
+msgstr "配偶缴税状态"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "number of dependent children declared as disabled"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr "错误！，你不能创建循环的员工层次"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_employee_deduction:0
+msgid "Check Value Meal - by worker "
+msgstr ""
diff --git a/addons/l10n_be_hr_payroll/static/src/img/icon.png b/addons/l10n_be_hr_payroll/static/description/icon.png
similarity index 100%
rename from addons/l10n_be_hr_payroll/static/src/img/icon.png
rename to addons/l10n_be_hr_payroll/static/description/icon.png
diff --git a/addons/l10n_be_hr_payroll_account/__openerp__.py b/addons/l10n_be_hr_payroll_account/__openerp__.py
index 7ba7caaa3e0..f9e078a0e49 100644
--- a/addons/l10n_be_hr_payroll_account/__openerp__.py
+++ b/addons/l10n_be_hr_payroll_account/__openerp__.py
@@ -32,6 +32,7 @@ Accounting Data for Belgian Payroll Rules.
     'auto_install': True,
     'demo': [],
     'data':[
+        'l10n_be_wizard.yml',
         'l10n_be_hr_payroll_account_data.xml',
         'data/hr.salary.rule.csv',
     ],
diff --git a/addons/l10n_be/l10n_be_wizard.yml b/addons/l10n_be_hr_payroll_account/l10n_be_wizard.yml
similarity index 100%
rename from addons/l10n_be/l10n_be_wizard.yml
rename to addons/l10n_be_hr_payroll_account/l10n_be_wizard.yml
diff --git a/addons/l10n_be_hr_payroll_account/static/src/img/icon.png b/addons/l10n_be_hr_payroll_account/static/description/icon.png
similarity index 100%
rename from addons/l10n_be_hr_payroll_account/static/src/img/icon.png
rename to addons/l10n_be_hr_payroll_account/static/description/icon.png
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index a23dabd7c51..854593a87cc 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -153,25 +153,33 @@ class account_invoice(osv.osv):
         return {'value': {'reference': reference}}
 
     def create(self, cr, uid, vals, context=None):
-        if vals.has_key('reference_type'):
-            reference_type = vals['reference_type']
+        reference = vals.get('reference', False)
+        reference_type = vals.get('reference_type', False)
+        if vals.get('type') == 'out_invoice' and not reference_type:
+            # fallback on default communication type for partner
+            reference_type = self.pool.get('res.partner').browse(cr, uid, vals['partner_id']).out_inv_comm_type
             if reference_type == 'bba':
-                if vals.has_key('reference'):
-                    bbacomm = vals['reference']
-                else:
+                reference = self.generate_bbacomm(cr, uid, [], vals['type'], reference_type, vals['partner_id'], '', context={})['value']['reference']
+            vals.update({
+                'reference_type': reference_type or 'none',
+                'reference': reference,
+            })
+
+        if reference_type == 'bba':
+            if not reference:
+                raise osv.except_osv(_('Warning!'),
+                    _('Empty BBA Structured Communication!' \
+                      '\nPlease fill in a unique BBA Structured Communication.'))
+            if self.check_bbacomm(reference):
+                reference = re.sub('\D', '', reference)
+                vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
+                same_ids = self.search(cr, uid,
+                    [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
+                     ('reference', '=', vals['reference'])])
+                if same_ids:
                     raise osv.except_osv(_('Warning!'),
-                        _('Empty BBA Structured Communication!' \
-                          '\nPlease fill in a unique BBA Structured Communication.'))
-                if self.check_bbacomm(bbacomm):
-                    reference = re.sub('\D', '', bbacomm)
-                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
-                    same_ids = self.search(cr, uid,
-                        [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
-                         ('reference', '=', vals['reference'])])
-                    if same_ids:
-                        raise osv.except_osv(_('Warning!'),
-                            _('The BBA Structured Communication has already been used!' \
-                              '\nPlease create manually a unique BBA Structured Communication.'))
+                        _('The BBA Structured Communication has already been used!' \
+                          '\nPlease create manually a unique BBA Structured Communication.'))
         return super(account_invoice, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -199,6 +207,19 @@ class account_invoice(osv.osv):
                               '\nPlease create manually a unique BBA Structured Communication.'))
         return super(account_invoice, self).write(cr, uid, ids, vals, context)
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        invoice = self.browse(cr, uid, id, context=context)
+        if invoice.type in ['out_invoice']:
+            reference_type = invoice.reference_type or 'none'
+            default['reference_type'] = reference_type
+            if reference_type == 'bba':
+                partner = invoice.partner_id
+                default['reference'] = self.generate_bbacomm(cr, uid, id,
+                    invoice.type, reference_type,
+                    partner.id, '', context=context)['value']['reference']
+        return super(account_invoice, self).copy(cr, uid, id, default, context=context)
+
     _columns = {
         'reference': fields.char('Communication', size=64, help="The partner reference of this invoice."),
         'reference_type': fields.selection(_get_reference_type, 'Communication Type',
diff --git a/addons/l10n_bo/static/src/img/icon.png b/addons/l10n_bo/static/description/icon.png
similarity index 100%
rename from addons/l10n_bo/static/src/img/icon.png
rename to addons/l10n_bo/static/description/icon.png
diff --git a/addons/l10n_br/static/src/img/icon.png b/addons/l10n_br/static/description/icon.png
similarity index 100%
rename from addons/l10n_br/static/src/img/icon.png
rename to addons/l10n_br/static/description/icon.png
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 945327a06bc..6ba9907b088 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -20,7 +20,7 @@
 ##############################################################################
 {
     'name': 'Canada - Accounting',
-    'version': '1.1',
+    'version': '1.2',
     'author': 'Savoir-faire Linux',
     'website': 'http://www.savoirfairelinux.com',
     'category': 'Localization/Account Charts',
@@ -29,6 +29,28 @@ This is the module to manage the English and French - Canadian accounting chart
 ===========================================================================================
 
 Canadian accounting charts and localizations.
+
+Fiscal positions
+----------------
+
+When considering taxes to be applied, it is the province where the delivery occurs that matters. 
+Therefore we decided to implement the most common case in the fiscal positions: delivery is the 
+responsibility of the supplier and done at the customer location.
+
+Some examples:
+
+1) You have a customer from another province and you deliver to his location.
+On the customer, set the fiscal position to his province.
+
+2) You have a customer from another province. However this customer comes to your location
+with their truck to pick up products. On the customer, do not set any fiscal position.
+
+3) An international supplier doesn't charge you any tax. Taxes are charged at customs 
+by the customs broker. On the supplier, set the fiscal position to International.
+
+4) An international supplier charge you your provincial tax. They are registered with your
+provincial government and remit taxes themselves. On the supplier, do not set any fiscal 
+position.
     """,
     'depends': [
         'base',
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 0a596bcd4f6..a929e213842 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -131,7 +131,7 @@
 		<field name="parent_id" ref="chart118_en"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">GST receivable</field>
 	</record>
 
@@ -140,17 +140,43 @@
 		<field name="parent_id" ref="chart118_en"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">PST/QST receivable</field>
 	</record>
 
 	<record id="chart1183_en" model="account.account.template">
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_en"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="name">HST receivable</field>
+	</record>
+
+	<record id="chart11831_en" model="account.account.template">
+		<field name="code">11831</field>
+		<field name="parent_id" ref="chart1183_en"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_receivable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">HST receivable</field>
+		<field name="reconcile" eval="False"/>
+		<field name="name">HST receivable - 13%</field>
+	</record>
+
+	<record id="chart11832_en" model="account.account.template">
+		<field name="code">11832</field>
+		<field name="parent_id" ref="chart1183_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">HST receivable - 14%</field>
+	</record>
+
+	<record id="chart11833_en" model="account.account.template">
+		<field name="code">11833</field>
+		<field name="parent_id" ref="chart1183_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_receivable"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">HST receivable - 15%</field>
 	</record>
 
 	<record id="chart15_en" model="account.account.template">
@@ -257,7 +283,7 @@
 		<field name="parent_id" ref="chart213_en"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">GST to pay</field>
 	</record>
 
@@ -266,17 +292,43 @@
 		<field name="parent_id" ref="chart213_en"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">PST/QST to pay</field>
 	</record>
 
 	<record id="chart2133_en" model="account.account.template">
 		<field name="code">2133</field>
 		<field name="parent_id" ref="chart213_en"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="name">HST to pay</field>
+	</record>
+
+	<record id="chart21331_en" model="account.account.template">
+		<field name="code">21331</field>
+		<field name="parent_id" ref="chart2133_en"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_payable"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">HST to pay</field>
+		<field name="reconcile" eval="False"/>
+		<field name="name">HST to pay - 13%</field>
+	</record>
+
+	<record id="chart21332_en" model="account.account.template">
+		<field name="code">21332</field>
+		<field name="parent_id" ref="chart2133_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">HST to pay - 14%</field>
+	</record>
+
+	<record id="chart21333_en" model="account.account.template">
+		<field name="code">21333</field>
+		<field name="parent_id" ref="chart2133_en"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_payable"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">HST to pay - 15%</field>
 	</record>
 
 	<record id="chart214_en" model="account.account.template">
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index c168833b733..57e6c84aa71 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -130,7 +130,7 @@
 		<field name="parent_id" ref="chart118_fr"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">TPS à recevoir</field>
 	</record>
 
@@ -139,17 +139,43 @@
 		<field name="parent_id" ref="chart118_fr"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">TVP/TVQ à recevoir</field>
 	</record>
 
 	<record id="chart1183_fr" model="account.account.template">
 		<field name="code">1183</field>
 		<field name="parent_id" ref="chart118_fr"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="name">TVH à recevoir</field>
+	</record>
+
+	<record id="chart11831_fr" model="account.account.template">
+		<field name="code">11831</field>
+		<field name="parent_id" ref="chart1183_fr"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_asset"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVH à recevoir</field>
+		<field name="reconcile" eval="False"/>
+		<field name="name">TVH à recevoir - 13%</field>
+	</record>
+
+	<record id="chart11832_fr" model="account.account.template">
+		<field name="code">11832</field>
+		<field name="parent_id" ref="chart1183_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">TVH à recevoir - 14%</field>
+	</record>
+
+	<record id="chart11833_fr" model="account.account.template">
+		<field name="code">11833</field>
+		<field name="parent_id" ref="chart1183_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_asset"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">TVH à recevoir - 15%</field>
 	</record>
 
 	<record id="chart15_fr" model="account.account.template">
@@ -256,7 +282,7 @@
 		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">TPS à payer</field>
 	</record>
 
@@ -265,17 +291,43 @@
 		<field name="parent_id" ref="chart213_fr"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
+		<field name="reconcile" eval="False"/>
 		<field name="name">TVP/TVQ à payer</field>
 	</record>
 
 	<record id="chart2133_fr" model="account.account.template">
 		<field name="code">2133</field>
 		<field name="parent_id" ref="chart213_fr"/>
+		<field name="type">view</field>
+		<field name="user_type" ref="account.data_account_type_view"/>
+		<field name="name">TVH à payer</field>
+	</record>
+
+	<record id="chart21331_fr" model="account.account.template">
+		<field name="code">21331</field>
+		<field name="parent_id" ref="chart2133_fr"/>
 		<field name="type">other</field>
 		<field name="user_type" ref="account.data_account_type_liability"/>
-		<field name="reconcile" eval="True"/>
-		<field name="name">TVH à payer</field>
+		<field name="reconcile" eval="False"/>
+		<field name="name">TVH à payer - 13%</field>
+	</record>
+
+	<record id="chart21332_fr" model="account.account.template">
+		<field name="code">21332</field>
+		<field name="parent_id" ref="chart2133_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_liability"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">TVH à payer - 14%</field>
+	</record>
+
+	<record id="chart21333_fr" model="account.account.template">
+		<field name="code">21333</field>
+		<field name="parent_id" ref="chart2133_fr"/>
+		<field name="type">other</field>
+		<field name="user_type" ref="account.data_account_type_liability"/>
+		<field name="reconcile" eval="False"/>
+		<field name="name">TVH à payer - 15%</field>
 	</record>
 
         <record id="chart214_fr" model="account.account.template">
@@ -672,7 +724,7 @@
 		<field name="code">5112</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Achats dans des provinces harmonisées</field>
 	</record>
 	
@@ -680,7 +732,7 @@
 		<field name="code">5113</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Achats dans des provinces non-harmonisées</field>
 	</record>
 
@@ -688,7 +740,7 @@
 		<field name="code">5114</field>
 		<field name="parent_id" ref="chart511_fr"/>
 		<field name="type">other</field>
-		<field name="user_type" ref="account.data_account_type_income"/>
+		<field name="user_type" ref="account.data_account_type_expense"/>
 		<field name="name">Achats à l'étranger</field>
 	</record>
 
diff --git a/addons/l10n_ca/account_tax_code_en.xml b/addons/l10n_ca/account_tax_code_en.xml
index d446f431c96..77698ae14de 100644
--- a/addons/l10n_ca/account_tax_code_en.xml
+++ b/addons/l10n_ca/account_tax_code_en.xml
@@ -31,6 +31,21 @@
         <field name="parent_id" ref="vat_code_receivable_tva_en"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_receivable_hst13_en">
+        <field name="name">HST paid - 13%</field>
+        <field name="parent_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_receivable_hst14_en">
+        <field name="name">HST paid - 14%</field>
+        <field name="parent_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_receivable_hst15_en">
+        <field name="name">HST paid - 15%</field>
+        <field name="parent_id" ref="vat_code_receivable_hst_en"/>
+    </record>
+
     <record model="account.tax.code.template" id="vat_code_payable_en">
         <field name="name">Taxes received</field>
         <field name="parent_id" ref="vat_code_balance_net_en"/>
@@ -51,6 +66,21 @@
         <field name="parent_id" ref="vat_code_payable_en"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_payable_hst13_en">
+        <field name="name">HST received - 13%</field>
+        <field name="parent_id" ref="vat_code_payable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_payable_hst14_en">
+        <field name="name">HST received - 14%</field>
+        <field name="parent_id" ref="vat_code_payable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_payable_hst15_en">
+        <field name="name">HST received - 15%</field>
+        <field name="parent_id" ref="vat_code_payable_hst_en"/>
+    </record>
+
     <record model="account.tax.code.template" id="vat_code_base_net_en">
         <field name="name">Taxes Base</field>
         <field name="parent_id" ref="vat_code_tax_en"/>
@@ -76,6 +106,21 @@
         <field name="parent_id" ref="vat_code_base_receivable_en"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst13_en">
+        <field name="name">Base of HST for Sales - 13%</field>
+        <field name="parent_id" ref="vat_code_base_receivable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst14_en">
+        <field name="name">Base of HST for Sales - 14%</field>
+        <field name="parent_id" ref="vat_code_base_receivable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst15_en">
+        <field name="name">Base of HST for Sales - 15%</field>
+        <field name="parent_id" ref="vat_code_base_receivable_hst_en"/>
+    </record>
+
     <record model="account.tax.code.template" id="vat_code_base_payable_en">
         <field name="name">Base of Purchases Tax</field>
         <field name="parent_id" ref="vat_code_base_net_en"/>
@@ -96,5 +141,20 @@
         <field name="parent_id" ref="vat_code_base_payable_en"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst13_en">
+        <field name="name">Base of HST for Purchases - 13%</field>
+        <field name="parent_id" ref="vat_code_base_payable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst14_en">
+        <field name="name">Base of HST for Purchases - 14%</field>
+        <field name="parent_id" ref="vat_code_base_payable_hst_en"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst15_en">
+        <field name="name">Base of HST for Purchases - 15%</field>
+        <field name="parent_id" ref="vat_code_base_payable_hst_en"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml
index 2b6acd2b992..ac4414922e2 100644
--- a/addons/l10n_ca/account_tax_code_fr.xml
+++ b/addons/l10n_ca/account_tax_code_fr.xml
@@ -16,41 +16,71 @@
         <field name="parent_id" ref="vat_code_balance_net_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
+    <record model="account.tax.code.template" id="vat_code_receivable_gst_fr">
         <field name="name">TPS payée</field>
         <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
+    <record model="account.tax.code.template" id="vat_code_receivable_pst_fr">
         <field name="name">TVP/TVQ payée</field>
         <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
+    <record model="account.tax.code.template" id="vat_code_receivable_hst_fr">
         <field name="name">TVH payée</field>
         <field name="parent_id" ref="vat_code_receivable_tva_fr"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_receivable_hst13_fr">
+        <field name="name">TVH payée - 13%</field>
+        <field name="parent_id" ref="vat_code_receivable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_receivable_hst14_fr">
+        <field name="name">TVH payée - 14%</field>
+        <field name="parent_id" ref="vat_code_receivable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_receivable_hst15_fr">
+        <field name="name">TVH payée - 15%</field>
+        <field name="parent_id" ref="vat_code_receivable_hst_fr"/>
+    </record>
+
     <record model="account.tax.code.template" id="vat_code_payable_fr">
         <field name="name">Taxes reçues</field>
         <field name="parent_id" ref="vat_code_balance_net_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_payable_tps_fr">
+    <record model="account.tax.code.template" id="vat_code_payable_gst_fr">
         <field name="name">TPS reçue</field>
         <field name="parent_id" ref="vat_code_payable_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
+    <record model="account.tax.code.template" id="vat_code_payable_pst_fr">
         <field name="name">TVP/TVQ reçue</field>
         <field name="parent_id" ref="vat_code_payable_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
+    <record model="account.tax.code.template" id="vat_code_payable_hst_fr">
         <field name="name">TVH reçue</field>
         <field name="parent_id" ref="vat_code_payable_fr"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_payable_hst13_fr">
+        <field name="name">TVH reçue - 13%</field>
+        <field name="parent_id" ref="vat_code_payable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_payable_hst14_fr">
+        <field name="name">TVH reçue - 14%</field>
+        <field name="parent_id" ref="vat_code_payable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_payable_hst15_fr">
+        <field name="name">TVH reçue - 15%</field>
+        <field name="parent_id" ref="vat_code_payable_hst_fr"/>
+    </record>
+
     <record model="account.tax.code.template" id="vat_code_base_net_fr">
         <field name="name">Base de taxes</field>
         <field name="parent_id" ref="vat_code_tax_fr"/>
@@ -61,40 +91,70 @@
         <field name="parent_id" ref="vat_code_base_net_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_base_receivable_tps_fr">
+    <record model="account.tax.code.template" id="vat_code_base_receivable_gst_fr">
         <field name="name">Base de la TPS pour les ventes</field>
         <field name="parent_id" ref="vat_code_base_receivable_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_base_receivable_tvp_fr">
+    <record model="account.tax.code.template" id="vat_code_base_receivable_pst_fr">
         <field name="name">Base de la TVP/TVQ pour les ventes</field>
         <field name="parent_id" ref="vat_code_base_receivable_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_base_receivable_tvh_fr">
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst_fr">
         <field name="name">Base de la TVH pour les ventes</field>
         <field name="parent_id" ref="vat_code_base_receivable_fr"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst13_fr">
+        <field name="name">Base de la TVH pour les ventes - 13%</field>
+        <field name="parent_id" ref="vat_code_base_receivable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst14_fr">
+        <field name="name">Base de la TVH pour les ventes - 14%</field>
+        <field name="parent_id" ref="vat_code_base_receivable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_receivable_hst15_fr">
+        <field name="name">Base de la TVH pour les ventes - 15%</field>
+        <field name="parent_id" ref="vat_code_base_receivable_hst_fr"/>
+    </record>
+
     <record model="account.tax.code.template" id="vat_code_base_payable_fr">
         <field name="name">Base des taxes d'achats</field>
         <field name="parent_id" ref="vat_code_base_net_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_base_payable_tps_fr">
+    <record model="account.tax.code.template" id="vat_code_base_payable_gst_fr">
         <field name="name">Base de la TPS pour les achats</field>
         <field name="parent_id" ref="vat_code_base_payable_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_base_payable_tvp_fr">
+    <record model="account.tax.code.template" id="vat_code_base_payable_pst_fr">
         <field name="name">Base de la TVP/TVQ pour les achats</field>
         <field name="parent_id" ref="vat_code_base_payable_fr"/>
     </record>
 
-    <record model="account.tax.code.template" id="vat_code_base_payable_tvh_fr">
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst_fr">
         <field name="name">Base de la TVH pour les achats</field>
         <field name="parent_id" ref="vat_code_base_payable_fr"/>
     </record>
 
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst13_fr">
+        <field name="name">Base de la TVH pour les achats - 13%</field>
+        <field name="parent_id" ref="vat_code_base_payable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst14_fr">
+        <field name="name">Base de la TVH pour les achats - 14%</field>
+        <field name="parent_id" ref="vat_code_base_payable_hst_fr"/>
+    </record>
+
+    <record model="account.tax.code.template" id="vat_code_base_payable_hst15_fr">
+        <field name="name">Base de la TVH pour les achats - 15%</field>
+        <field name="parent_id" ref="vat_code_base_payable_hst_fr"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index afe505f27f5..4c15ebb68ed 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -4,6 +4,53 @@
 
     <!-- SALES TAXES -->
 
+    <!-- British Columbia PST -->
+
+    <record id="gstpst_bc_sale_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST + PST for sales (BC)</field>
+        <field name="description">GSTPST_BC_SALE</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">1</field>
+        <field name="type">percent</field>
+        <field name="child_depend">1</field>
+    </record>
+
+    <record id="gstpst_sale_bc_gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST for sales - 5% (BC)</field>
+        <field name="description">GST</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart2131_en"/>
+        <field name="account_paid_id" ref="chart2131_en"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
+        <field name="parent_id" ref="gstpst_bc_sale_en"/>
+    </record>
+
+    <record id="pst_bc_sale_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">PST for sales - 7% (BC)</field>
+        <field name="description">PST</field>
+        <field name="type_tax_use">sale</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"/>
+        <field name="account_paid_id" ref="chart2132_en"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
+        <field name="parent_id" ref="gstpst_bc_sale_en"/>
+    </record>
+
     <!-- Manitoba PST -->
 
     <record id="gstpst_mb_sale_en" model="account.tax.template">
@@ -13,6 +60,7 @@
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
     <record id="gstpst_sale_mb_gst_en" model="account.tax.template">
@@ -35,10 +83,10 @@
 
     <record id="pst_mb_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST for sales - 7%</field>
+        <field name="name">PST for sales - 8% (MB)</field>
         <field name="description">PST</field>
         <field name="type_tax_use">sale</field>
-        <field name="amount">0.070000</field>
+        <field name="amount">0.080000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart2132_en"/>
@@ -50,65 +98,19 @@
         <field name="parent_id" ref="gstpst_mb_sale_en"/>
     </record>
 
-    <!-- Prince Edward Island PST -->
-
-    <record id="gstpst_pe_sale_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST for sales (PE)</field>
-        <field name="description">GSTPST_PE_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>
-
-    <record id="gstpst_sale_pe_gst_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST for sales - 5% (PE)</field>
-        <field name="description">GST</field>
-        <field name="type_tax_use">sale</field>
-        <field name="amount">0.050000</field>
-        <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart2131_en"/>
-        <field name="account_paid_id" ref="chart2131_en"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gstpst_pe_sale_en"/>
-    </record>
-
-    <record id="pst_pe_sale_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST for sale - 10%</field>
-        <field name="description">PST</field>
-        <field name="type_tax_use">sale</field>
-        <field name="amount">0.100000</field>
-        <field name="type">percent</field>
-        <field name="sequence">2</field>
-        <field name="account_collected_id" ref="chart2132_en"/>
-        <field name="account_paid_id" ref="chart2132_en"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gstpst_pe_sale_en"/>
-    </record>
-
     <!-- Quebec PST -->
 
-    <record id="gsttvq_sale_en" model="account.tax.template">
+    <record id="gstqst_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + TVQ for sales</field>
-        <field name="description">GSTTVQ_SALE</field>
+        <field name="name">GST + QST for sales</field>
+        <field name="description">GSTQST_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="gsttvq_sale_gst_en" model="account.tax.template">
+    <record id="gstqst_sale_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
         <field name="name">GST for sales - 5% (QC)</field>
         <field name="description">GST</field>
@@ -122,13 +124,13 @@
         <field name="tax_code_id" ref="vat_code_payable_gst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
-        <field name="parent_id" ref="gsttvq_sale_en"/>
+        <field name="parent_id" ref="gstqst_sale_en"/>
     </record>
 
-    <record id="tvq_sale_en" model="account.tax.template">
+    <record id="qst_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVQ for sales - 9.975%</field>
-        <field name="description">TVQ</field>
+        <field name="name">QST for sales - 9.975%</field>
+        <field name="description">QST</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.099750</field>
         <field name="type">percent</field>
@@ -139,7 +141,7 @@
         <field name="tax_code_id" ref="vat_code_payable_pst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
-        <field name="parent_id" ref="gsttvq_sale_en"/>
+        <field name="parent_id" ref="gstqst_sale_en"/>
     </record>
 
     <!-- Saskatchewan PST -->
@@ -151,6 +153,7 @@
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
     <record id="gstpst_sale_sk_gst_en" model="account.tax.template">
@@ -190,64 +193,49 @@
 
     <!-- HST -->
 
-    <record id="hst12_sale_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 12%</field>
-        <field name="description">TVH12_SALE</field>
-        <field name="type_tax_use">sale</field>
-        <field name="amount">0.120000</field>
-        <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_en"/>
-        <field name="account_paid_id" ref="chart2133_en"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
-    </record>
-
     <record id="hst13_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 13%</field>
-        <field name="description">TVH13_SALE</field>
+        <field name="name">HST for sales - 13%</field>
+        <field name="description">HST13_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_en"/>
-        <field name="account_paid_id" ref="chart2133_en"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="account_collected_id" ref="chart21331_en"/>
+        <field name="account_paid_id" ref="chart21331_en"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_hst13_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst13_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst13_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_hst13_en"/>
     </record>
 
-    <record id="hst135_sale_en" model="account.tax.template">
+    <record id="hst14_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 13.5%</field>
-        <field name="description">TVH135_SALE</field>
+        <field name="name">HST for sales - 14%</field>
+        <field name="description">HST14_SALE</field>
         <field name="type_tax_use">sale</field>
-        <field name="amount">0.135000</field>
+        <field name="amount">0.14000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_en"/>
-        <field name="account_paid_id" ref="chart2133_en"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="account_collected_id" ref="chart21332_en"/>
+        <field name="account_paid_id" ref="chart21332_en"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_hst14_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst14_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst14_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_hst14_en"/>
     </record>
 
     <record id="hst15_sale_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for sales - 15%</field>
-        <field name="description">TVH15_SALE</field>
+        <field name="name">HST for sales - 15%</field>
+        <field name="description">HST15_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_en"/>
-        <field name="account_paid_id" ref="chart2133_en"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_payable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
+        <field name="account_collected_id" ref="chart21333_en"/>
+        <field name="account_paid_id" ref="chart21333_en"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_hst15_en"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst15_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst15_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_hst15_en"/>
     </record>
 
     <!-- GST -->
@@ -267,9 +255,55 @@
         <field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
     </record>
 
-
     <!-- PURCHASE TAXES -->
 
+    <!-- British Columbia PST -->
+
+    <record id="gstpst_bc_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST + PST for purchases (BC)</field>
+        <field name="description">GSTPST_BC_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="type">percent</field>
+        <field name="child_depend">1</field>
+    </record>
+
+    <record id="gstpst_purc_bc_gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST for purchases - 5% (BC)</field>
+        <field name="description">GST</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_en"/>
+        <field name="account_paid_id" ref="chart1181_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
+        <field name="parent_id" ref="gstpst_bc_purc_en"/>
+    </record>
+
+    <record id="pst_bc_purc_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">PST for purchases - 7% (BC)</field>
+        <field name="description">PST</field>
+        <field name="type_tax_use">purchase</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"/>
+        <field name="account_paid_id" ref="chart1182_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
+        <field name="parent_id" ref="gstpst_bc_purc_en"/>
+    </record>
+
     <!-- Manitoba PST -->
 
     <record id="gstpst_mb_purc_en" model="account.tax.template">
@@ -279,6 +313,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
     <record id="gstpst_purc_mb_gst_en" model="account.tax.template">
@@ -301,10 +336,10 @@
 
     <record id="pst_mb_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST for purchases - 7%</field>
+        <field name="name">PST for purchases - 8% (MB)</field>
         <field name="description">PST</field>
         <field name="type_tax_use">purchase</field>
-        <field name="amount">0.070000</field>
+        <field name="amount">0.080000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart1182_en"/>
@@ -316,65 +351,19 @@
         <field name="parent_id" ref="gstpst_mb_purc_en"/>
     </record>
 
-    <!-- Prince Edward Island PST -->
-
-    <record id="gstpst_pe_purc_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + PST for purchases (PE)</field>
-        <field name="description">GSTPST_PE_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>
-
-    <record id="gstpst_purc_pe_gst_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST for purchases - 5% (PE)</field>
-        <field name="description">GST</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount">0.050000</field>
-        <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_en"/>
-        <field name="account_paid_id" ref="chart1181_en"/>
-        <field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="parent_id" ref="gstpst_pe_purc_en"/>
-    </record>
-
-    <record id="pst_pe_purc_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">PST for purchases - 10%</field>
-        <field name="description">PST</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount">0.100000</field>
-        <field name="type">percent</field>
-        <field name="sequence">2</field>
-        <field name="account_collected_id" ref="chart1182_en"/>
-        <field name="account_paid_id" ref="chart1182_en"/>
-        <field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="parent_id" ref="gstpst_pe_purc_en"/>
-    </record>
-
     <!-- Quebec PST -->
 
-    <record id="gsttvq_purc_en" model="account.tax.template">
+    <record id="gstqst_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">GST + TVQ for purchases</field>
-        <field name="description">GSTTVQ_PURC</field>
+        <field name="name">GST + QST for purchases</field>
+        <field name="description">GSTQST_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="gsttvq_purc_gst_en" model="account.tax.template">
+    <record id="gstqst_purc_gst_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
         <field name="name">GST for purchases - 5% (QC)</field>
         <field name="description">GST</field>
@@ -388,13 +377,13 @@
         <field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
-        <field name="parent_id" ref="gsttvq_purc_en"/>
+        <field name="parent_id" ref="gstqst_purc_en"/>
     </record>
 
-    <record id="tvq_purc_en" model="account.tax.template">
+    <record id="qst_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVQ for purchases - 9.975%</field>
-        <field name="description">TVQ</field>
+        <field name="name">QST for purchases - 9.975%</field>
+        <field name="description">QST</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.099750</field>
         <field name="type">percent</field>
@@ -405,7 +394,7 @@
         <field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
         <field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
         <field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
-        <field name="parent_id" ref="gsttvq_purc_en"/>
+        <field name="parent_id" ref="gstqst_purc_en"/>
     </record>
 
     <!-- Saskatchewan PST -->
@@ -417,6 +406,7 @@
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
     <record id="gstpst_purc_sk_gst_en" model="account.tax.template">
@@ -456,64 +446,49 @@
 
     <!-- HST -->
 
-    <record id="hst12_purc_en" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 12%</field>
-        <field name="description">TVH12_PURC</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount">0.120000</field>
-        <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
-        <field name="account_paid_id" ref="chart1183_en"/>
-        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
-    </record>
-
     <record id="hst13_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 13%</field>
-        <field name="description">TVH13_PURC</field>
+        <field name="name">HST for purchases - 13%</field>
+        <field name="description">HST13_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
-        <field name="account_paid_id" ref="chart1183_en"/>
-        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="account_collected_id" ref="chart11831_en"/>
+        <field name="account_paid_id" ref="chart11831_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst13_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst13_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst13_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst13_en"/>
     </record>
 
-    <record id="hst135_purc_en" model="account.tax.template">
+    <record id="hst14_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 13.5%</field>
-        <field name="description">TVH135_PURC</field>
+        <field name="name">HST for purchases - 14%</field>
+        <field name="description">HST14_PURC</field>
         <field name="type_tax_use">purchase</field>
-        <field name="amount">0.135000</field>
+        <field name="amount">0.140000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
-        <field name="account_paid_id" ref="chart1183_en"/>
-        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="account_collected_id" ref="chart11832_en"/>
+        <field name="account_paid_id" ref="chart11832_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst14_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst14_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst14_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst14_en"/>
     </record>
 
     <record id="hst15_purc_en" model="account.tax.template">
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-        <field name="name">TVH for purchases - 15%</field>
-        <field name="description">TVH15_PURC</field>
+        <field name="name">HST for purchases - 15%</field>
+        <field name="description">HST15_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_en"/>
-        <field name="account_paid_id" ref="chart1183_en"/>
-        <field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
+        <field name="account_collected_id" ref="chart11833_en"/>
+        <field name="account_paid_id" ref="chart11833_en"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst15_en"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst15_en"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst15_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst15_en"/>
     </record>
 
     <!-- GST -->
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index c34f329be3a..6c37befa139 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -4,18 +4,66 @@
 
     <!-- SALES TAXES -->
 
+    <!-- British Columbia PST -->
+
+    <record id="gstpst_bc_sale_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVP sur les ventes (BC)</field>
+        <field name="description">TPSTVP_BC_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>
+
+    <record id="gstpst_sale_bc_gst_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les ventes - 5% (BC)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">sale</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart2131_fr"/>
+        <field name="account_paid_id" ref="chart2131_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="parent_id" ref="gstpst_bc_sale_fr"/>
+    </record>
+
+    <record id="pst_bc_sale_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les ventes - 7% (BC)</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">sale</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"/>
+        <field name="account_paid_id" ref="chart2132_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="parent_id" ref="gstpst_bc_sale_fr"/>
+    </record>
+
     <!-- Manitoba PST -->
 
-    <record id="tpstvp_mb_sale_fr" model="account.tax.template">
+    <record id="gstpst_mb_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS + TVP sur les ventes (MB)</field>
         <field name="description">TPSTVP_MB_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="tpstvp_sale_mb_tps_fr" model="account.tax.template">
+    <record id="gstpst_sale_mb_gst_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les ventes - 5% (MB)</field>
         <field name="description">TPS</field>
@@ -26,89 +74,43 @@
         <field name="include_base_amount" eval="True"/>
         <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_sale_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="parent_id" ref="gstpst_mb_sale_fr"/>
     </record>
 
-    <record id="tvp_mb_sale_fr" model="account.tax.template">
+    <record id="pst_mb_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP sur les ventes - 7%</field>
+        <field name="name">TVP sur les ventes - 8% (MB)</field>
         <field name="description">TVP</field>
         <field name="type_tax_use">sale</field>
-        <field name="amount">0.070000</field>
+        <field name="amount">0.080000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_sale_fr"/>
-    </record>
-
-    <!-- Prince Edward Island PST -->
-
-    <record id="tpstvp_pe_sale_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP sur les ventes (PE)</field>
-        <field name="description">TPSTVP_PE_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>
-
-    <record id="tpstvp_sale_pe_tps_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS sur les ventes - 5% (PE)</field>
-        <field name="description">TPS</field>
-        <field name="type_tax_use">sale</field>
-        <field name="amount">0.050000</field>
-        <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart2131_fr"/>
-        <field name="account_paid_id" ref="chart2131_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
-    </record>
-
-    <record id="tvp_pe_sale_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP for sale - 10%</field>
-        <field name="description">TVP</field>
-        <field name="type_tax_use">sale</field>
-        <field name="amount">0.100000</field>
-        <field name="type">percent</field>
-        <field name="sequence">2</field>
-        <field name="account_collected_id" ref="chart2132_fr"/>
-        <field name="account_paid_id" ref="chart2132_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_sale_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="parent_id" ref="gstpst_mb_sale_fr"/>
     </record>
 
     <!-- Quebec PST -->
 
-    <record id="tpstvq_sale_fr" model="account.tax.template">
+    <record id="gstqst_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS + TVQ sur les ventes</field>
         <field name="description">TPSTVQ_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="tpstvq_sale_tps_fr" model="account.tax.template">
+    <record id="gstqst_sale_gst_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les ventes - 5% (QC)</field>
         <field name="description">TPS</field>
@@ -118,11 +120,11 @@
         <field name="sequence">1</field>
         <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvq_sale_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="parent_id" ref="gstqst_sale_fr"/>
     </record>
 
     <record id="tvq_sale_fr" model="account.tax.template">
@@ -135,25 +137,26 @@
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvq_sale_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="parent_id" ref="gstqst_sale_fr"/>
     </record>
 
     <!-- Saskatchewan PST -->
 
-    <record id="tpstvp_sk_sale_fr" model="account.tax.template">
+    <record id="gstpst_sk_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS + TVP sur les ventes (SK)</field>
         <field name="description">TPSTVP_SK_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="tpstvp_sale_sk_tps_fr" model="account.tax.template">
+    <record id="gstpst_sale_sk_gst_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les ventes - 5% (SK)</field>
         <field name="description">TPS</field>
@@ -164,14 +167,14 @@
         <field name="include_base_amount" eval="True"/>
         <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_sale_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="parent_id" ref="gstpst_sk_sale_fr"/>
     </record>
 
-    <record id="tvp_sk_sale_fr" model="account.tax.template">
+    <record id="pst_sk_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TVP sur les ventes - 5% (SK)</field>
         <field name="description">TVP</field>
@@ -181,78 +184,63 @@
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart2132_fr"/>
         <field name="account_paid_id" ref="chart2132_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_sale_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
+        <field name="parent_id" ref="gstpst_sk_sale_fr"/>
     </record>
 
     <!-- HST -->
 
-    <record id="tvh12_sale_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH sur les ventes - 12%</field>
-        <field name="description">TVH12_SALE</field>
-        <field name="type_tax_use">sale</field>
-        <field name="amount">0.120000</field>
-        <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_fr"/>
-        <field name="account_paid_id" ref="chart2133_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
-    </record>
-
-    <record id="tvh13_sale_fr" model="account.tax.template">
+    <record id="hst13_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TVH sur les ventes - 13%</field>
         <field name="description">TVH13_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_fr"/>
-        <field name="account_paid_id" ref="chart2133_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="account_collected_id" ref="chart21331_fr"/>
+        <field name="account_paid_id" ref="chart21331_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_hst13_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst13_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst13_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_hst13_fr"/>
     </record>
 
-    <record id="tvh135_sale_fr" model="account.tax.template">
+    <record id="hst14_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH sur les ventes - 13.5%</field>
-        <field name="description">TVH135_SALE</field>
+        <field name="name">TVH sur les ventes - 14%</field>
+        <field name="description">TVH14_SALE</field>
         <field name="type_tax_use">sale</field>
-        <field name="amount">0.135000</field>
+        <field name="amount">0.140000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_fr"/>
-        <field name="account_paid_id" ref="chart2133_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="account_collected_id" ref="chart21332_fr"/>
+        <field name="account_paid_id" ref="chart21332_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_hst14_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst14_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst14_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_hst14_fr"/>
     </record>
 
-    <record id="tvh15_sale_fr" model="account.tax.template">
+    <record id="hst15_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TVH sur les ventes - 15%</field>
         <field name="description">TVH15_SALE</field>
         <field name="type_tax_use">sale</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart2133_fr"/>
-        <field name="account_paid_id" ref="chart2133_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
+        <field name="account_collected_id" ref="chart21333_fr"/>
+        <field name="account_paid_id" ref="chart21333_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_hst15_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_hst15_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_hst15_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_hst15_fr"/>
     </record>
 
     <!-- GST -->
 
-    <record id="tps_sale_fr" model="account.tax.template">
+    <record id="gst_sale_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les ventes - 5%</field>
         <field name="description">TPS_SALE</field>
@@ -261,27 +249,75 @@
         <field name="type">percent</field>
         <field name="account_collected_id" ref="chart2131_fr"/>
         <field name="account_paid_id" ref="chart2131_fr"/>
-        <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_payable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
     </record>
 
 
     <!-- PURCHASE TAXES -->
 
+    <!-- British Columbia PST -->
+
+    <record id="gstpst_bc_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS + TVP sur les achats (BC)</field>
+        <field name="description">TPSTVP_BC_PURC</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">1</field>
+        <field name="type">percent</field>
+        <field name="child_depend">1</field>
+    </record>
+
+    <record id="gstpst_purc_bc_gst_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS sur les achats - 5% (BC)</field>
+        <field name="description">TPS</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart1181_fr"/>
+        <field name="account_paid_id" ref="chart1181_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="parent_id" ref="gstpst_bc_purc_fr"/>
+    </record>
+
+    <record id="pst_bc_purc_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVP sur les achats - 7% (BC)</field>
+        <field name="description">TVP</field>
+        <field name="type_tax_use">purchase</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"/>
+        <field name="account_paid_id" ref="chart1182_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="parent_id" ref="gstpst_bc_purc_fr"/>
+    </record>
+
     <!-- Manitoba PST -->
 
-    <record id="tpstvp_mb_purc_fr" model="account.tax.template">
+    <record id="gstpst_mb_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS + TVP sur les achats (MB)</field>
         <field name="description">TPSTVP_MB_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="tpstvp_purc_mb_tps_fr" model="account.tax.template">
+    <record id="gstpst_purc_mb_gst_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les achats - 5% (MB)</field>
         <field name="description">TPS</field>
@@ -292,89 +328,43 @@
         <field name="include_base_amount" eval="True"/>
         <field name="account_collected_id" ref="chart1181_fr"/>
         <field name="account_paid_id" ref="chart1181_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_purc_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="parent_id" ref="gstpst_mb_purc_fr"/>
     </record>
 
-    <record id="tvp_mb_purc_fr" model="account.tax.template">
+    <record id="pst_mb_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP sur les achats - 7%</field>
+        <field name="name">TVP sur les achats - 8% (MB)</field>
         <field name="description">TVP</field>
         <field name="type_tax_use">purchase</field>
-        <field name="amount">0.070000</field>
+        <field name="amount">0.080000</field>
         <field name="type">percent</field>
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart1182_fr"/>
         <field name="account_paid_id" ref="chart1182_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_mb_purc_fr"/>
-    </record>
-
-    <!-- Prince Edward Island PST -->
-
-    <record id="tpstvp_pe_purc_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS + TVP sur les achats (PE)</field>
-        <field name="description">TPSTVP_PE_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>
-
-    <record id="tpstvp_purc_pe_tps_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TPS sur les achats - 5% (PE)</field>
-        <field name="description">TPS</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount">0.050000</field>
-        <field name="type">percent</field>
-        <field name="sequence">1</field>
-        <field name="include_base_amount" eval="True"/>
-        <field name="account_collected_id" ref="chart1181_fr"/>
-        <field name="account_paid_id" ref="chart1181_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
-    </record>
-
-    <record id="tvp_pe_purc_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVP sur les achats - 10%</field>
-        <field name="description">TVP</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount">0.100000</field>
-        <field name="type">percent</field>
-        <field name="sequence">2</field>
-        <field name="account_collected_id" ref="chart1182_fr"/>
-        <field name="account_paid_id" ref="chart1182_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_pe_purc_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="parent_id" ref="gstpst_mb_purc_fr"/>
     </record>
 
     <!-- Quebec PST -->
 
-    <record id="tpstvq_purc_fr" model="account.tax.template">
+    <record id="gstqst_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS + TVQ sur les achats</field>
         <field name="description">TPSTVQ_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="tpstvq_purc_tps_fr" model="account.tax.template">
+    <record id="gstqst_purc_gst_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les achats - 5% (QC)</field>
         <field name="description">TPS</field>
@@ -384,11 +374,11 @@
         <field name="sequence">1</field>
         <field name="account_collected_id" ref="chart1181_fr"/>
         <field name="account_paid_id" ref="chart1181_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="parent_id" ref="tpstvq_purc_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="parent_id" ref="gstqst_purc_fr"/>
     </record>
 
     <record id="tvq_purc_fr" model="account.tax.template">
@@ -401,25 +391,26 @@
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart1182_fr"/>
         <field name="account_paid_id" ref="chart1182_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvq_purc_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="parent_id" ref="gstqst_purc_fr"/>
     </record>
 
     <!-- Saskatchewan PST -->
 
-    <record id="tpstvp_sk_purc_fr" model="account.tax.template">
+    <record id="gstpst_sk_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS + TVP sur les achats (SK)</field>
         <field name="description">TPSTVP_SK_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">1</field>
         <field name="type">percent</field>
+        <field name="child_depend" eval="True"/>
     </record>
 
-    <record id="tpstvp_purc_sk_tps_fr" model="account.tax.template">
+    <record id="gstpst_purc_sk_gst_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les achats - 5% (SK)</field>
         <field name="description">TPS</field>
@@ -430,14 +421,14 @@
         <field name="include_base_amount" eval="True"/>
         <field name="account_collected_id" ref="chart1181_fr"/>
         <field name="account_paid_id" ref="chart1181_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_purc_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="parent_id" ref="gstpst_sk_purc_fr"/>
     </record>
 
-    <record id="tvp_sk_purc_fr" model="account.tax.template">
+    <record id="pst_sk_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TVP sur les achats - 5% (SK)</field>
         <field name="description">TVP</field>
@@ -447,78 +438,63 @@
         <field name="sequence">2</field>
         <field name="account_collected_id" ref="chart1182_fr"/>
         <field name="account_paid_id" ref="chart1182_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
-        <field name="parent_id" ref="tpstvp_sk_purc_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
+        <field name="parent_id" ref="gstpst_sk_purc_fr"/>
     </record>
 
     <!-- HST -->
 
-    <record id="tvh12_purc_fr" model="account.tax.template">
-        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH sur les achats - 12%</field>
-        <field name="description">TVH12_PURC</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="amount">0.120000</field>
-        <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
-        <field name="account_paid_id" ref="chart1183_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-    </record>
-
-    <record id="tvh13_purc_fr" model="account.tax.template">
+    <record id="hst13_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TVH sur les achats - 13%</field>
         <field name="description">TVH13_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.130000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
-        <field name="account_paid_id" ref="chart1183_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="account_collected_id" ref="chart11831_fr"/>
+        <field name="account_paid_id" ref="chart11831_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst13_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst13_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst13_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst13_fr"/>
     </record>
 
-    <record id="tvh135_purc_fr" model="account.tax.template">
+    <record id="hst14_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-        <field name="name">TVH sur les achats - 13.5%</field>
-        <field name="description">TVH135_PURC</field>
+        <field name="name">TVH sur les achats - 14%</field>
+        <field name="description">TVH14_PURC</field>
         <field name="type_tax_use">purchase</field>
-        <field name="amount">0.135000</field>
+        <field name="amount">0.140000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
-        <field name="account_paid_id" ref="chart1183_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="account_collected_id" ref="chart11832_fr"/>
+        <field name="account_paid_id" ref="chart11832_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst14_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst14_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst14_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst14_fr"/>
     </record>
 
-    <record id="tvh15_purc_fr" model="account.tax.template">
+    <record id="hst15_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TVH sur les achats - 15%</field>
         <field name="description">TVH15_PURC</field>
         <field name="type_tax_use">purchase</field>
         <field name="amount">0.150000</field>
         <field name="type">percent</field>
-        <field name="account_collected_id" ref="chart1183_fr"/>
-        <field name="account_paid_id" ref="chart1183_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="account_collected_id" ref="chart11833_fr"/>
+        <field name="account_paid_id" ref="chart11833_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_hst15_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_hst15_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_hst15_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_hst15_fr"/>
     </record>
 
     <!-- GST -->
 
-    <record id="tps_purc_fr" model="account.tax.template">
+    <record id="gst_purc_fr" model="account.tax.template">
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
         <field name="name">TPS sur les achats - 5%</field>
         <field name="description">TPS_PURC</field>
@@ -527,10 +503,10 @@
         <field name="type">percent</field>
         <field name="account_collected_id" ref="chart1181_fr"/>
         <field name="account_paid_id" ref="chart1181_fr"/>
-        <field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
-        <field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_gst_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
     </record>
 
     </data>
diff --git a/addons/l10n_ca/doc/Taxes.csv b/addons/l10n_ca/doc/Taxes.csv
new file mode 100644
index 00000000000..368b06d1c1a
--- /dev/null
+++ b/addons/l10n_ca/doc/Taxes.csv
@@ -0,0 +1,23 @@
+;Product/Service is delivered in;;;;;;;;;;;;;
+Supplier is in ;Alberta;British Columbia;Manitoba;New Brunswick;"Newfoundland 
+And Labrador";Nova Scotia;"Northwest
+Territories";Nunavut;Ontario;"Prince Edward 
+Islands";Quebec;Saskatchewan;Yukon;International
+Alberta;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+British Columbia;GST – 5%;"GST – 5%
+PST – 7%";GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Manitoba;GST – 5%;GST – 5%;"GST – 5%
+PST – 8%";HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+New Brunswick;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Newfoundland and Labrador;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Nova Scotia;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Northwest Territories;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Nunavut;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Ontario;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Prince Edward Islands;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+Quebec;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;"GST – 5%
+QST – 9,975%";GST – 5%;GST – 5%;
+Saskatchewan;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;"GST – 5%
+PST – 5%";GST – 5%;
+Yukon;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
+International;;;;;;;;;;;;;;
diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml
index a3bab5b89dd..5bdd72b0c1d 100644
--- a/addons/l10n_ca/fiscal_templates_en.xml
+++ b/addons/l10n_ca/fiscal_templates_en.xml
@@ -4,653 +4,1543 @@
 
     <!-- Fiscal Position Templates -->
 
-    <record id="fiscal_position_template_1_en" model="account.fiscal.position.template">
-		<field name="name">Provincial Regime (PROV)</field>
+    <record id="fiscal_position_template_ab_en" model="account.fiscal.position.template">
+	<field name="name">Alberta (AB)</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%) (BC)</field>
+    <record id="fiscal_position_template_bc_en" model="account.fiscal.position.template">
+	<field name="name">British Columbia (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%) (ON, NB, NL)</field>
+    <record id="fiscal_position_template_mb_en" model="account.fiscal.position.template">
+	<field name="name">Manitoba (MB)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
-    <record id="fiscal_position_template_23_en" model="account.fiscal.position.template">
-        <field name="name">Harmonized Provinces Regime (13.5%)</field>
+    <record id="fiscal_position_template_nb_en" model="account.fiscal.position.template">
+        <field name="name">New Brunswick (NB)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
-    <record id="fiscal_position_template_24_en" model="account.fiscal.position.template">
-		<field name="name">Harmonized Provinces Regime (15%) (NS)</field>
+    <record id="fiscal_position_template_nl_en" model="account.fiscal.position.template">
+        <field name="name">Newfoundland and Labrador (NL)</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 (AB, MB, SK, PE, NT, NU, YT)</field>
+    <record id="fiscal_position_template_ns_en" model="account.fiscal.position.template">
+        <field name="name">Nova Scotia (NS)</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 (INTL)</field>
+    <record id="fiscal_position_template_nt_en" model="account.fiscal.position.template">
+        <field name="name">Northwest Territories (NT)</field>
         <field name="chart_template_id" ref="ca_en_chart_template_en"/>
     </record>
 
-        <!-- PURCHASES TAXES -->
+    <record id="fiscal_position_template_nu_en" model="account.fiscal.position.template">
+        <field name="name">Nunavut (NU)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
+
+    <record id="fiscal_position_template_on_en" model="account.fiscal.position.template">
+        <field name="name">Ontario (ON)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
+
+    <record id="fiscal_position_template_pe_en" model="account.fiscal.position.template">
+        <field name="name">Prince Edward Islands (PE)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
+
+    <record id="fiscal_position_template_qc_en" model="account.fiscal.position.template">
+        <field name="name">Quebec (QC)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
+
+    <record id="fiscal_position_template_sk_en" model="account.fiscal.position.template">
+        <field name="name">Saskatchewan (SK)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
+
+    <record id="fiscal_position_template_yt_en" model="account.fiscal.position.template">
+        <field name="name">Yukon (YT)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
+
+    <record id="fiscal_position_template_intl_en" model="account.fiscal.position.template">
+	<field name="name">International (INTL)</field>
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+    </record>
+
+    <!--  Company is in Alberta (default is gst) -->
+
+    <record id="fiscal_position_tax_template_ab2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+    </record>
+
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2ab_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_purc_en"/>
+    </record>
+
+    <!-- Company is in British Columbia (default is gstpst_bc) -->
+
+    <!-- Sale taxes -->
+
+    <record id="fiscal_position_tax_template_bc2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_en"/>
+    </record>
+
+    <!-- Purchase taxes -->
+
+    <record id="fiscal_position_tax_template_ab2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nl2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ns2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nt2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nu2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_on2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_pe2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_qc2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_yt2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_intl2bc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_en"/>
+    </record>
+
+    <!-- Company is in Manitoba (default is gstpst_mb) -->
+
+    <!-- Sale Taxes -->
+
+    <record id="fiscal_position_tax_template_mb2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_en"/>
+    </record>
+
+    <!-- Purchase Taxes -->
+
+    <record id="fiscal_position_tax_template_ab2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nl2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ns2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nt2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nu2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_on2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_pe2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_qc2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_yt2mb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_yt2intl_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_en"/>
+    </record>
+
+    <!--  Company is in New Brunswick (default is hst13) -->
+
+    <record id="fiscal_position_tax_template_nb2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+    <record id="fiscal_position_tax_template_nb2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_ab_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gst_purc_en" />
-        <field name="tax_dest_id" ref="hst12_purc_en" />
+    <record id="fiscal_position_tax_template_nb2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_ab_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gst_purc_en" />
-        <field name="tax_dest_id" ref="hst13_purc_en" />
+    <record id="fiscal_position_tax_template_nb2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_ab_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gst_purc_en" />
-        <field name="tax_dest_id" ref="hst135_purc_en" />
+    <record id="fiscal_position_tax_template_nb2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_ab_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gst_purc_en" />
-        <field name="tax_dest_id" ref="hst15_purc_en" />
+    <record id="fiscal_position_tax_template_nb2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_ab_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gst_purc_en" />
+    <record id="fiscal_position_tax_template_nb2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <record id="fiscal_position_tax_template_nb2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_22_12_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="hst12_purc_en" />
-        <field name="tax_dest_id" ref="hst13_purc_en" />
+    <record id="fiscal_position_tax_template_nb2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_12_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="hst12_purc_en" />
-        <field name="tax_dest_id" ref="hst135_purc_en" />
+    <record id="fiscal_position_tax_template_nb2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_12_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="hst12_purc_en" />
-        <field name="tax_dest_id" ref="hst15_purc_en" />
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2nb_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst13_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_12_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="hst12_purc_en" />
-        <field name="tax_dest_id" ref="gst_purc_en" />
+    <!--  Company is in Newfoundland and Labrador (default is hst13) -->
+    
+    <!-- Already created by nb2ab_sale
+    <record id="fiscal_position_tax_template_nl2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_12_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="hst12_purc_en" />
+    Already created by nb2bc_sale
+    <record id="fiscal_position_tax_template_nl2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+    Already created by nb2mb_sale
+    <record id="fiscal_position_tax_template_nl2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_mb_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
-        <field name="tax_dest_id" ref="hst12_purc_en" />
+    Already creted by nb2ns_sale
+    <record id="fiscal_position_tax_template_nl2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_mb_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
-        <field name="tax_dest_id" ref="hst13_purc_en" />
+    Already creted by nb2nt_sale
+    <record id="fiscal_position_tax_template_nl2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_mb_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
-        <field name="tax_dest_id" ref="hst135_purc_en" />
+    Already created nb2nu_sale
+    <record id="fiscal_position_tax_template_nl2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_mb_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
-        <field name="tax_dest_id" ref="hst15_purc_en" />
+    Already created by nb2pe_sale
+    <record id="fiscal_position_tax_template_nl2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_mb_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
-        <field name="tax_dest_id" ref="gst_purc_en" />
+    Already created by nb2qc_sale
+    <record id="fiscal_position_tax_template_nl2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_mb_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_purc_en" />
+    Already created by nb2sk_sale
+    <record id="fiscal_position_tax_template_nl2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    Already created by nb2yt_sale
+    <record id="fiscal_position_tax_template_nl2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_13_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="hst13_purc_en" />
-        <field name="tax_dest_id" ref="hst12_purc_en" />
+    Already created by nb2intl_sale
+    <record id="fiscal_position_tax_template_nl2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
     </record>
+    -->
+
+    <!-- Purchases -->
 
-    <record id="fiscal_position_tax_template_23_13_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="hst13_purc_en" />
-        <field name="tax_dest_id" ref="hst135_purc_en" />
+    <!-- Already created by intl2nb_purc
+    <record id="fiscal_position_tax_template_intl2nl_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst13_purc_en"/>
     </record>
+    -->
+
+    <!--  Company is in Nova Scotia (default is hst15) -->
 
-    <record id="fiscal_position_tax_template_24_13_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="hst13_purc_en" />
-        <field name="tax_dest_id" ref="hst15_purc_en" />
+    <record id="fiscal_position_tax_template_ns2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_13_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="hst13_purc_en" />
-        <field name="tax_dest_id" ref="gst_purc_en" />
+    <record id="fiscal_position_tax_template_ns2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_13_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="hst13_purc_en" />
+    <record id="fiscal_position_tax_template_ns2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <record id="fiscal_position_tax_template_ns2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_15_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="hst15_purc_en" />
-        <field name="tax_dest_id" ref="hst12_purc_en" />
+    <record id="fiscal_position_tax_template_ns2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_15_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="hst15_purc_en" />
-        <field name="tax_dest_id" ref="hst13_purc_en" />
+    <record id="fiscal_position_tax_template_ns2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_15_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="hst15_purc_en" />
-        <field name="tax_dest_id" ref="hst135_purc_en" />
+    <record id="fiscal_position_tax_template_ns2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_15_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="hst15_purc_en" />
-        <field name="tax_dest_id" ref="gst_purc_en" />
+    <record id="fiscal_position_tax_template_ns2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_15_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="hst15_purc_en" />
+    <record id="fiscal_position_tax_template_ns2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
     </record>
 
-    <!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+    <record id="fiscal_position_tax_template_ns2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_pe_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
-        <field name="tax_dest_id" ref="hst12_purc_en" />
+    <record id="fiscal_position_tax_template_ns2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_pe_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
-        <field name="tax_dest_id" ref="hst13_purc_en" />
+    <record id="fiscal_position_tax_template_ns2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_pe_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
-        <field name="tax_dest_id" ref="hst135_purc_en" />
+    <record id="fiscal_position_tax_template_ns2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst15_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_pe_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
-        <field name="tax_dest_id" ref="hst15_purc_en" />
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2ns_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst15_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_pe_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
-        <field name="tax_dest_id" ref="gst_purc_en" />
+    <!--  Company is in Northwest Territories (default is gst) -->
+
+    <!-- Already created by ab2nb_sale
+    <record id="fiscal_position_tax_template_nt2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_purc_en" />
+    Already created by ab2nl_sale
+    <record id="fiscal_position_tax_template_nt2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+    Already created by ab2ns_sale
+    <record id="fiscal_position_tax_template_nt2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_qc_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gsttvq_purc_en" />
-        <field name="tax_dest_id" ref="hst12_purc_en" />
+    Already created by ab2on_sale
+    <record id="fiscal_position_tax_template_nt2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_qc_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gsttvq_purc_en" />
-        <field name="tax_dest_id" ref="hst13_purc_en" />
+    Already created by ab2pe_sale
+    <record id="fiscal_position_tax_template_nt2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_qc_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gsttvq_purc_en" />
-        <field name="tax_dest_id" ref="hst15_purc_en" />
+    Already created by ab2intl_sale
+    <record id="fiscal_position_tax_template_nt2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
     </record>
+    -->
 
-    <record id="fiscal_position_tax_template_3_qc_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gsttvq_purc_en" />
-        <field name="tax_dest_id" ref="gst_purc_en" />
+    <!-- Purchases -->
+
+    <!-- Already created by intl2ab_purc
+    <record id="fiscal_position_tax_template_intl2nt_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_purc_en"/>
     </record>
+    -->
+
+    <!--  Company is in Nunavut (default is gst) -->
 
-    <record id="fiscal_position_tax_template_4_qc_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gsttvq_purc_en" />
+    <!-- Already created by ab2nb_sale
+    <record id="fiscal_position_tax_template_nu2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+    Already created by ab2nl_sale
+    <record id="fiscal_position_tax_template_nu2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_sk_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
-        <field name="tax_dest_id" ref="hst12_purc_en" />
+    Already created by ab2ns_sale
+    <record id="fiscal_position_tax_template_nu2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_sk_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
-        <field name="tax_dest_id" ref="hst13_purc_en" />
+    Already created by ab2on_sale
+    <record id="fiscal_position_tax_template_nu2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_sk_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
-        <field name="tax_dest_id" ref="hst135_purc_en" />
+    Already created by ab2pe_sale
+    <record id="fiscal_position_tax_template_nu2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_sk_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
-        <field name="tax_dest_id" ref="hst15_purc_en" />
+    Already created by ab2intl_sale
+    <record id="fiscal_position_tax_template_nu2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
     </record>
+    -->
+
+    <!-- Purchases -->
 
-    <record id="fiscal_position_tax_template_3_sk_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
-        <field name="tax_dest_id" ref="gst_purc_en" />
+    <!-- Already created by intl2ab_purc
+    <record id="fiscal_position_tax_template_intl2nu_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_purc_en"/>
     </record>
+    -->
 
-    <record id="fiscal_position_tax_template_4_sk_purc_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_purc_en" />
+    <!--  Company is in Ontario (default is hst13) -->
+
+    <!-- Already created nb2ab_sale
+    <record id="fiscal_position_tax_template_on2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
+    Already created by nb2bc_sale
+    <record id="fiscal_position_tax_template_on2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-        <!-- SALES TAXES -->
+    Already created by nb2mb_sale
+    <record id="fiscal_position_tax_template_on2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
+    Already created by nb2ns_sale
+    <record id="fiscal_position_tax_template_on2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
+    </record>
 
-    <!--  Alberta Fiscal Position Tax Templates (default is gst) -->
+    Already created by nb2nt_sale
+    <record id="fiscal_position_tax_template_on2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    Already created nb2nu_sale
+    <record id="fiscal_position_tax_template_on2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_ab_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gst_sale_en" />
-        <field name="tax_dest_id" ref="hst12_sale_en" />
+    Already created by nb2pe_sale
+    <record id="fiscal_position_tax_template_on2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_ab_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gst_sale_en" />
-        <field name="tax_dest_id" ref="hst13_sale_en" />
+    Already created by nb2qc_sale
+    <record id="fiscal_position_tax_template_on2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_ab_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gst_sale_en" />
-        <field name="tax_dest_id" ref="hst135_sale_en" />
+    Already created by nb2sk_sale
+    <record id="fiscal_position_tax_template_on2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_ab_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gst_sale_en" />
-        <field name="tax_dest_id" ref="hst15_sale_en" />
+    Already created by nb2yt_sale
+    <record id="fiscal_position_tax_template_on2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_ab_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gst_sale_en" />
+    Already created by nb2intl_sale
+    <record id="fiscal_position_tax_template_on2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst13_sale_en"/>
     </record>
+    -->
 
-    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!-- Purchases --> 
 
-    <record id="fiscal_position_tax_template_22_12c_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="hst12_sale_en" />
-        <field name="tax_dest_id" ref="hst13_sale_en" />
+    <!-- Already created by intl2nb_purc
+    <record id="fiscal_position_tax_template_intl2on_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst13_purc_en"/>
     </record>
+    -->
 
-    <record id="fiscal_position_tax_template_23_12_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="hst12_sale_en" />
-        <field name="tax_dest_id" ref="hst135_sale_en" />
+    <!--  Company is in Prince Edward Islands (default is hst14) -->
+
+    <record id="fiscal_position_tax_template_pe2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_12_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="hst12_sale_en" />
-        <field name="tax_dest_id" ref="hst15_sale_en" />
+    <record id="fiscal_position_tax_template_pe2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_12_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="hst12_sale_en" />
-        <field name="tax_dest_id" ref="gst_sale_en" />
+    <record id="fiscal_position_tax_template_pe2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_12_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="hst12_sale_en" />
+    <record id="fiscal_position_tax_template_pe2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <!--  Manitoba Fiscal Position Tax Templates (default is gstpst_mb) -->
+    <record id="fiscal_position_tax_template_pe2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_mb_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
-        <field name="tax_dest_id" ref="hst12_sale_en" />
+    <record id="fiscal_position_tax_template_pe2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_mb_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
-        <field name="tax_dest_id" ref="hst13_sale_en" />
+    <record id="fiscal_position_tax_template_pe2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_mb_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
-        <field name="tax_dest_id" ref="hst135_sale_en" />
+    <record id="fiscal_position_tax_template_pe2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_mb_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
-        <field name="tax_dest_id" ref="hst15_sale_en" />
+    <record id="fiscal_position_tax_template_pe2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_mb_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
-        <field name="tax_dest_id" ref="gst_sale_en" />
+    <record id="fiscal_position_tax_template_pe2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_mb_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gstpst_mb_sale_en" />
+    <record id="fiscal_position_tax_template_pe2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <record id="fiscal_position_tax_template_pe2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_13_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="hst13_sale_en" />
-        <field name="tax_dest_id" ref="hst12_sale_en" />
+    <record id="fiscal_position_tax_template_pe2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst14_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_13_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="hst13_sale_en" />
-        <field name="tax_dest_id" ref="hst135_sale_en" />
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2pe_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="hst14_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_13_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="hst13_sale_en" />
-        <field name="tax_dest_id" ref="hst15_sale_en" />
+    <!--  Company is in Quebec (default is gstqst) -->
+
+    <!-- Sale Taxes -->
+
+    <record id="fiscal_position_tax_template_qc2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_13_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="hst13_sale_en" />
-        <field name="tax_dest_id" ref="gst_sale_en" />
+    <record id="fiscal_position_tax_template_qc2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_13_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="hst13_sale_en" />
+    <record id="fiscal_position_tax_template_qc2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <record id="fiscal_position_tax_template_qc2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_15_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="hst15_sale_en" />
-        <field name="tax_dest_id" ref="hst12_sale_en" />
+    <record id="fiscal_position_tax_template_qc2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_15_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="hst15_sale_en" />
-        <field name="tax_dest_id" ref="hst13_sale_en" />
+    <record id="fiscal_position_tax_template_qc2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_15_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="hst15_sale_en" />
-        <field name="tax_dest_id" ref="hst135_sale_en" />
+    <record id="fiscal_position_tax_template_qc2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_15_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="hst15_sale_en" />
-        <field name="tax_dest_id" ref="gst_sale_en" />
+    <record id="fiscal_position_tax_template_qc2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_15_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="hst15_sale_en" />
+    <record id="fiscal_position_tax_template_qc2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <!--  Prince Edward Island Fiscal Position Tax Templates (default is gstpst_pe)-->
+    <record id="fiscal_position_tax_template_qc2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_pe_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
-        <field name="tax_dest_id" ref="hst12_sale_en" />
+    <record id="fiscal_position_tax_template_qc2sk_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_pe_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
-        <field name="tax_dest_id" ref="hst13_sale_en" />
+    <record id="fiscal_position_tax_template_qc2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_pe_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
-        <field name="tax_dest_id" ref="hst135_sale_en" />
+    <record id="fiscal_position_tax_template_qc2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstqst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_pe_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
-        <field name="tax_dest_id" ref="hst15_sale_en" />
+    <!-- Purchase Taxes -->
+
+    <record id="fiscal_position_tax_template_ab2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_pe_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
-        <field name="tax_dest_id" ref="gst_sale_en" />
+    <record id="fiscal_position_tax_template_bc2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gstpst_pe_sale_en" />
+    <record id="fiscal_position_tax_template_mb2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <!--  Quebec Fiscal Position Tax Templates (default is gsttvq)-->
+    <record id="fiscal_position_tax_template_nb2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_qc_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gsttvq_sale_en" />
-        <field name="tax_dest_id" ref="hst12_sale_en" />
+    <record id="fiscal_position_tax_template_nl2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_qc_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gsttvq_sale_en" />
-        <field name="tax_dest_id" ref="hst13_sale_en" />
+    <record id="fiscal_position_tax_template_ns2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_qc_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gsttvq_sale_en" />
-        <field name="tax_dest_id" ref="hst15_sale_en" />
+    <record id="fiscal_position_tax_template_nt2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_qc_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gsttvq_sale_en" />
-        <field name="tax_dest_id" ref="gst_sale_en" />
+    <record id="fiscal_position_tax_template_nu2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_qc_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gsttvq_sale_en" />
+    <record id="fiscal_position_tax_template_on2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <!--  Saskatchewan Fiscal Position Tax Templates (default is gstpst_sk)-->
+    <record id="fiscal_position_tax_template_pe2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_sk_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
-        <field name="tax_dest_id" ref="hst12_sale_en" />
+    <record id="fiscal_position_tax_template_sk2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_sk_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
-        <field name="tax_dest_id" ref="hst13_sale_en" />
+    <record id="fiscal_position_tax_template_yt2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_sk_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
-        <field name="tax_dest_id" ref="hst135_sale_en" />
+    <record id="fiscal_position_tax_template_intl2qc_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstqst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_sk_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
-        <field name="tax_dest_id" ref="hst15_sale_en" />
+    <!--  Company is in Saskatchewan (default is gstpst_sk) -->
+
+    <!-- Sale Taxes -->
+
+    <record id="fiscal_position_tax_template_sk2ab_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_sk_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
-        <field name="tax_dest_id" ref="gst_sale_en" />
+    <record id="fiscal_position_tax_template_sk2bc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_sk_sale_en" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="tax_src_id" ref="gstpst_sk_sale_en" />
+    <record id="fiscal_position_tax_template_sk2mb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
     </record>
 
-    <!-- Fiscal Position Account Templates - Products -->
+    <record id="fiscal_position_tax_template_sk2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2nt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2nu_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2qc_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2yt_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+        <field name="tax_dest_id" ref="gst_sale_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_en"/>
+    </record>
+
+    <!-- Purchase Taxes -->
+
+    <record id="fiscal_position_tax_template_ab2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nl2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ns2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
+    </record>
 
-    <record id="fiscal_position_product_template_21_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="account_src_id" ref="chart411_en" />
-        <field name="account_dest_id" ref="chart412_en" />
+    <record id="fiscal_position_tax_template_nt2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_product_template_22_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="account_src_id" ref="chart411_en" />
-        <field name="account_dest_id" ref="chart412_en" />
+    <record id="fiscal_position_tax_template_nu2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_product_template_23_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="account_src_id" ref="chart411_en" />
-        <field name="account_dest_id" ref="chart412_en" />
+    <record id="fiscal_position_tax_template_on2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_product_template_24_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="account_src_id" ref="chart411_en" />
-        <field name="account_dest_id" ref="chart412_en" />
+    <record id="fiscal_position_tax_template_pe2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_product_template_3_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="account_src_id" ref="chart411_en" />
-        <field name="account_dest_id" ref="chart413_en" />
+    <record id="fiscal_position_tax_template_qc2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <record id="fiscal_position_product_template_4_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="account_src_id" ref="chart411_en" />
-        <field name="account_dest_id" ref="chart414_en" />
+    <record id="fiscal_position_tax_template_yt2sk_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+        <field name="tax_dest_id" ref="gst_purc_en"/>
     </record>
 
-    <!-- Fiscal Position Account Templates - Charges -->
+    <record id="fiscal_position_tax_template_intl2yt_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_en"/>
+    </record>
+
+    <!--  Company is in Yukon (default is gst) -->
+
+    <!-- Already created by ab2nb_sale
+    <record id="fiscal_position_tax_template_yt2nb_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
+    </record>
 
-    <record id="fiscal_position_charge_template_21_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_21_en"  />
-        <field name="account_src_id" ref="chart5111_en" />
-        <field name="account_dest_id" ref="chart5112_en" />
+    Already created by ab2nl_sale
+    <record id="fiscal_position_tax_template_yt2nl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_charge_template_22_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_22_en"  />
-        <field name="account_src_id" ref="chart5111_en" />
-        <field name="account_dest_id" ref="chart5112_en" />
+    Already created by ab2ns_sale
+    <record id="fiscal_position_tax_template_yt2ns_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst15_sale_en"/>
     </record>
 
-    <record id="fiscal_position_charge_template_23_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_23_en"  />
-        <field name="account_src_id" ref="chart5111_en" />
-        <field name="account_dest_id" ref="chart5112_en" />
+    Already created by ab2on_sale
+    <record id="fiscal_position_tax_template_yt2on_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst13_sale_en"/>
     </record>
 
-    <record id="fiscal_position_charge_template_24_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_24_en"  />
-        <field name="account_src_id" ref="chart5111_en" />
-        <field name="account_dest_id" ref="chart5112_en" />
+    Already created by ab2pe_sale
+    <record id="fiscal_position_tax_template_yt2pe_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+        <field name="tax_dest_id" ref="hst14_sale_en"/>
     </record>
 
-    <record id="fiscal_position_charge_template_3_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_3_en"  />
-        <field name="account_src_id" ref="chart5111_en" />
-        <field name="account_dest_id" ref="chart5113_en" />
+    Already created by ab2intl_sale
+    <record id="fiscal_position_tax_template_yt2intl_sale_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_sale_en"/>
+    </record>
+    -->
+
+    <!-- Purchases -->
+
+    <!-- Already created by intl2ab_purc
+    <record id="fiscal_position_tax_template_intl2yt_purc_en" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="tax_src_id" ref="gst_purc_en"/>
+    </record>
+    -->
+
+    <!-- Accounts mapping -->
+
+    <!-- Alberta fiscal position -->
+
+    <record id="fiscal_position_account_template_2ab_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_ab2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ab_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- British Columbia fiscal position -->
+
+    <record id="fiscal_position_account_template_2bc_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_bc2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_bc_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- Manitoba fiscal position -->
+
+    <record id="fiscal_position_account_template_2mb_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_mb2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_mb_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- New Brunswick fiscal position -->
+
+    <record id="fiscal_position_account_template_2nb_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart412_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nb2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nb_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5112_en"/>
+    </record>
+
+    <!-- Newfoundland and Labrador fiscal position -->
+
+    <record id="fiscal_position_account_template_2nl_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart412_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nl2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nl_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5112_en"/>
+    </record>
+
+    <!-- Nova Scotia fiscal position -->
+
+    <record id="fiscal_position_account_template_2ns_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart412_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_ns2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ns_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5112_en"/>
+    </record>
+
+    <!-- Nunavut fiscal position -->
+
+    <record id="fiscal_position_account_template_2nu_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nu2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nu_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- Northwest Territories fiscal position -->
+
+    <record id="fiscal_position_account_template_2nt_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nt2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nt_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- Ontario fiscal position -->
+
+    <record id="fiscal_position_account_template_2on_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart412_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_on2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_on_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5112_en"/>
+    </record>
+
+    <!-- Prince Edward Islands fiscal position -->
+
+    <record id="fiscal_position_account_template_2pe_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart412_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_pe2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_pe_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5112_en"/>
+    </record>
+
+    <!-- Quebec fiscal position -->
+
+    <record id="fiscal_position_account_template_2qc_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_qc2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_qc_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- Saskatchewan fiscal position -->
+
+    <record id="fiscal_position_account_template_2sk_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_sk2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_sk_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- Yukon fiscal position -->
+
+    <record id="fiscal_position_account_template_2yt_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart413_en"/>
+    </record>
+
+    <record id="fiscal_position_account_template_yt2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_yt_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5113_en"/>
+    </record>
+
+    <!-- International fiscal position -->
+
+    <record id="fiscal_position_account_template_ab2intl_sale_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="account_src_id" ref="chart411_en"/>
+        <field name="account_dest_id" ref="chart414_en"/>
     </record>
 
-    <record id="fiscal_position_charge_template_4_en" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_4_en"  />
-        <field name="account_src_id" ref="chart5111_en" />
-        <field name="account_dest_id" ref="chart5114_en" />
+    <record id="fiscal_position_account_template_intl2_purc_en" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_intl_en"/>
+        <field name="account_src_id" ref="chart5111_en"/>
+        <field name="account_dest_id" ref="chart5114_en"/>
     </record>
 
     </data>
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index b01ab0985ea..465f53a1229 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -4,653 +4,1543 @@
 
     <!-- Fiscal Position Templates -->
 
-    <record id="fiscal_position_template_1_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provincial (PROV)</field>
+    <record id="fiscal_position_template_ab_fr" model="account.fiscal.position.template">
+	<field name="name">Alberta (AB)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
-    <record id="fiscal_position_template_21_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provinces Harmonisées à 12% (BC)</field>
+    <record id="fiscal_position_template_bc_fr" model="account.fiscal.position.template">
+	<field name="name">British Columbia (BC)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
-    <record id="fiscal_position_template_22_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provinces Harmonisées à 13% (NB, ON, NL)</field>
+    <record id="fiscal_position_template_mb_fr" model="account.fiscal.position.template">
+	<field name="name">Manitoba (MB)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
-    <record id="fiscal_position_template_23_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provinces Harmonisées à 13.5% ()</field>
+    <record id="fiscal_position_template_nb_fr" model="account.fiscal.position.template">
+        <field name="name">New Brunswick (NB)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
-    <record id="fiscal_position_template_24_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provinces Harmonisées à 15% (NS)</field>
+    <record id="fiscal_position_template_nl_fr" model="account.fiscal.position.template">
+        <field name="name">Newfoundland and Labrador (NL)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
-    <record id="fiscal_position_template_3_fr" model="account.fiscal.position.template">
-        <field name="name">Régime Provinces Non-Harmonisées (AB, MB, SK, PE, NT, NU, YT)</field>
+    <record id="fiscal_position_template_ns_fr" model="account.fiscal.position.template">
+        <field name="name">Nova Scotia (NS)</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 (INTL)</field>
+    <record id="fiscal_position_template_nt_fr" model="account.fiscal.position.template">
+        <field name="name">Northwest Territories (NT)</field>
         <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
     </record>
 
-        <!-- PURCHASES TAXES -->
+    <record id="fiscal_position_template_nu_fr" model="account.fiscal.position.template">
+        <field name="name">Nunavut (NU)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
+
+    <record id="fiscal_position_template_on_fr" model="account.fiscal.position.template">
+        <field name="name">Ontario (ON)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
+
+    <record id="fiscal_position_template_pe_fr" model="account.fiscal.position.template">
+        <field name="name">Prince Edward Islands (PE)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
+
+    <record id="fiscal_position_template_qc_fr" model="account.fiscal.position.template">
+        <field name="name">Quebec (QC)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
+
+    <record id="fiscal_position_template_sk_fr" model="account.fiscal.position.template">
+        <field name="name">Saskatchewan (SK)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
+
+    <record id="fiscal_position_template_yt_fr" model="account.fiscal.position.template">
+        <field name="name">Yukon (YT)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
+
+    <record id="fiscal_position_template_intl_fr" model="account.fiscal.position.template">
+	<field name="name">International (INTL)</field>
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+    </record>
+
+    <!--  Company is in Alberta (default is gst) -->
+
+    <record id="fiscal_position_tax_template_ab2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ab2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+    </record>
+
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2ab_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_purc_fr"/>
+    </record>
+
+    <!-- Company is in British Columbia (default is gstpst_bc) -->
+
+    <!-- Sale taxes -->
+
+    <record id="fiscal_position_tax_template_bc2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_sale_fr"/>
+    </record>
+
+    <!-- Purchase taxes -->
+
+    <record id="fiscal_position_tax_template_ab2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nl2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ns2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nt2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nu2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_on2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_pe2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_qc2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_yt2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_intl2bc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstpst_bc_purc_fr"/>
+    </record>
+
+    <!-- Company is in Manitoba (default is gstpst_mb) -->
+
+    <!-- Sale Taxes -->
+
+    <record id="fiscal_position_tax_template_mb2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_sale_fr"/>
+    </record>
+
+    <!-- Purchase Taxes -->
+
+    <record id="fiscal_position_tax_template_ab2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nl2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ns2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nt2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nu2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_on2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_pe2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_qc2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_yt2mb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_yt2intl_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstpst_mb_purc_fr"/>
+    </record>
+
+    <!--  Company is in New Brunswick (default is hst13) -->
+
+    <record id="fiscal_position_tax_template_nb2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+    <record id="fiscal_position_tax_template_nb2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_ab_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tps_purc_fr" />
-        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    <record id="fiscal_position_tax_template_nb2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_ab_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tps_purc_fr" />
-        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    <record id="fiscal_position_tax_template_nb2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_ab_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tps_purc_fr" />
-        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    <record id="fiscal_position_tax_template_nb2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_ab_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tps_purc_fr" />
-        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    <record id="fiscal_position_tax_template_nb2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_ab_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tps_purc_fr" />
+    <record id="fiscal_position_tax_template_nb2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <record id="fiscal_position_tax_template_nb2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_22_12_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tvh12_purc_fr" />
-        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    <record id="fiscal_position_tax_template_nb2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_12_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tvh12_purc_fr" />
-        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    <record id="fiscal_position_tax_template_nb2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_12_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tvh12_purc_fr" />
-        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2nb_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst13_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_12_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tvh12_purc_fr" />
-        <field name="tax_dest_id" ref="tps_purc_fr" />
+    <!--  Company is in Newfoundland and Labrador (default is hst13) -->
+    
+    <!-- Already created by nb2ab_sale
+    <record id="fiscal_position_tax_template_nl2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_12_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tvh12_purc_fr" />
+    Already created by nb2bc_sale
+    <record id="fiscal_position_tax_template_nl2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+    Already created by nb2mb_sale
+    <record id="fiscal_position_tax_template_nl2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_mb_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    Already creted by nb2ns_sale
+    <record id="fiscal_position_tax_template_nl2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_mb_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    Already creted by nb2nt_sale
+    <record id="fiscal_position_tax_template_nl2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_mb_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    Already created nb2nu_sale
+    <record id="fiscal_position_tax_template_nl2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_mb_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    Already created by nb2pe_sale
+    <record id="fiscal_position_tax_template_nl2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_mb_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
-        <field name="tax_dest_id" ref="tps_purc_fr" />
+    Already created by nb2qc_sale
+    <record id="fiscal_position_tax_template_nl2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_mb_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_purc_fr" />
+    Already created by nb2sk_sale
+    <record id="fiscal_position_tax_template_nl2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    Already created by nb2yt_sale
+    <record id="fiscal_position_tax_template_nl2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_13_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tvh13_purc_fr" />
-        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    Already created by nb2intl_sale
+    <record id="fiscal_position_tax_template_nl2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
     </record>
+    -->
+
+    <!-- Purchases -->
 
-    <record id="fiscal_position_tax_template_23_13_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tvh13_purc_fr" />
-        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    <!-- Already created by intl2nb_purc
+    <record id="fiscal_position_tax_template_intl2nl_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst13_purc_fr"/>
     </record>
+    -->
+
+    <!--  Company is in Nova Scotia (default is hst15) -->
 
-    <record id="fiscal_position_tax_template_24_13_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tvh13_purc_fr" />
-        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_13_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tvh13_purc_fr" />
-        <field name="tax_dest_id" ref="tps_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_13_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tvh13_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <record id="fiscal_position_tax_template_ns2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_15_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tvh15_purc_fr" />
-        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_15_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tvh15_purc_fr" />
-        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_15_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tvh15_purc_fr" />
-        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_15_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tvh15_purc_fr" />
-        <field name="tax_dest_id" ref="tps_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_15_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tvh15_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
     </record>
 
-    <!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+    <record id="fiscal_position_tax_template_ns2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_pe_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_pe_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_pe_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    <record id="fiscal_position_tax_template_ns2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst15_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_pe_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2ns_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst15_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_pe_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
-        <field name="tax_dest_id" ref="tps_purc_fr" />
+    <!--  Company is in Northwest Territories (default is gst) -->
+
+    <!-- Already created by ab2nb_sale
+    <record id="fiscal_position_tax_template_nt2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_purc_fr" />
+    Already created by ab2nl_sale
+    <record id="fiscal_position_tax_template_nt2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+    Already created by ab2ns_sale
+    <record id="fiscal_position_tax_template_nt2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_qc_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvq_purc_fr" />
-        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    Already created by ab2on_sale
+    <record id="fiscal_position_tax_template_nt2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_qc_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvq_purc_fr" />
-        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    Already created by ab2pe_sale
+    <record id="fiscal_position_tax_template_nt2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_qc_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvq_purc_fr" />
-        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    Already created by ab2intl_sale
+    <record id="fiscal_position_tax_template_nt2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
     </record>
+    -->
 
-    <record id="fiscal_position_tax_template_3_qc_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvq_purc_fr" />
-        <field name="tax_dest_id" ref="tps_purc_fr" />
+    <!-- Purchases -->
+
+    <!-- Already created by intl2ab_purc
+    <record id="fiscal_position_tax_template_intl2nt_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_purc_fr"/>
     </record>
+    -->
+
+    <!--  Company is in Nunavut (default is gst) -->
 
-    <record id="fiscal_position_tax_template_4_qc_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvq_purc_fr" />
+    <!-- Already created by ab2nb_sale
+    <record id="fiscal_position_tax_template_nu2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+    Already created by ab2nl_sale
+    <record id="fiscal_position_tax_template_nu2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_sk_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-        <field name="tax_dest_id" ref="tvh12_purc_fr" />
+    Already created by ab2ns_sale
+    <record id="fiscal_position_tax_template_nu2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_sk_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-        <field name="tax_dest_id" ref="tvh13_purc_fr" />
+    Already created by ab2on_sale
+    <record id="fiscal_position_tax_template_nu2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_sk_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-        <field name="tax_dest_id" ref="tvh135_purc_fr" />
+    Already created by ab2pe_sale
+    <record id="fiscal_position_tax_template_nu2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_sk_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-        <field name="tax_dest_id" ref="tvh15_purc_fr" />
+    Already created by ab2intl_sale
+    <record id="fiscal_position_tax_template_nu2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
     </record>
+    -->
+
+    <!-- Purchases -->
 
-    <record id="fiscal_position_tax_template_3_sk_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
-        <field name="tax_dest_id" ref="tps_purc_fr" />
+    <!-- Already created by intl2ab_purc
+    <record id="fiscal_position_tax_template_intl2nu_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_purc_fr"/>
     </record>
+    -->
 
-    <record id="fiscal_position_tax_template_4_sk_purc_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_purc_fr" />
+    <!--  Company is in Ontario (default is hst13) -->
+
+    <!-- Already created nb2ab_sale
+    <record id="fiscal_position_tax_template_on2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
+    Already created by nb2bc_sale
+    <record id="fiscal_position_tax_template_on2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-        <!-- SALES TAXES -->
+    Already created by nb2mb_sale
+    <record id="fiscal_position_tax_template_on2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
+    Already created by nb2ns_sale
+    <record id="fiscal_position_tax_template_on2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
+    </record>
 
-    <!--  Alberta Fiscal Position Tax Templates (default is tps) -->
+    Already created by nb2nt_sale
+    <record id="fiscal_position_tax_template_on2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    Already created nb2nu_sale
+    <record id="fiscal_position_tax_template_on2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_ab_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tps_sale_fr" />
-        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    Already created by nb2pe_sale
+    <record id="fiscal_position_tax_template_on2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_ab_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tps_sale_fr" />
-        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    Already created by nb2qc_sale
+    <record id="fiscal_position_tax_template_on2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_ab_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tps_sale_fr" />
-        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    Already created by nb2sk_sale
+    <record id="fiscal_position_tax_template_on2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_ab_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tps_sale_fr" />
-        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    Already created by nb2yt_sale
+    <record id="fiscal_position_tax_template_on2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_ab_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tps_sale_fr" />
+    Already created by nb2intl_sale
+    <record id="fiscal_position_tax_template_on2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst13_sale_fr"/>
     </record>
+    -->
 
-    <!--  British Columbia Fiscal Position Tax Templates (default is hst12) -->
+    <!-- Purchases --> 
 
-    <record id="fiscal_position_tax_template_22_12c_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tvh12_sale_fr" />
-        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    <!-- Already created by intl2nb_purc
+    <record id="fiscal_position_tax_template_intl2on_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst13_purc_fr"/>
     </record>
+    -->
 
-    <record id="fiscal_position_tax_template_23_12_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tvh12_sale_fr" />
-        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    <!--  Company is in Prince Edward Islands (default is hst14) -->
+
+    <record id="fiscal_position_tax_template_pe2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_12_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tvh12_sale_fr" />
-        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_12_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tvh12_sale_fr" />
-        <field name="tax_dest_id" ref="tps_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_12_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tvh12_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <!--  Manitoba Fiscal Position Tax Templates (default is tpstvp_mb) -->
+    <record id="fiscal_position_tax_template_pe2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_mb_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_mb_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_mb_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_mb_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_mb_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
-        <field name="tax_dest_id" ref="tps_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_mb_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvp_mb_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <!--  New Brunswick, Newfoundland and Labrador and Ontario Fiscal Position Tax Templates (default is hst13) -->
+    <record id="fiscal_position_tax_template_pe2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_13_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tvh13_sale_fr" />
-        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    <record id="fiscal_position_tax_template_pe2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst14_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_13_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tvh13_sale_fr" />
-        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    <!-- Purchases -->
+
+    <record id="fiscal_position_tax_template_intl2pe_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="hst14_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_13_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tvh13_sale_fr" />
-        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    <!--  Company is in Quebec (default is gstqst) -->
+
+    <!-- Sale Taxes -->
+
+    <record id="fiscal_position_tax_template_qc2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_13_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tvh13_sale_fr" />
-        <field name="tax_dest_id" ref="tps_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_13_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tvh13_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <!--  Nova Scotia Fiscal Position Tax Templates (default is hst15) -->
+    <record id="fiscal_position_tax_template_qc2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_15_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tvh15_sale_fr" />
-        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_15_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tvh15_sale_fr" />
-        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_15_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tvh15_sale_fr" />
-        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_15_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tvh15_sale_fr" />
-        <field name="tax_dest_id" ref="tps_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_15_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tvh15_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <!--  Prince Edward Island Fiscal Position Tax Templates (default is tpstvp_pe)-->
+    <record id="fiscal_position_tax_template_qc2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_pe_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2sk_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_pe_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_pe_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    <record id="fiscal_position_tax_template_qc2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstqst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_pe_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    <!-- Purchase Taxes -->
+
+    <record id="fiscal_position_tax_template_ab2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_pe_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
-        <field name="tax_dest_id" ref="tps_sale_fr" />
+    <record id="fiscal_position_tax_template_bc2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvp_pe_sale_fr" />
+    <record id="fiscal_position_tax_template_mb2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <!--  Quebec Fiscal Position Tax Templates (default is tpstvq)-->
+    <record id="fiscal_position_tax_template_nb2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_qc_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvq_sale_fr" />
-        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    <record id="fiscal_position_tax_template_nl2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_qc_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvq_sale_fr" />
-        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    <record id="fiscal_position_tax_template_ns2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_qc_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvq_sale_fr" />
-        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    <record id="fiscal_position_tax_template_nt2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_qc_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvq_sale_fr" />
-        <field name="tax_dest_id" ref="tps_sale_fr" />
+    <record id="fiscal_position_tax_template_nu2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_qc_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvq_sale_fr" />
+    <record id="fiscal_position_tax_template_on2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <!--  Saskatchewan Fiscal Position Tax Templates (default is tpstvp_sk)-->
+    <record id="fiscal_position_tax_template_pe2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
 
-    <record id="fiscal_position_tax_template_21_sk_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-        <field name="tax_dest_id" ref="tvh12_sale_fr" />
+    <record id="fiscal_position_tax_template_sk2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_22_sk_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-        <field name="tax_dest_id" ref="tvh13_sale_fr" />
+    <record id="fiscal_position_tax_template_yt2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_23_sk_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-        <field name="tax_dest_id" ref="tvh135_sale_fr" />
+    <record id="fiscal_position_tax_template_intl2qc_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstqst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_24_sk_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-        <field name="tax_dest_id" ref="tvh15_sale_fr" />
+    <!--  Company is in Saskatchewan (default is gstpst_sk) -->
+
+    <!-- Sale Taxes -->
+
+    <record id="fiscal_position_tax_template_sk2ab_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_3_sk_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
-        <field name="tax_dest_id" ref="tps_sale_fr" />
+    <record id="fiscal_position_tax_template_sk2bc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_tax_template_4_sk_sale_fr" model="account.fiscal.position.tax.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="tax_src_id" ref="tpstvp_sk_sale_fr" />
+    <record id="fiscal_position_tax_template_sk2mb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
     </record>
 
-    <!-- Fiscal Position Account Templates - Products -->
+    <record id="fiscal_position_tax_template_sk2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2nt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2nu_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2qc_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2yt_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+        <field name="tax_dest_id" ref="gst_sale_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_sk2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_sale_fr"/>
+    </record>
+
+    <!-- Purchase Taxes -->
+
+    <record id="fiscal_position_tax_template_ab2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_bc2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_mb2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nb2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_nl2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
+
+    <record id="fiscal_position_tax_template_ns2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
+    </record>
 
-    <record id="fiscal_position_product_template_21_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="account_src_id" ref="chart411_fr" />
-        <field name="account_dest_id" ref="chart412_fr" />
+    <record id="fiscal_position_tax_template_nt2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_product_template_22_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="account_src_id" ref="chart411_fr" />
-        <field name="account_dest_id" ref="chart412_fr" />
+    <record id="fiscal_position_tax_template_nu2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_product_template_23_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="account_src_id" ref="chart411_fr" />
-        <field name="account_dest_id" ref="chart412_fr" />
+    <record id="fiscal_position_tax_template_on2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_product_template_24_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="account_src_id" ref="chart411_fr" />
-        <field name="account_dest_id" ref="chart412_fr" />
+    <record id="fiscal_position_tax_template_pe2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_product_template_3_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="account_src_id" ref="chart411_fr" />
-        <field name="account_dest_id" ref="chart413_fr" />
+    <record id="fiscal_position_tax_template_qc2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <record id="fiscal_position_product_template_4_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="account_src_id" ref="chart411_fr" />
-        <field name="account_dest_id" ref="chart414_fr" />
+    <record id="fiscal_position_tax_template_yt2sk_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+        <field name="tax_dest_id" ref="gst_purc_fr"/>
     </record>
 
-    <!-- Fiscal Position Account Templates - Charges -->
+    <record id="fiscal_position_tax_template_intl2yt_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gstpst_sk_purc_fr"/>
+    </record>
+
+    <!--  Company is in Yukon (default is gst) -->
+
+    <!-- Already created by ab2nb_sale
+    <record id="fiscal_position_tax_template_yt2nb_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
+    </record>
 
-    <record id="fiscal_position_charge_template_21_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_21_fr"  />
-        <field name="account_src_id" ref="chart5111_fr" />
-        <field name="account_dest_id" ref="chart5112_fr" />
+    Already created by ab2nl_sale
+    <record id="fiscal_position_tax_template_yt2nl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_charge_template_22_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_22_fr"  />
-        <field name="account_src_id" ref="chart5111_fr" />
-        <field name="account_dest_id" ref="chart5112_fr" />
+    Already created by ab2ns_sale
+    <record id="fiscal_position_tax_template_yt2ns_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst15_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_charge_template_23_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_23_fr"  />
-        <field name="account_src_id" ref="chart5111_fr" />
-        <field name="account_dest_id" ref="chart5112_fr" />
+    Already created by ab2on_sale
+    <record id="fiscal_position_tax_template_yt2on_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst13_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_charge_template_24_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_24_fr"  />
-        <field name="account_src_id" ref="chart5111_fr" />
-        <field name="account_dest_id" ref="chart5112_fr" />
+    Already created by ab2pe_sale
+    <record id="fiscal_position_tax_template_yt2pe_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+        <field name="tax_dest_id" ref="hst14_sale_fr"/>
     </record>
 
-    <record id="fiscal_position_charge_template_3_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_3_fr"  />
-        <field name="account_src_id" ref="chart5111_fr" />
-        <field name="account_dest_id" ref="chart5113_fr" />
+    Already created by ab2intl_sale
+    <record id="fiscal_position_tax_template_yt2intl_sale_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_sale_fr"/>
+    </record>
+    -->
+
+    <!-- Purchases -->
+
+    <!-- Already created by intl2ab_purc
+    <record id="fiscal_position_tax_template_intl2yt_purc_fr" model="account.fiscal.position.tax.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="tax_src_id" ref="gst_purc_fr"/>
+    </record>
+    -->
+
+    <!-- Accounts mapping -->
+
+    <!-- Alberta fiscal position -->
+
+    <record id="fiscal_position_account_template_2ab_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_ab2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ab_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- British Columbia fiscal position -->
+
+    <record id="fiscal_position_account_template_2bc_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_bc2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_bc_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- Manitoba fiscal position -->
+
+    <record id="fiscal_position_account_template_2mb_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_mb2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_mb_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- New Brunswick fiscal position -->
+
+    <record id="fiscal_position_account_template_2nb_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart412_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nb2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nb_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5112_fr"/>
+    </record>
+
+    <!-- Newfoundland and Labrador fiscal position -->
+
+    <record id="fiscal_position_account_template_2nl_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart412_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nl2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nl_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5112_fr"/>
+    </record>
+
+    <!-- Nova Scotia fiscal position -->
+
+    <record id="fiscal_position_account_template_2ns_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart412_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_ns2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_ns_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5112_fr"/>
+    </record>
+
+    <!-- Nunavut fiscal position -->
+
+    <record id="fiscal_position_account_template_2nu_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nu2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nu_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- Northwest Territories fiscal position -->
+
+    <record id="fiscal_position_account_template_2nt_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_nt2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_nt_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- Ontario fiscal position -->
+
+    <record id="fiscal_position_account_template_2on_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart412_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_on2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_on_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5112_fr"/>
+    </record>
+
+    <!-- Prince Edward Islands fiscal position -->
+
+    <record id="fiscal_position_account_template_2pe_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart412_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_pe2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_pe_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5112_fr"/>
+    </record>
+
+    <!-- Quebec fiscal position -->
+
+    <record id="fiscal_position_account_template_2qc_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_qc2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_qc_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- Saskatchewan fiscal position -->
+
+    <record id="fiscal_position_account_template_2sk_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_sk2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_sk_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- Yukon fiscal position -->
+
+    <record id="fiscal_position_account_template_2yt_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart413_fr"/>
+    </record>
+
+    <record id="fiscal_position_account_template_yt2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_yt_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5113_fr"/>
+    </record>
+
+    <!-- International fiscal position -->
+
+    <record id="fiscal_position_account_template_ab2intl_sale_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="account_src_id" ref="chart411_fr"/>
+        <field name="account_dest_id" ref="chart414_fr"/>
     </record>
 
-    <record id="fiscal_position_charge_template_4_fr" model="account.fiscal.position.account.template">
-        <field name="position_id" ref="fiscal_position_template_4_fr"  />
-        <field name="account_src_id" ref="chart5111_fr" />
-        <field name="account_dest_id" ref="chart5114_fr" />
+    <record id="fiscal_position_account_template_intl2_purc_fr" model="account.fiscal.position.account.template">
+        <field name="position_id" ref="fiscal_position_template_intl_fr"/>
+        <field name="account_src_id" ref="chart5111_fr"/>
+        <field name="account_dest_id" ref="chart5114_fr"/>
     </record>
 
     </data>
diff --git a/addons/l10n_ca/static/src/img/icon.png b/addons/l10n_ca/static/description/icon.png
similarity index 100%
rename from addons/l10n_ca/static/src/img/icon.png
rename to addons/l10n_ca/static/description/icon.png
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 8960224891d..a7830784340 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -24,8 +24,8 @@
 
 {'name': 'Switzerland - Accounting',
  'description':  """
- Swiss localization :
- ====================
+Swiss localization
+==================
  **Multilang swiss STERCHI account chart and taxes**
   **Author:** Camptocamp SA
 
diff --git a/addons/l10n_ch/static/src/img/icon.png b/addons/l10n_ch/static/description/icon.png
similarity index 100%
rename from addons/l10n_ch/static/src/img/icon.png
rename to addons/l10n_ch/static/description/icon.png
diff --git a/addons/l10n_cl/static/src/img/icon.png b/addons/l10n_cl/static/description/icon.png
similarity index 100%
rename from addons/l10n_cl/static/src/img/icon.png
rename to addons/l10n_cl/static/description/icon.png
diff --git a/addons/l10n_cn/static/src/img/icon.png b/addons/l10n_cn/static/description/icon.png
similarity index 100%
rename from addons/l10n_cn/static/src/img/icon.png
rename to addons/l10n_cn/static/description/icon.png
diff --git a/addons/l10n_co/static/src/img/icon.png b/addons/l10n_co/static/description/icon.png
similarity index 100%
rename from addons/l10n_co/static/src/img/icon.png
rename to addons/l10n_co/static/description/icon.png
diff --git a/addons/l10n_cr/static/src/img/icon.png b/addons/l10n_cr/static/description/icon.png
similarity index 100%
rename from addons/l10n_cr/static/src/img/icon.png
rename to addons/l10n_cr/static/description/icon.png
diff --git a/addons/l10n_de/static/src/img/icon.png b/addons/l10n_de/static/description/icon.png
similarity index 100%
rename from addons/l10n_de/static/src/img/icon.png
rename to addons/l10n_de/static/description/icon.png
diff --git a/addons/l10n_ec/static/src/img/icon.png b/addons/l10n_ec/static/description/icon.png
similarity index 100%
rename from addons/l10n_ec/static/src/img/icon.png
rename to addons/l10n_ec/static/description/icon.png
diff --git a/addons/l10n_es/static/src/img/icon.png b/addons/l10n_es/static/description/icon.png
similarity index 100%
rename from addons/l10n_es/static/src/img/icon.png
rename to addons/l10n_es/static/description/icon.png
diff --git a/addons/l10n_et/static/src/img/icon.png b/addons/l10n_et/static/description/icon.png
similarity index 100%
rename from addons/l10n_et/static/src/img/icon.png
rename to addons/l10n_et/static/description/icon.png
diff --git a/addons/l10n_fr/static/src/img/icon.png b/addons/l10n_fr/static/description/icon.png
similarity index 100%
rename from addons/l10n_fr/static/src/img/icon.png
rename to addons/l10n_fr/static/description/icon.png
diff --git a/addons/l10n_gr/static/src/img/icon.png b/addons/l10n_gr/static/description/icon.png
similarity index 100%
rename from addons/l10n_gr/static/src/img/icon.png
rename to addons/l10n_gr/static/description/icon.png
diff --git a/addons/l10n_gt/static/src/img/icon.png b/addons/l10n_gt/static/description/icon.png
similarity index 100%
rename from addons/l10n_gt/static/src/img/icon.png
rename to addons/l10n_gt/static/description/icon.png
diff --git a/addons/l10n_hn/static/src/img/icon.png b/addons/l10n_hn/static/description/icon.png
similarity index 100%
rename from addons/l10n_hn/static/src/img/icon.png
rename to addons/l10n_hn/static/description/icon.png
diff --git a/addons/l10n_hr/static/src/img/icon.png b/addons/l10n_hr/static/description/icon.png
similarity index 100%
rename from addons/l10n_hr/static/src/img/icon.png
rename to addons/l10n_hr/static/description/icon.png
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index 671fdc334d9..4b8e4be55bf 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -135,11 +135,47 @@
         <record model="account.account.template" id="a189">
             <field name="name">Tax Receivable</field>
             <field name="code">189</field>
-            <field name="type">other</field>
+            <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_asset"/>
-            <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="a10"/>
         </record>
+
+        <record model="account.account.template" id="a189100">
+            <field name="name">Purchase Tax Receivable</field>
+            <field name="code">189100</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
+        <record model="account.account.template" id="a189200">
+            <field name="name">VAT Receivable</field>
+            <field name="code">189200</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
+        <record model="account.account.template" id="a189300">
+            <field name="name">Service Tax Receivable</field>
+            <field name="code">189300</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
+        <record model="account.account.template" id="a189400">
+            <field name="name">Exice Duty Receivable</field>
+            <field name="code">189400</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="reconcile" eval="True"/>
+            <field name="parent_id" ref="a189"/>
+        </record>
+
         <!-- Liabilities -->
         
         <record model="account.account.template" id="a20">
diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml
index 7aec30f0575..5cb835d950c 100644
--- a/addons/l10n_in/l10n_in_private_tax_template.xml
+++ b/addons/l10n_in/l10n_in_private_tax_template.xml
@@ -2,269 +2,403 @@
 <openerp>
     <data noupdate="1">
     <!-- Taxes Sale Tax -->
-    
+
     <record id="sales_private" model="account.tax.template">
-        <field name="name">Sale Tax-15%</field>
-        <field name="price_include" eval="0"/>
+        <field name="name">Sales Tax 15%</field>
+        <field name="description">Sales Tax 15%</field>
         <field name="amount">0.15</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="a2161"/>
-        <field name="account_paid_id" ref="a2161"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="account_paid_id" ref="a2161"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale15"/>
+        <field name="tax_code_id" ref="vat_code_rec_sale15"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_sale15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_rec_sale15"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
     <record id="sales_private_main" model="account.tax.template">
-        <field name="name">Sale Tax-12%</field>
-        <field name="price_include" eval="0"/>
+        <field name="name">Sales Tax 12%</field>
+        <field name="description">Sales Tax 12%</field>
         <field name="amount">0.12</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="a2161"/>
-        <field name="account_paid_id" ref="a2161"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="account_paid_id" ref="a2161"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale12"/>
+        <field name="tax_code_id" ref="vat_code_rec_sale12"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_sale12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_rec_sale12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
     <record id="sales_private_main_4" model="account.tax.template">
-        <field name="name">Sale Tax-4%</field>
-        <field name="price_include" eval="0"/>
+        <field name="name">Sales Tax 4%</field>
+        <field name="description">Sales Tax 4%</field>
         <field name="amount">0.04</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="a2161"/>
         <field name="account_paid_id" ref="a2161"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="base_code_id" ref="vat_code_base_tax_sale4"/>
+        <field name="tax_code_id" ref="vat_code_rec_sale4"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_sale4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_rec_sale4"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
     <!-- Purchase tax -->
-    
+
     <record id="purchase_tax_private" model="account.tax.template">
-        <field name="name">Purchase Tax-15%</field>
+        <field name="name">Purchase Tax 15%</field>
+        <field name="description">Purchase Tax 15%</field>
         <field name="account_collected_id" ref="a189"/>
-        <field name="account_paid_id" ref="a189"/> 
-        <field name="price_include" eval="0"/>
+        <field name="account_paid_id" ref="a189"/>
         <field name="amount">0.15</field>
         <field name="type">percent</field>
         <field name="type_tax_use">purchase</field>
-        <field name="base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="tax_code_id" ref="vat_code_payable"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable"/>
+        <field name="base_code_id" ref="vat_code_base_tax_pur15"/>
+        <field name="tax_code_id" ref="vat_code_pay_pur4"/>
+        <field name="ref_base_code_id" ref="vat_code_base_tax_pur15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_pay_pur4"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
     <!-- vat -->
-    
-    <record id="vat_private_main" model="account.tax.template">
-        <field name="name">VAT-5%(4% VAT+1% Add. Tax.)</field>
-        <field name="price_include" eval="0"/>
+
+    <record id="vat_private_out_vat5" model="account.tax.template">
+        <field name="name">Output VAT 5% (VAT 4% + Add. VAT 1%)</field>
+        <field name="description">Output VAT 5%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat5"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat5"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat5"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_in_vat5" model="account.tax.template">
+        <field name="name">Input VAT 5% (VAT 4% + Add. VAT 1%)</field>
+        <field name="description">Input VAT 5%</field>
         <field name="amount">0.05</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat5"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat5"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat5"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="vat_private_main_tax" model="account.tax.template">
-        <field name="name">VAT-15%(12.5% VAT+2.5% Add. Tax.)</field>
-        <field name="price_include" eval="0"/>
+
+    <record id="vat_private_in_vat15" model="account.tax.template">
+        <field name="name">Input VAT 15% (VAT 12.5% + Add. VAT 2.5%)</field>
+        <field name="description">Input VAT 15%</field>
         <field name="amount">0.15</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="vat_private_tax" model="account.tax.template">
-        <field name="name">VAT-8%</field>
-        <field name="price_include" eval="0"/>
+
+    <record id="vat_private_out_vat15" model="account.tax.template">
+        <field name="name">Output VAT 15% (VAT 12.5% + Add. VAT 2.5%)</field>
+        <field name="description">Output VAT 15%</field>
+        <field name="amount">0.15</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat15"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_in_vat8" model="account.tax.template">
+        <field name="name">Input VAT 8%</field>
+        <field name="description">Input VAT 8%</field>
         <field name="amount">0.08</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat8"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat8"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat8"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
-    <record id="vat_private_tax_10" model="account.tax.template">
-        <field name="name">VAT-10%</field>
-        <field name="price_include" eval="0"/>
+    <record id="vat_private_out_vat8" model="account.tax.template">
+        <field name="name">Output VAT 8%</field>
+        <field name="description">Output VAT 8%</field>
+        <field name="amount">0.08</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat8"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat8"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat8"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat8"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_in_vat10" model="account.tax.template">
+        <field name="name">Input VAT 10%</field>
+        <field name="description">Input VAT 10%</field>
         <field name="amount">0.10</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat10"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat10"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat10"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
 
-    <record id="vat_private_tax_12" model="account.tax.template">
-        <field name="name">VAT-12.5%</field>
-        <field name="price_include" eval="0"/>
-        <field name="amount">12.5</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="account_collected_id" ref="a2162"/>
-        <field name="account_paid_id" ref="a2162"/>       
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
-        <field name="chart_template_id" ref="indian_chart_template_private"/>
-    </record>
-
-<!-- Exice Duty -->
-
-    <record id="exice_duty_private_main" model="account.tax.template">
-        <field name="name">Excise Duty-10.30%</field>
-        <field name="include_base_amount" eval="True"/>
+    <record id="vat_private_out_vat10" model="account.tax.template">
+        <field name="name">Output VAT 10%</field>
+        <field name="description">Output VAT 10%</field>
         <field name="amount">0.10</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>         
+        <field name="base_code_id" ref="vat_code_tax_sal_vat10"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat10"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat10"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat10"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="exice_private_duty_parent" model="account.tax.template">
-        <field name="name">Excise Duty-2%</field>
-        <field name="amount">0.02</field>
+
+    <record id="vat_private_in_vat12" model="account.tax.template">
+        <field name="name">Input VAT 12.5%</field>
+        <field name="description">Input VAT 12.5%</field>
+        <field name="amount">0.125</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="a189200"/>
+        <field name="account_paid_id" ref="a189200"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="vat_private_out_vat12" model="account.tax.template">
+        <field name="name">Output VAT 12.5%</field>
+        <field name="description">Output VAT 12.5%</field>
+        <field name="amount">0.125</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
-        <field name="parent_id" ref="exice_duty_private_main"/>
-        <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
+        <field name="account_collected_id" ref="a2162"/>
+        <field name="account_paid_id" ref="a2162"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat12"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="exice_private_duty" model="account.tax.template">
-        <field name="name">Excise Duty-1%</field>
-        <field name="amount">0.01</field>
-        <field name="type">percent</field>
+
+    <!-- Exice Duty -->
+
+    <record id="exice_duty_private_sale12" model="account.tax.template">
+        <field name="name">Excise Duty 12% - Sales</field>
+        <field name="description">Excise Duty 12% - Sales</field>
         <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
         <field name="account_collected_id" ref="a2164"/>
-        <field name="account_paid_id" ref="a2164"/> 		
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="parent_id" ref="exice_duty_private_main"/>
+        <field name="account_paid_id" ref="a2164"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
+    <record id="exice_duty_private_sale2" model="account.tax.template">
+        <field name="name">Excise Duty 2% - Sales</field>
+        <field name="description">Excise Duty 2% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.020</field>
+        <field name="account_collected_id" ref="a2164"/>
+        <field name="account_paid_id" ref="a2164"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="exice_duty_private_sale1" model="account.tax.template">
+        <field name="name">Output Excise Duty 1%</field>
+        <field name="description">Output Excise Duty 1%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="account_collected_id" ref="a2164"/>
+        <field name="account_paid_id" ref="a2164"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice1"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
     <!-- Service Tax -->
-    
-    <record id="service_private_main" model="account.tax.template">
-        <field name="type_tax_use">all</field>
-        <field name="name">Service Tax-12.30%</field>
-        <field name="include_base_amount" eval="True"/>
+
+    <record id="service_private_ser12_sale" model="account.tax.template">
+        <field name="name">Output Service Tax 12%</field>
+        <field name="description">Output Service Tax 12%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
         <field name="amount">0.12</field>
-        <field name="type">percent</field>
+        <field name="sequence">1</field>
         <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/> 			
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="child_depend" eval="0"/>
+        <field name="account_paid_id" ref="a2163"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="service_private_tax_parent" model="account.tax.template">
-        <field name="name">Service Tax-%2</field>
+
+    <record id="service_private_ser2_sale" model="account.tax.template">
+        <field name="name">Output Sales Service Tax 2%</field>
+        <field name="description">Output Sales Service Tax 2%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
         <field name="amount">0.02</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
+        <field name="sequence">3</field>
         <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/> 			
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="parent_id" ref="service_private_main"/>
+        <field name="account_paid_id" ref="a2163"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="service_private_ser12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
-    <record id="service_private_tax" model="account.tax.template">
-        <field name="name">Service Tax-%1</field>
+
+    <record id="service_private_ser1_sale" model="account.tax.template">
+        <field name="name">Output Service Tax 1%</field>
+        <field name="description">Output Service Tax 1%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
         <field name="amount">0.01</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
+        <field name="sequence">5</field>
         <field name="account_collected_id" ref="a2163"/>
-        <field name="account_paid_id" ref="a2163"/> 			
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="parent_id" ref="service_private_main"/>
+        <field name="account_paid_id" ref="a2163"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="service_private_ser12_sale"/>
         <field name="chart_template_id" ref="indian_chart_template_private"/>
     </record>
-    
+
+    <record id="service_private_ser12_purchase" model="account.tax.template">
+        <field name="name">Input Service Tax 12%</field>
+        <field name="description">Input Service Tax 12%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="a189300"/>
+        <field name="account_paid_id" ref="a189300"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="service_private_ser2_purchase" model="account.tax.template">
+        <field name="name">Input Service Tax Edu. Cess. 2%</field>
+        <field name="description">Input Service Tax Edu. Cess. 2%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">3</field>
+        <field name="account_collected_id" ref="a189300"/>
+        <field name="account_paid_id" ref="a189300"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="service_private_ser12_purchase"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
+    <record id="service_private_ser1_purchase" model="account.tax.template">
+        <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
+        <field name="description">Input Service Tax Seco. &amp; HEC 1%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">5</field>
+        <field name="account_collected_id" ref="a189300"/>
+        <field name="account_paid_id" ref="a189300"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="service_private_ser12_purchase"/>
+        <field name="chart_template_id" ref="indian_chart_template_private"/>
+    </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 9612afddc39..91d285408d5 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -116,7 +116,7 @@
         <record model="account.account.template" id="p15400">
             <field name="name">Tax Receivable</field>
             <field name="code">15400</field>
-            <field name="type">other</field>
+            <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_asset"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="p10000"/>
@@ -658,7 +658,327 @@
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="p96000"/>
         </record>
-        
+
+        <record model="account.account.template" id="p154001">
+            <field name="name">Input CST 5%</field>
+            <field name="code">154001</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154002">
+            <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
+            <field name="code">154002</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154003">
+            <field name="name">Input Credit - URD</field>
+            <field name="code">154003</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154004">
+            <field name="name">TDS on Audit Fees - 94J</field>
+            <field name="code">154004</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154005">
+            <field name="name">TDS on Commission Or Brokerage - 94H</field>
+            <field name="code">154005</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154006">
+            <field name="name">Input Credit - Import Duty</field>
+            <field name="code">154006</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154007">
+            <field name="name">Additional Duty (Imports) 4%</field>
+            <field name="code">154007</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154008">
+            <field name="name">Input Service Tax 12%</field>
+            <field name="code">154008</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154009">
+            <field name="name">Input Service Tax Edu. Cess. 2%</field>
+            <field name="code">154009</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154010">
+            <field name="name">TDS on Salary - 92B</field>
+            <field name="code">154010</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154011">
+            <field name="name">Input Excise Duty 6%</field>
+            <field name="code">154011</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154012">
+            <field name="name">Input Excise Duty 5%</field>
+            <field name="code">154012</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154013">
+            <field name="name">Input Excise Duty 12%</field>
+            <field name="code">154013</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154014">
+            <field name="name">Education Cess 2% - Purchase</field>
+            <field name="code">154014</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154015">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+            <field name="code">154015</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p247001">
+            <field name="name">Excise Duty 12% - Sales</field>
+            <field name="code">247001</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p247010">
+            <field name="name">Education Cess 2% - Sales</field>
+            <field name="code">247010</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p247002">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+            <field name="code">247002</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p154016">
+            <field name="name">Input Sec. &amp; HEC - Capital Goods</field>
+            <field name="code">154016</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154017">
+            <field name="name">TDS on Contractor - 94C</field>
+            <field name="code">154017</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154018">
+            <field name="name">TDS on Director's Interest</field>
+            <field name="code">154018</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154019">
+            <field name="name">TDS on Director's Remuneration - 92B</field>
+            <field name="code">154019</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154020">
+            <field name="name">TDS on Interest</field>
+            <field name="code">154020</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154021">
+            <field name="name">TDS on Professional Fees - 94J</field>
+            <field name="code">154021</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154022">
+            <field name="name">TDS on Rent - 94I</field>
+            <field name="code">154022</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154023">
+            <field name="name">Input Edu. Cess - Capital Goods</field>
+            <field name="code">154023</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154024">
+            <field name="name">Input Excise Duty 12% - Capital Goods</field>
+            <field name="code">154024</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154025">
+            <field name="name">Input VAT 4%</field>
+            <field name="code">154025</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154026">
+            <field name="name">Input Additional VAT 1%</field>
+            <field name="code">154026</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154027">
+            <field name="name">Input VAT 15%</field>
+            <field name="code">154027</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p247003">
+            <field name="name">Output VAT 4%</field>
+            <field name="code">247003</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p247004">
+            <field name="name">Output Adi. VAT 1%</field>
+            <field name="code">247004</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p247005">
+            <field name="name">CST 2% on Sales - Against Form - C</field>
+            <field name="code">247005</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p247006">
+            <field name="name">CST 5% on Sales</field>
+            <field name="code">247006</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p154028">
+            <field name="name">Input VAT 12.5%</field>
+            <field name="code">154028</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154029">
+            <field name="name">Input Additional VAT 2.5%</field>
+            <field name="code">154029</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p154030">
+            <field name="name">Input CST 2%</field>
+            <field name="code">154030</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_expense"/>
+            <field name="parent_id" ref="p15400"/>
+        </record>
+
+        <record model="account.account.template" id="p247007">
+            <field name="name">CST 2% on Sales - CT3 Against Form C</field>
+            <field name="code">247007</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p247008">
+            <field name="name">Output VAT 4% on Sales - CT3</field>
+            <field name="code">247008</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
+        <record model="account.account.template" id="p247009">
+            <field name="name">Output Adi. VAT 1% Sales CT3</field>
+            <field name="code">247009</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_liability"/>
+            <field name="parent_id" ref="p24700"/>
+        </record>
+
         <record id="indian_chart_template_public" model="account.chart.template">
             <field name="name">India - Chart of Accounts for Public Ltd</field>
             <field name="account_root_id" ref="p0"/>
diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml
index 03dbfa7cc75..887e051121a 100644
--- a/addons/l10n_in/l10n_in_public_tax_template.xml
+++ b/addons/l10n_in/l10n_in_public_tax_template.xml
@@ -1,295 +1,865 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
-    <!-- Sales Tax -->
-    
-    <record id="sales_tax_public_main" model="account.tax.template">
-        <field name="name">Sale Tax-15%</field>
-        <field name="account_collected_id" ref="p24710"/>
-        <field name="account_paid_id" ref="p24710"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="sales_tax_public" model="account.tax.template">
-        <field name="name">Sale Tax-12%</field>
-        <field name="account_collected_id" ref="p24710"/>
-        <field name="account_paid_id" ref="p24710"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.12</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="sales_tax_public_4" model="account.tax.template">
-        <field name="name">Sale Tax-4%</field>
-        <field name="account_collected_id" ref="p24710"/>
-        <field name="account_paid_id" ref="p24710"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.04</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <!-- Purchase tax -->
-    
-    <record id="purchase_tax_public" model="account.tax.template">
-        <field name="name">Purchase Tax-15%</field>
-        <field name="account_collected_id" ref="p15400"/>
-        <field name="account_paid_id" ref="p15400"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.15</field>
-        <field name="type">percent</field>
+
+    <record id="account_tax_cst_pur5" model="account.tax.template">
+        <field name="name">Input CST 5%</field>
+        <field name="description">Input CST 5%</field>
         <field name="type_tax_use">purchase</field>
-        <field name="base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="tax_code_id" ref="vat_code_payable"/>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_purchase"/>
-        <field name="ref_tax_code_id" ref="vat_code_payable"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <!-- -->
-    
-    <!-- VAT -->
-    
-    <record id="vat_public_main" model="account.tax.template">
-        <field name="name">VAT-5%(4% VAT+1% Add. Tax.)</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.05</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.01</field>
+        <field name="account_collected_id" ref="p154001"/>
+        <field name="account_paid_id" ref="p154001"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_PCST5"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pur_CSTP5"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="vat_public_main_tax" model="account.tax.template">
-        <field name="name">VAT-15% (12.5% VAT + 2.5% Add. Tax.)</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.15</field>
+    <record id="account_tax_in_cradit_urd" model="account.tax.template">
+        <field name="name">Input Credit - URD</field>
+        <field name="description">Input Credit - URD</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="vat_public_tax" model="account.tax.template">
-        <field name="name">VAT-8%</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.08</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-        <record id="vat_public_tax_10" model="account.tax.template">
-        <field name="name">VAT-10%</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">0.10</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.0400</field>
+        <field name="account_collected_id" ref="p154003"/>
+        <field name="account_paid_id" ref="p154003"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_urd"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_urd"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_urd"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_urd"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <record id="vat_public_tax_12" model="account.tax.template">
-        <field name="name">VAT-12.5%</field>
-        <field name="account_collected_id" ref="p24720"/>
-        <field name="account_paid_id" ref="p24720"/> 
-        <field name="price_include" eval="0"/>
-        <field name="amount">12.5</field>
+    <record id="account_tax_tds_audit_fee" model="account.tax.template">
+        <field name="name">TDS on Audit Fees - 94J</field>
+        <field name="description">TDS on Audit Fees - 94J</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.1000</field>
+        <field name="account_collected_id" ref="p154004"/>
+        <field name="account_paid_id" ref="p154004"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_audit_fee"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
 
-    <!-- Service Tax -->
-    
-    <record id="service_public_main" model="account.tax.template">
-        <field name="name">Service Tax-12.30%</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/> 
+    <record id="account_tax_tds_brok" model="account.tax.template">
+        <field name="name">TDS on Commission Or Brokerage- 94H</field>
+        <field name="description">TDS on Commission Or Brokerage- 94H</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1000</field>
+        <field name="account_collected_id" ref="p154005"/>
+        <field name="account_paid_id" ref="p154005"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_brokerage"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_import_duty" model="account.tax.template">
+        <field name="name">Input Credit - Import Duty</field>
+        <field name="description">Input Credit - Import Duty</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0750</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p154006"/>
+        <field name="account_paid_id" ref="p154006"/>
+        <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_import_duty"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_import_duty"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_add_duty4" model="account.tax.template">
+        <field name="name">Additional Duty (Imports) 4%</field>
+        <field name="description">Additional Duty (Imports) 4%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0400</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p154007"/>
+        <field name="account_paid_id" ref="p154007"/>
+        <field name="base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_tds_pur_import"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_imp_duty"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_st" model="account.tax.template">
+        <field name="name">Service Tax 12% - Purchase</field>
+        <field name="description">Service Tax 12% - Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p154008"/>
+        <field name="account_paid_id" ref="p154008"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_ser12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_ser12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_st"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_edu_cess_st" model="account.tax.template">
+        <field name="name">Service Tax Edu. Cess. 2% - Purchase</field>
+        <field name="description">Service Tax Edu. Cess. 2% - Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">3</field>
+        <field name="account_collected_id" ref="p154009"/>
+        <field name="account_paid_id" ref="p154009"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_edu_cess"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_ic_st"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_credit_ser_tax_seco_hec" model="account.tax.template">
+        <field name="name">Service Tax Seco. &amp; HEC 1% - Purchase</field>
+        <field name="description">Service Tax Seco. &amp; HEC 1% - Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">5</field>
+        <field name="account_collected_id" ref="p154002"/>
+        <field name="account_paid_id" ref="p154002"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_ic_seco_hec"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_ic_st"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_sal" model="account.tax.template">
+        <field name="name">TDS on Salary - 92B</field>
+        <field name="description">TDS on Salary - 92B</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.3000</field>
+        <field name="account_collected_id" ref="p154010"/>
+        <field name="account_paid_id" ref="p154010"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_sal"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exic5_pur" model="account.tax.template">
+        <field name="name">Input Excise Duty 5%</field>
+        <field name="description">Input Excise Duty 5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0500</field>
+        <field name="account_collected_id" ref="p154012"/>
+        <field name="account_paid_id" ref="p154012"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice5"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice12_pur" model="account.tax.template">
+        <field name="name">Input Excise Duty 12%</field>
+        <field name="description">Input Excise Duty 12%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
         <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="p154013"/>
+        <field name="account_paid_id" ref="p154013"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_edu_cess2_pur" model="account.tax.template">
+        <field name="name">Education Cess 2% - Purchase</field>
+        <field name="description">Education Cess 2% - Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">21</field>
+        <field name="account_collected_id" ref="p154014"/>
+        <field name="account_paid_id" ref="p154014"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_exice12_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_seco_high_cess_pur" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+        <field name="description">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+        <field name="type_tax_use">all</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">22</field>
+        <field name="account_collected_id" ref="p154015"/>
+        <field name="account_paid_id" ref="p154015"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_exice12_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice12_sale" model="account.tax.template">
+        <field name="name">Excise Duty 12% - Sales</field>
+        <field name="description">Excise Duty 12% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1200</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="p247001"/>
+        <field name="account_paid_id" ref="p247001"/>
+        <field name="base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sales_excise"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_exice12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_edu_cess2" model="account.tax.template">
+        <field name="name">Education Cess 2% - Sales</field>
+        <field name="description">Education Cess 2% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">3</field>
+        <field name="account_collected_id" ref="p247010"/>
+        <field name="account_paid_id" ref="p247010"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cess2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cess2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_exice12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_seco_high_cess1" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+        <field name="description">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">5</field>
+        <field name="account_collected_id" ref="p247002"/>
+        <field name="account_paid_id" ref="p247002"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_sec_hig_cess"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_exice12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_sec_high_cap_good" model="account.tax.template">
+        <field name="name">Input Sec. &amp; HEC - Capital Goods</field>
+        <field name="description">Input Sec. &amp; HEC - Capital Goods</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="account_collected_id" ref="p154016"/>
+        <field name="account_paid_id" ref="p154016"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_seco_hec"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_contr" model="account.tax.template">
+        <field name="name">TDS on Contractor - 94C</field>
+        <field name="description">TDS on Contractor - 94C</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="account_collected_id" ref="p154017"/>
+        <field name="account_paid_id" ref="p154017"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_contractor"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_dir_intrest" model="account.tax.template">
+        <field name="name">TDS on Director's Interest</field>
+        <field name="description">TDS on Director's Interest</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <field name="account_collected_id" ref="p154018"/>
+        <field name="account_paid_id" ref="p154018"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_dir_intrest"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_dir_renum" model="account.tax.template">
+        <field name="name">TDS on Director's Remuneration - 92B</field>
+        <field name="description">TDS on Director's Remuneration - 92B</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.3</field>
+        <field name="account_collected_id" ref="p154019"/>
+        <field name="account_paid_id" ref="p154019"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_dir_ren"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_intrest" model="account.tax.template">
+        <field name="name">TDS on Interest</field>
+        <field name="description">TDS on Interest</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <field name="account_collected_id" ref="p154020"/>
+        <field name="account_paid_id" ref="p154020"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_intrest"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_prof_fee" model="account.tax.template">
+        <field name="name">TDS on Professional Fees - 94J</field>
+        <field name="description">TDS on Professional Fees - 94J</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p154021"/>
+        <field name="account_paid_id" ref="p154021"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_prof_fee"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_tds_rent" model="account.tax.template">
+        <field name="name">TDS on Rent - 94I</field>
+        <field name="description">TDS on Rent-94I</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1</field>
+        <field name="account_collected_id" ref="p154022"/>
+        <field name="account_paid_id" ref="p154022"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_base_tds"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_tds_rent"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ic_cap_edu_cess" model="account.tax.template">
+        <field name="name">Input Edu. Cess - Capital Goods</field>
+        <field name="description">Input Edu. Cess - Capital Goods</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="account_collected_id" ref="p154023"/>
+        <field name="account_paid_id" ref="p154023"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_edu_cess"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ie12_cap_goods" model="account.tax.template">
+        <field name="name">Input Excise Duty 12% - Capital Goods</field>
+        <field name="description">Input Excise Duty 12% - Capital Goods</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
         <field name="amount">0.12</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="account_collected_id" ref="p154024"/>
+        <field name="account_paid_id" ref="p154024"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cap_goods"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_plant_machinery"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cap_goods"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    <record id="service_tax_parent" model="account.tax.template">
-        <field name="name">Service Tax-%2</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/> 
-        <field name="include_base_amount" eval="True"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="amount">0.02</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="parent_id" ref="service_public_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="service_tax" model="account.tax.template">
-        <field name="name">Service Tax-%1</field>
-        <field name="amount">0.01</field>
-        <field name="account_collected_id" ref="p24740"/>
-        <field name="account_paid_id" ref="p24740"/> 
-        <field name="include_base_amount" eval="True"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">all</field>
-        <field name="parent_id" ref="service_public_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-<!-- Excise duty -->
 
-    <record id="exice_public_main" model="account.tax.template">
-        <field name="name">Excise Duty-10.30%</field>
-        <field name="account_collected_id" ref="p24730"/>
-        <field name="account_paid_id" ref="p24730"/>
-        <field name="include_base_amount" eval="True"/>
-        <field name="amount">0.10</field>
+    <record id="account_tax_in_vat4" model="account.tax.template">
+        <field name="name">Input VAT 4%</field>
+        <field name="description">Input VAT 4%</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="child_depend" eval="0"/>
+        <field name="amount">0.04</field>
+        <field name="sequence">4</field>
+        <field name="account_collected_id" ref="p154025"/>
+        <field name="account_paid_id" ref="p154025"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat4"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat4"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    
-    <record id="exice_duty_parent" model="account.tax.template">
-        <field name="name">Excise Duty-2%</field>
-        <field name="amount">0.02</field>
+
+    <record id="account_tax_in_add_vat1" model="account.tax.template">
+        <field name="name">Input Additional VAT 1%</field>
+        <field name="description">Input Additional VAT 1%</field>
+        <field name="type_tax_use">purchase</field>
         <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="p24730"/>
-        <field name="account_paid_id" ref="p24730"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="parent_id" ref="exice_public_main"/>
-        <field name="chart_template_id" ref="indian_chart_template_public"/>
-    </record>
-    
-    <record id="exice_duty" model="account.tax.template">
-        <field name="name">Excise Duty-1%</field>
         <field name="amount">0.01</field>
-        <field name="type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="account_collected_id" ref="p24730"/>
-        <field name="account_paid_id" ref="p24730"/>
-        <field name="base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="base_sign">1</field>
-        <field name="tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="tax_sign">1</field>
-        <field name="ref_base_code_id" ref="vat_code_base_tax_sale"/>
-        <field name="ref_base_sign">1</field>
-        <field name="ref_tax_code_id" ref="vat_code_tax_rec"/>
-        <field name="ref_tax_sign">1</field>
-        <field name="parent_id" ref="exice_public_main"/>
+        <field name="sequence">5</field>
+        <field name="account_collected_id" ref="p154026"/>
+        <field name="account_paid_id" ref="p154026"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat1"/>
+        <field name="ref_tax_sign" eval="-1"/>
         <field name="chart_template_id" ref="indian_chart_template_public"/>
     </record>
-    
+
+    <record id="account_tax_in_vat15" model="account.tax.template">
+        <field name="name">Input VAT 15%</field>
+        <field name="description">Input VAT 15%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.15</field>
+        <field name="sequence">7</field>
+        <field name="account_collected_id" ref="p154027"/>
+        <field name="account_paid_id" ref="p154027"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat15"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_vat4" model="account.tax.template">
+        <field name="name">Output VAT 4%</field>
+        <field name="description">Output VAT 4%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="sequence">11</field>
+        <field name="account_collected_id" ref="p247003"/>
+        <field name="account_paid_id" ref="p247003"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_vat4"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_adi_vat1" model="account.tax.template">
+        <field name="name">Output Adi. VAT 1%</field>
+        <field name="description">Output Adi. VAT 1%</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">12</field>
+        <field name="account_collected_id" ref="p247004"/>
+        <field name="account_paid_id" ref="p247004"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_vat4"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_add_vat1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst2_sale" model="account.tax.template">
+        <field name="name">CST 2% on Sales - Against Form - C</field>
+        <field name="description">CST 2% on Sales - Against Form - C</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">13</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="p247005"/>
+        <field name="account_paid_id" ref="p247005"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_cst2"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cst2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst2"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst5_sale" model="account.tax.template">
+        <field name="name">CST 5% on Sales</field>
+        <field name="description">CST 5% on Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.05</field>
+        <field name="sequence">14</field>
+        <field name="account_collected_id" ref="p247006"/>
+        <field name="account_paid_id" ref="p247006"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_cst15"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cst5"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_cst15"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst5"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_vat12" model="account.tax.template">
+        <field name="name">Input VAT 12.5%</field>
+        <field name="description">Input VAT 12.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.1250</field>
+        <field name="sequence">60</field>
+        <field name="account_collected_id" ref="p154028"/>
+        <field name="account_paid_id" ref="p154028"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat12"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_vat12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_in_add_vat25" model="account.tax.template">
+        <field name="name">Input Additional VAT 2.5%</field>
+        <field name="description">Input Additional VAT 2.5%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0250</field>
+        <field name="sequence">80</field>
+        <field name="account_collected_id" ref="p154029"/>
+        <field name="account_paid_id" ref="p154029"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat25"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat25"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_add_vat2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst2_pur" model="account.tax.template">
+        <field name="name">Input CST 2%</field>
+        <field name="description">Input CST 2%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">9333</field>
+        <field name="account_collected_id" ref="p154030"/>
+        <field name="account_paid_id" ref="p154030"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_cst2"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cst2"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_cst2"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cst2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_no_form_h" model="account.tax.template">
+        <field name="name">No Tax Form H</field>
+        <field name="description">No Tax Form H</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_fomh"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_exp_ct1"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_fomh"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_cst2_sale_cst3_against_c" model="account.tax.template">
+        <field name="name">CST 2% on Sales - CT3  Against Form - C</field>
+        <field name="description">CST 2% on Sales - CT3  Against Form - C</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="account_collected_id" ref="p247007"/>
+        <field name="account_paid_id" ref="p247007"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_ct3_cst"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_cst2_on_sal_cst3"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_vat4_sal_ct3" model="account.tax.template">
+        <field name="name">Output VAT 4% on Sales - CT3</field>
+        <field name="description">Output VAT 4% on Sales - CT3</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.04</field>
+        <field name="account_collected_id" ref="p247008"/>
+        <field name="account_paid_id" ref="p247008"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_out4_sal_cst3"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_out_add1_sal_ct3" model="account.tax.template">
+        <field name="name">Output Adi. VAT 1% on Sales - CT3</field>
+        <field name="description">Output Adi. VAT 1% on Sales - CT3</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="account_collected_id" ref="p247009"/>
+        <field name="account_paid_id" ref="p247009"/>
+        <field name="base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_cst3"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_out_add1_sale_cst3"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_sez_ogs" model="account.tax.template">
+        <field name="name">No Tax SEZ OGS</field>
+        <field name="description">No Tax SEZ OGS</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">fixed</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
+        <field name="tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_sez_out_guj"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_no_saz_ogs"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_sez_guj" model="account.tax.template">
+        <field name="name">No Tax SEZ Gujarat</field>
+        <field name="description">No Tax SEZ Gujarat</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
+        <field name="tax_code_id" ref="vat_code_tax_no_sez_guj"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_sez_in_guj"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_no_sez_guj"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_h_with_bed" model="account.tax.template">
+        <field name="name">No Tax Form H with BED</field>
+        <field name="description">No Tax Form H with BED</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_formh_tax"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_formh_tax"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_formh_bed"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_export_out_country" model="account.tax.template">
+        <field name="name">No Tax Exports - Out of Country</field>
+        <field name="description">No Tax Exports - Out of Country</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_out_country"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_out_country"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_no_out_country"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_no_tax_proj" model="account.tax.template">
+        <field name="name">No Tax Projects</field>
+        <field name="description">No Tax Projects</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_tax_sal_proj"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_no_proj"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sal_proj"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_no_proj"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exic6_pur" model="account.tax.template">
+        <field name="name">Input Excise Duty 6%</field>
+        <field name="description">Input Excise Duty 6%</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0600</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p154011"/>
+        <field name="account_paid_id" ref="p154011"/>
+        <field name="base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_exice6"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_pur_vat"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_exice6"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice6_edu_cess2_pur" model="account.tax.template">
+        <field name="name">Education Cess 2% Purchase</field>
+        <field name="description">Education Cess 2% Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0200</field>
+        <field name="sequence">21</field>
+        <field name="account_collected_id" ref="p154014"/>
+        <field name="account_paid_id" ref="p154014"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_cess2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_exice6_seco_high_cess_pur" model="account.tax.template">
+        <field name="name">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
+        <field name="description">Seco. &amp; Higher Edu. Cess 1% Purchase</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="type">percent</field>
+        <field name="amount">0.0100</field>
+        <field name="sequence">22</field>
+        <field name="account_collected_id" ref="p154015"/>
+        <field name="account_paid_id" ref="p154015"/>
+        <field name="tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_pay_sec_hig_edu"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_exic6_pur"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ser12_sale" model="account.tax.template">
+        <field name="name">Service Tax 12% - Sales</field>
+        <field name="description">Service Tax 12% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.12</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_base_code_id" ref="vat_code_tax_sale_ser12"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st12"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ser2_sale" model="account.tax.template">
+        <field name="name">Service Tax 2% - Sales</field>
+        <field name="description">Service Tax 2% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.02</field>
+        <field name="sequence">3</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st2"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
+    <record id="account_tax_ser1_sale" model="account.tax.template">
+        <field name="name">Service Tax 1% - Sales</field>
+        <field name="description">Service Tax 1% - Sales</field>
+        <field name="type_tax_use">sale</field>
+        <field name="type">percent</field>
+        <field name="amount">0.01</field>
+        <field name="sequence">5</field>
+        <field name="account_collected_id" ref="p24740"/>
+        <field name="account_paid_id" ref="p24740"/>
+        <field name="tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_code_id" ref="vat_code_tax_rec_st1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+        <field name="parent_id" ref="account_tax_ser12_sale"/>
+        <field name="chart_template_id" ref="indian_chart_template_public"/>
+    </record>
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml
index 94217d79c3c..983d2fa4910 100644
--- a/addons/l10n_in/l10n_in_tax_code_template.xml
+++ b/addons/l10n_in/l10n_in_tax_code_template.xml
@@ -19,6 +19,7 @@
 
         <record model="account.tax.code.template" id="vat_code_payable">
             <field name="name">Tax Paid</field>
+            <field name="sign">-1</field>
             <field name="parent_id" ref="vat_code_balance_net"/>
         </record>
 
@@ -27,16 +28,540 @@
             <field name="parent_id" ref="vat_code_tax"/>
         </record>
 
-
         <record model="account.tax.code.template" id="vat_code_base_tax_sale">
-            <field name="name">Base of Taxed Sales</field>
+            <field name="name">Taxable Sale Bases</field>
             <field name="parent_id" ref="vat_code_base_net"/>
         </record>
 
         <record model="account.tax.code.template" id="vat_code_base_tax_purchase">
-            <field name="name">Base of Taxed Purchases</field>
+            <field name="name">Taxable Purchase Bases</field>
             <field name="parent_id" ref="vat_code_base_net"/>
         </record>
 
+        <record model="account.tax.code.template" id="vat_code_tax_pur_CSTP5">
+            <field name="name">Input CST 5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_PCST5">
+            <field name="name">Purchase CST 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_ser12">
+            <field name="name">Purchase Service Tax 12%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sale_ser12">
+            <field name="name">Sales Service Tax 12%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice_salebase">
+            <field name="name">Excise Duty 12.36% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice12">
+            <field name="name">Excise Duty 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice2">
+            <field name="name">Excise Duty 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_exice1">
+            <field name="name">Excise Duty 1% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_purbase">
+            <field name="name">Excise Duty 12.36% - Purchase</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice12">
+            <field name="name">Excise Duty 12% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cess2">
+            <field name="name">Education Cess 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cess2">
+            <field name="name">Education Cess 2% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_import_duty">
+            <field name="name">Input Credit - Import Duty</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_edu_cess">
+            <field name="name">Input Credit On Capital Goods - Edu. Cess</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cap_goods">
+            <field name="name">Input Excise Duty 12% - Capital Goods</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_seco_hec">
+            <field name="name">Input Credit on Capital Goods - Seco. &amp; HEC</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st_base">
+            <field name="name">Input Service Tax 12.36%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_st">
+            <field name="name">Input Service Tax 12%</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_edu_cess">
+            <field name="name">Input Service Tax Edu. Cess. 2%</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_ic_seco_hec">
+            <field name="name">Input Service Tax Seco. &amp; HEC 1%</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_base"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_sec_hig_edu">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Purchase</field>
+            <field name="parent_id" ref="vat_code_tax_pay_ic_st_purbase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_sec_hig_cess">
+            <field name="name">Seco. &amp; Higher Edu. Cess 1% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_exice_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cst2">
+            <field name="name">CST 2% on Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cst5">
+            <field name="name">CST 5% on Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat1">
+            <field name="name">Input Additional VAT 1%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_add_vat2">
+            <field name="name">Input Additional Vat 2.5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat12">
+            <field name="name">Input VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat15">
+            <field name="name">Input VAT 15%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat10">
+            <field name="name">Input VAT 10%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat8">
+            <field name="name">Input VAT 8%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat5">
+            <field name="name">Input VAT 5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_vat4">
+            <field name="name">Input VAT 4%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat15">
+            <field name="name">Output VAT 15%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat12">
+            <field name="name">Output VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat10">
+            <field name="name">Output VAT 10%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat8">
+            <field name="name">Output VAT 8%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat5">
+            <field name="name">Output VAT 5%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_vat4">
+            <field name="name">Output VAT 4%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_add_vat1">
+            <field name="name">Output Adi. VAT 1%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_cst2">
+            <field name="name">CST 2% on Purchase</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice5">
+            <field name="name">Input Excise Duty 5%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_exice6">
+            <field name="name">Input Excise Duty 6%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_urd">
+            <field name="name">Input Credit - URD</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_audit_fee">
+            <field name="name">TDS on Audit Fees - 94J</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_brokerage">
+            <field name="name">TDS on Commission Or Brokerage- 94H</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_contractor">
+            <field name="name">TDS on Contractor-94C</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_intrest">
+            <field name="name">TDS on Director's Interest</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_dir_ren">
+            <field name="name">TDS on Director's Remuneration - 92B</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_intrest">
+            <field name="name">TDS on Interest</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_prof_fee">
+            <field name="name">TDS on Professional Fees - 94J</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_rent">
+            <field name="name">TDS on Rent - 94I</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_tds_sal">
+            <field name="name">TDS on Salary - 92B</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_tds_pur_import">
+            <field name="name">Import Purchase</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat">
+            <field name="name">Purchase VAT 4% / VAT 12.5% / VAT 15% / CST 2% / CST 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_plant_machinery">
+            <field name="name">Plant &amp; Machinery</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_exp_act">
+            <field name="name">Expense Accounts</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sales_excise">
+            <field name="name">Sales Excise</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sale_cst2">
+            <field name="name">Sales CST 2%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sale_cst15">
+            <field name="name">Sales CST 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat15">
+            <field name="name">Purchase VAT 15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat12">
+            <field name="name">Purchase VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat10">
+            <field name="name">Purchase VAT 10%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat8">
+            <field name="name">Purchase VAT 8%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat5">
+            <field name="name">Purchase VAT 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat4">
+            <field name="name">Purchase VAT 4%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_vat25">
+            <field name="name">Purchase VAT 2.5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat15">
+            <field name="name">Sales VAT 15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat12">
+            <field name="name">Sales VAT 12.5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat10">
+            <field name="name">Sales VAT 10%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat8">
+            <field name="name">Sales VAT 8%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat5">
+            <field name="name">Sales VAT 5%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_vat4">
+            <field name="name">Sales VAT 4%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_cst2">
+            <field name="name">Input CST 2%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_urd">
+            <field name="name">Purchase URD</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pur_base_tds">
+            <field name="name">Base Expenses for TDS</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_pay_add_imp_duty">
+            <field name="name">Additional Duty (Imports) 4%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_formh_tax">
+            <field name="name">Sales Export - Form H - With Tax</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_cst2_on_sal_cst3">
+            <field name="name">CST 2% on Sales CT3</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_cst3">
+            <field name="name">Sales CT3 VAT</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_out4_sal_cst3">
+            <field name="name">Output VAT 4% on Sales CT3</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_out_add1_sale_cst3">
+            <field name="name">Output Adi. VAT 1% on Sales CT3</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_ct3_cst">
+            <field name="name">Sales CT3 CST</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_exp_ct1">
+            <field name="name">Sales Export - Form H - With CT1</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_sez_out_guj">
+            <field name="name">Sales Export - SEZ - Out of Gujarat</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_sez_in_guj">
+            <field name="name">Sales Export - SEZ - In Gujarat</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_no_saz_ogs">
+            <field name="name">No Tax SEZ OGS</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_no_sez_guj">
+            <field name="name">No Tax SEZ Gujarat</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_out_country">
+            <field name="name">Sales Export - Out of Country</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_sal_proj">
+            <field name="name">Sales Others (Projects)</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_formh_bed">
+            <field name="name">No Tax Form H with BED</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_fomh">
+            <field name="name">No Tax Form H</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_no_out_country">
+            <field name="name">No Tax Export Out of Country</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_no_proj">
+            <field name="name">No Tax Projects</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st_salebase">
+            <field name="name">Service Tax 12.36% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st12">
+            <field name="name">Service Tax 12% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st2">
+            <field name="name">Service Tax 2% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_tax_rec_st1">
+            <field name="name">Service Tax 1% - Sales</field>
+            <field name="parent_id" ref="vat_code_tax_rec_st_salebase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_base_tax_sale15">
+            <field name="name">Sales Tax 15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_rec_sale15">
+            <field name="name">Sales Tax - 15%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_base_tax_sale12">
+            <field name="name">Sales Tax 12%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_rec_sale12">
+            <field name="name">Sales Tax - 12%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_base_tax_sale4">
+            <field name="name">Sales Tax 4%</field>
+            <field name="parent_id" ref="vat_code_base_tax_sale"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_rec_sale4">
+            <field name="name">Sales Tax - 4%</field>
+            <field name="parent_id" ref="vat_code_tax_rec"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_base_tax_pur15">
+            <field name="name">Purchase Tax 15%</field>
+            <field name="parent_id" ref="vat_code_base_tax_purchase"/>
+        </record>
+
+        <record model="account.tax.code.template" id="vat_code_pay_pur4">
+            <field name="name">Purchase Tax - 15%</field>
+            <field name="parent_id" ref="vat_code_payable"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/l10n_in/static/src/img/icon.png b/addons/l10n_in/static/description/icon.png
similarity index 100%
rename from addons/l10n_in/static/src/img/icon.png
rename to addons/l10n_in/static/description/icon.png
diff --git a/addons/l10n_in_hr_payroll/i18n/zh_CN.po b/addons/l10n_in_hr_payroll/i18n/zh_CN.po
new file mode 100644
index 00000000000..8ee2c7f2028
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/zh_CN.po
@@ -0,0 +1,1013 @@
+# Chinese (Simplified) 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-11-24 02:53+0000\n"
+"PO-Revision-Date: 2013-06-24 10:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-06-25 05:14+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr "E-mail地址"
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr "员工银行帐号"
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr "职位"
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Payslips which are paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+#: view:payslip.report:0
+msgid "Group By..."
+msgstr "分组于..."
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr "基本补贴:"
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Payslips which are in done state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+#: view:payslip.report:0
+#: field:payslip.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payslip.report,nbr:0
+msgid "# Payslip lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+#: view:payslip.report:0
+#: field:payslip.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payslip_report_all
+msgid "This report performs analysis on Payslip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+#: field:payslip.report,struct_id:0
+msgid "Structure"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:134
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "# Payslip Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Day of Payslip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid ""
+"If this box is checked which means that Payment Advice exists for current "
+"batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:108
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:134
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:190
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:207
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payslip.report,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payslip.report,state:0
+msgid "Rejected"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Year of Payslip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Payslip Line"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid ""
+"This wizard will print report which displays employees break-up of Net Head "
+"for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: field:payslip.report,date_to:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+#: view:payslip.report:0
+#: field:payslip.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+#: view:payslip.report:0
+#: field:payslip.report,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:190
+#, python-format
+msgid ""
+"Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+#: view:payslip.report:0
+#: selection:payslip.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: field:payslip.report,date_from:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,state:0
+#: view:payslip.report:0
+#: field:payslip.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid ""
+"VPF is a safe option wherein you can contribute more than the PF ceiling of "
+"12% that has been mandated by the government and VPF computed as "
+"percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: view:payslip.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Month of Payslip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,supplementary_allowance:0
+msgid "Supplementary Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+msgid "Payslips which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+#: field:payslip.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payslip.report:0
+#: selection:payslip.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid ""
+"This wizard will print report which display a pay head employee breakup for "
+"a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+#: view:payslip.report:0
+#: field:payslip.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: field:payslip.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payslip_report_all
+#: model:ir.model,name:l10n_in_hr_payroll.model_payslip_report
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payslip
+#: view:payslip.report:0
+msgid "Payslip Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+#: selection:payslip.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:108
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:207
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund (%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,house_rent_allowance_metro_nonmetro:0
+msgid "House Rent Allowance (%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+#: view:payslip.report:0
+#: field:payslip.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: field:payslip.report,total:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,house_rent_allowance_metro_nonmetro:0
+msgid ""
+"HRA is an allowance given by the employer to the employee for taking care of "
+"his rental or accommodation expenses for metro city it is 50 % and for non "
+"metro 40%.HRA computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
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 348bb71c95e..f0751684dba 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -44,7 +44,7 @@ class hr_contract(osv.osv):
         'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
         'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
         'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Payroll'), help="VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government and VPF computed as percentage(%)"),
-        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses for metro city it is 50 % and for non metro 40%.HRA computed as percentage(%)"),
+        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses for metro city it is 50% and for non metro 40%. \nHRA computed as percentage(%)"),
         'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
     }
 
@@ -103,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]
@@ -129,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')
@@ -183,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,
@@ -201,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]
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
index 51c63c730ff..d65f02a332b 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -92,7 +92,7 @@
                             <label for="Name" class="oe_edit_only" string="Name"/>
                             <h2><field name="name"/></h2>
                             <label for="date" class="oe_edit_only"/>
-                            <h2><field name="date"/></h2>
+                            <div><field name="date"/></div>
                             <group colspan="3" col="6">
                                 <field name="bank_id"/>
                                 <field name="number"/>
diff --git a/addons/l10n_in_hr_payroll/static/src/img/icon.png b/addons/l10n_in_hr_payroll/static/description/icon.png
similarity index 100%
rename from addons/l10n_in_hr_payroll/static/src/img/icon.png
rename to addons/l10n_in_hr_payroll/static/description/icon.png
diff --git a/addons/l10n_it/static/src/img/icon.png b/addons/l10n_it/static/description/icon.png
similarity index 100%
rename from addons/l10n_it/static/src/img/icon.png
rename to addons/l10n_it/static/description/icon.png
diff --git a/addons/l10n_lu/account.account.template-2011.csv b/addons/l10n_lu/account.account.template-2011.csv
index 5757e8a3f5e..4124da146e7 100644
--- a/addons/l10n_lu/account.account.template-2011.csv
+++ b/addons/l10n_lu/account.account.template-2011.csv
@@ -1,1159 +1,1159 @@
-id,code,name,parent_id/id,type,user_type/id,reconcile,financial_report_ids/id
-lu_2011_account_0,0,Plan de compte Luxembourgeois - Loi de Juin 2009 (THAMINI & ADN),,view,account.data_account_type_view,f,
-lu_2011_account_bilan,bilan,COMPTES DE BILAN,lu_2011_account_0,view,account.data_account_type_view,f,
-lu_2011_account_1,1,"CLASSE 1 - COMPTES DE CAPITAUX, DE PROVISIONS ET DE DETTES FINANCIERES",lu_2011_account_bilan,view,account_type_2011_1_capital,f,
-lu_2011_account_10,10,Capital ou dotation des succursales et comptes de l’exploitant,lu_2011_account_1,view,account_type_2011_1_capital,f,
-lu_2011_account_101,101,Capital souscrit (Sociétés de capitaux - Montant total),lu_2011_account_10,other,account_type_2011_1_capital,f,account_financial_report_68
-lu_2011_account_102,102,Capital souscrit non appelé (Sociétés de capitaux),lu_2011_account_10,other,account_type_2011_1_capital,f,account_financial_report_17
-lu_2011_account_103,103,Capital souscrit appelé et non versé (Sociétés de capitaux),lu_2011_account_10,other,account_type_2011_1_capital,f,account_financial_report_18
-lu_2011_account_104,104,Capital des entreprises commerçants personnes physiques et des sociétés de personnes,lu_2011_account_10,view,account_type_2011_1_capital,f,
-lu_2011_account_1041,1041,Commerçants personnes physiques,lu_2011_account_104,other,account_type_2011_1_capital,f,
-lu_2011_account_1042,1042,Sociétés de personnes,lu_2011_account_104,other,account_type_2011_1_capital,f,
-lu_2011_account_105,105,Dotation des succursales,lu_2011_account_10,other,account_type_2011_1_capital,f,
-lu_2011_account_106,106,Comptes de l’exploitant ou des coexploitants,lu_2011_account_10,view,account_type_2011_1_capital,f,
-lu_2011_account_1061,1061,Prélèvements privés de l’exploitant ou des coexploitants,lu_2011_account_106,view,account_type_2011_1_capital,f,
-lu_2011_account_10611,10611,Prélèvements en numéraire (train de vie),lu_2011_account_1061,other,account_type_2011_1_capital,f,
-lu_2011_account_10612,10612,"Prélèvements en nature de marchandises, de produits finis et services (au prix de revient)",lu_2011_account_1061,other,account_type_2011_1_capital,f,
-lu_2011_account_10613,10613,Part personnelle des frais de maladie,lu_2011_account_1061,other,account_type_2011_1_capital,f,
-lu_2011_account_10614,10614,Primes d’assurances privées,lu_2011_account_1061,view,account_type_2011_1_capital,f,
-lu_2011_account_106141,106141,Vie,lu_2011_account_10614,other,account_type_2011_1_capital,f,
-lu_2011_account_106142,106142,Accident,lu_2011_account_10614,other,account_type_2011_1_capital,f,
-lu_2011_account_106143,106143,Incendie,lu_2011_account_10614,other,account_type_2011_1_capital,f,
-lu_2011_account_106144,106144,Responsabilité civile,lu_2011_account_10614,other,account_type_2011_1_capital,f,
-lu_2011_account_106145,106145,Multirisques,lu_2011_account_10614,other,account_type_2011_1_capital,f,
-lu_2011_account_106148,106148,Autres primes d’assurances privées,lu_2011_account_10614,other,account_type_2011_1_capital,f,
-lu_2011_account_10615,10615,Cotisations,lu_2011_account_1061,view,account_type_2011_1_capital,f,
-lu_2011_account_106151,106151,Assurances sociales (assurance dépendance),lu_2011_account_10615,other,account_type_2011_1_capital,f,
-lu_2011_account_106152,106152,Allocations familiales,lu_2011_account_10615,other,account_type_2011_1_capital,f,
-lu_2011_account_106153,106153,Cotisations pour mutuelles,lu_2011_account_10615,other,account_type_2011_1_capital,f,
-lu_2011_account_106154,106154,"Caisse de décès, médico-chirurgicale, Prestaplus",lu_2011_account_10615,other,account_type_2011_1_capital,f,
-lu_2011_account_106158,106158,Autres cotisations,lu_2011_account_10615,other,account_type_2011_1_capital,f,
-lu_2011_account_10616,10616,Prélèvements en nature (quote-part privée dans les frais généraux),lu_2011_account_1061,view,account_type_2011_1_capital,f,
-lu_2011_account_106161,106161,Salaires,lu_2011_account_10616,other,account_type_2011_1_capital,f,
-lu_2011_account_106162,106162,Loyer,lu_2011_account_10616,other,account_type_2011_1_capital,f,
-lu_2011_account_106163,106163,"Chauffage, gaz, électricité",lu_2011_account_10616,other,account_type_2011_1_capital,f,
-lu_2011_account_106164,106164,Eau,lu_2011_account_10616,other,account_type_2011_1_capital,f,
-lu_2011_account_106165,106165,Téléphone,lu_2011_account_10616,other,account_type_2011_1_capital,f,
-lu_2011_account_106166,106166,Voiture,lu_2011_account_10616,other,account_type_2011_1_capital,f,
-lu_2011_account_106168,106168,Autres prélèvements en nature,lu_2011_account_10616,other,account_type_2011_1_capital,f,
-lu_2011_account_10617,10617,Acquisitions,lu_2011_account_1061,view,account_type_2011_1_capital,f,
-lu_2011_account_106171,106171,Mobilier privé,lu_2011_account_10617,other,account_type_2011_1_capital,f,
-lu_2011_account_106172,106172,Voiture privée,lu_2011_account_10617,other,account_type_2011_1_capital,f,
-lu_2011_account_106173,106173,Titres privés,lu_2011_account_10617,other,account_type_2011_1_capital,f,
-lu_2011_account_106174,106174,Immeubles privés,lu_2011_account_10617,other,account_type_2011_1_capital,f,
-lu_2011_account_106178,106178,Autres acquisitions,lu_2011_account_10617,other,account_type_2011_1_capital,f,
-lu_2011_account_10618,10618,Impôts,lu_2011_account_1061,view,account_type_2011_1_capital,f,
-lu_2011_account_106181,106181,Impôt sur le revenu payé,lu_2011_account_10618,other,account_type_2011_1_capital,f,
-lu_2011_account_106182,106182,Impôt sur la fortune payé,lu_2011_account_10618,other,account_type_2011_1_capital,f,
-lu_2011_account_106183,106183,Impôt commercial - arriérés payés,lu_2011_account_10618,other,account_type_2011_1_capital,f,
-lu_2011_account_106188,106188,Autres impôts,lu_2011_account_10618,other,account_type_2011_1_capital,f,
-lu_2011_account_10619,10619,Prélèvements privés particuliers,lu_2011_account_1061,view,account_type_2011_1_capital,f,
-lu_2011_account_106191,106191,Réparations aux immeubles privés,lu_2011_account_10619,other,account_type_2011_1_capital,f,
-lu_2011_account_106192,106192,Placements sur comptes financiers privés,lu_2011_account_10619,other,account_type_2011_1_capital,f,
-lu_2011_account_106193,106193,Remboursements de dettes privées,lu_2011_account_10619,other,account_type_2011_1_capital,f,
-lu_2011_account_106194,106194,Dons et dotations aux enfants,lu_2011_account_10619,other,account_type_2011_1_capital,f,
-lu_2011_account_106195,106195,Droits de succession et droits de mutation par décès,lu_2011_account_10619,other,account_type_2011_1_capital,f,
-lu_2011_account_106198,106198,Autres prélèvements privés particuliers,lu_2011_account_10619,other,account_type_2011_1_capital,f,
-lu_2011_account_1062,1062,Suppléments d’apports privés de l’exploitant ou des coexploitants,lu_2011_account_106,view,account_type_2011_1_capital,f,
-lu_2011_account_10621,10621,Héritage ou donation,lu_2011_account_1062,other,account_type_2011_1_capital,f,
-lu_2011_account_10622,10622,Avoirs privés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
-lu_2011_account_10623,10623,Emprunts privés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
-lu_2011_account_10624,10624,Cessions,lu_2011_account_1062,view,account_type_2011_1_capital,f,
-lu_2011_account_106241,106241,Mobilier privé,lu_2011_account_10624,other,account_type_2011_1_capital,f,
-lu_2011_account_106242,106242,Voiture privée,lu_2011_account_10624,other,account_type_2011_1_capital,f,
-lu_2011_account_106243,106243,Titres privés,lu_2011_account_10624,other,account_type_2011_1_capital,f,
-lu_2011_account_106244,106244,Immeubles privés,lu_2011_account_10624,other,account_type_2011_1_capital,f,
-lu_2011_account_106248,106248,Autres cessions,lu_2011_account_10624,other,account_type_2011_1_capital,f,
-lu_2011_account_10625,10625,Loyers encaissés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
-lu_2011_account_10626,10626,Salaires ou rentes touchés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
-lu_2011_account_10627,10627,Allocations familiales reçues,lu_2011_account_1062,other,account_type_2011_1_capital,f,
-lu_2011_account_10628,10628,Remboursements d’impôts,lu_2011_account_1062,view,account_type_2011_1_capital,f,
-lu_2011_account_106281,106281,Impôt sur le revenu,lu_2011_account_10628,other,account_type_2011_1_capital,f,
-lu_2011_account_106283,106283,Impôt sur la fortune,lu_2011_account_10628,other,account_type_2011_1_capital,f,
-lu_2011_account_106284,106284,Impôt commercial,lu_2011_account_10628,other,account_type_2011_1_capital,f,
-lu_2011_account_106288,106288,Autres remboursements d’impôts,lu_2011_account_10628,other,account_type_2011_1_capital,f,
-lu_2011_account_10629,10629,Quote-part professionnelle de frais privés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
-lu_2011_account_11,11,Primes d’émission et primes assimilées,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_69
-lu_2011_account_111,111,Primes d’émission,lu_2011_account_11,other,account_type_2011_1_capital,f,
-lu_2011_account_112,112,Primes de fusion,lu_2011_account_11,other,account_type_2011_1_capital,f,
-lu_2011_account_113,113,Primes d’apport,lu_2011_account_11,other,account_type_2011_1_capital,f,
-lu_2011_account_114,114,Primes de conversion d’obligations en actions,lu_2011_account_11,other,account_type_2011_1_capital,f,
-lu_2011_account_115,115,Apport en capitaux propres non rémunéré par des titres («Capital contribution»),lu_2011_account_11,other,account_type_2011_1_capital,f,
-lu_2011_account_12,12,Réserves de réévaluation,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_70
-lu_2011_account_121,121,Réserves de réévaluation en application de la juste valeur,lu_2011_account_12,other,account_type_2011_1_capital,f,
-lu_2011_account_122,122,Réserves de mise en équivalence (Participations valorisées suivant l’art. 58),lu_2011_account_12,other,account_type_2011_1_capital,f,
-lu_2011_account_123,123,Plus-values sur écarts de conversion immunisées,lu_2011_account_12,other,account_type_2011_1_capital,f,
-lu_2011_account_128,128,Autres réserves de réévaluation,lu_2011_account_12,other,account_type_2011_1_capital,f,
-lu_2011_account_13,13,Réserves,lu_2011_account_1,view,account_type_2011_1_capital,f,
-lu_2011_account_131,131,Réserve légale,lu_2011_account_13,other,account_type_2011_1_capital,f,account_financial_report_72
-lu_2011_account_132,132,Réserve pour actions propres ou parts propres,lu_2011_account_13,other,account_type_2011_1_capital,f,account_financial_report_73
-lu_2011_account_133,133,Réserves statutaires,lu_2011_account_13,other,account_type_2011_1_capital,f,account_financial_report_74
-lu_2011_account_138,138,Autres réserves,lu_2011_account_13,view,account_type_2011_1_capital,f,account_financial_report_75
-lu_2011_account_1381,1381,Réserve pour l’impôt sur la fortune,lu_2011_account_138,other,account_type_2011_1_capital,f,
-lu_2011_account_1382,1382,Autres réserves indisponibles,lu_2011_account_138,other,account_type_2011_1_capital,f,
-lu_2011_account_1383,1383,Autres réserves disponibles,lu_2011_account_138,other,account_type_2011_1_capital,f,
-lu_2011_account_14,14,Résultats,lu_2011_account_1,view,account_type_2011_1_capital,f,
-lu_2011_account_141,141,Résultats reportés,lu_2011_account_14,other,account_type_2011_1_capital,f,account_financial_report_76
-lu_2011_account_142,142,Résultat de l’exercice,lu_2011_account_14,other,account_type_2011_1_capital,f,account_financial_report_77
-lu_2011_account_15,15,Acomptes sur dividendes,lu_2011_account_1,other,account_type_2011_1_capital,f,account_financial_report_78
-lu_2011_account_16,16,Subventions d’investissement en capital,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_79
-lu_2011_account_161,161,Terrains et constructions,lu_2011_account_16,other,account_type_2011_1_capital,f,
-lu_2011_account_162,162,Installations techniques et machines,lu_2011_account_16,other,account_type_2011_1_capital,f,
-lu_2011_account_163,163,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_16,other,account_type_2011_1_capital,f,
-lu_2011_account_168,168,Autres subventions d’investissement en capital,lu_2011_account_16,other,account_type_2011_1_capital,f,
-lu_2011_account_17,17,Plus-values immunisées,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_80
-lu_2011_account_171,171,Plus-values immunisées à réinvestir,lu_2011_account_17,other,account_type_2011_1_capital,f,
-lu_2011_account_172,172,Plus-values immunisées réinvesties,lu_2011_account_17,other,account_type_2011_1_capital,f,
-lu_2011_account_18,18,Provisions,lu_2011_account_1,view,account_type_2011_1_provision,f,
-lu_2011_account_181,181,Provisions pour pensions et obligations similaires,lu_2011_account_18,other,account_type_2011_1_provision,f,account_financial_report_83
-lu_2011_account_182,182,Provisions pour impôts,lu_2011_account_18,view,account_type_2011_1_provision,f,account_financial_report_84
-lu_2011_account_1821,1821,Provisions pour impôt sur le revenu des collectivités,lu_2011_account_182,other,account_type_2011_1_provision,f,
-lu_2011_account_1822,1822,Provisions pour impôt commercial,lu_2011_account_182,other,account_type_2011_1_provision,f,
-lu_2011_account_1823,1823,Provisions pour impôt sur la fortune,lu_2011_account_182,other,account_type_2011_1_provision,f,
-lu_2011_account_1828,1828,Autres provisions pour impôts,lu_2011_account_182,other,account_type_2011_1_provision,f,
-lu_2011_account_183,183,Provisions pour impôts différés,lu_2011_account_18,other,account_type_2011_1_provision,f,
-lu_2011_account_188,188,Autres provisions,lu_2011_account_18,view,account_type_2011_1_provision,f,account_financial_report_85
-lu_2011_account_1881,1881,Provisions d’exploitation,lu_2011_account_188,other,account_type_2011_1_provision,f,
-lu_2011_account_1882,1882,Provisions financières,lu_2011_account_188,other,account_type_2011_1_provision,f,
-lu_2011_account_1883,1883,Provisions exceptionnelles,lu_2011_account_188,other,account_type_2011_1_provision,f,
-lu_2011_account_19,19,Dettes financières et dettes assimilées,lu_2011_account_1,view,account_type_2011_1_provision,f,
-lu_2011_account_191,191,Dettes subordonnées,lu_2011_account_19,view,account_type_2011_1_provision,f,account_financial_report_81
-lu_2011_account_1911,1911,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_191,view,account_type_2011_1_provision,f,
-lu_2011_account_19111,19111,Montant principal,lu_2011_account_1911,other,account_type_2011_1_provision,f,
-lu_2011_account_19112,19112,Intérêts courus,lu_2011_account_1911,other,account_type_2011_1_provision,f,
-lu_2011_account_1912,1912,dont la durée résiduelle est supérieure à un an,lu_2011_account_191,view,account_type_2011_1_provision,f,
-lu_2011_account_19121,19121,Montant principal,lu_2011_account_1912,other,account_type_2011_1_provision,f,
-lu_2011_account_19122,19122,Intérêts courus,lu_2011_account_1912,other,account_type_2011_1_provision,f,
-lu_2011_account_192,192,Emprunts obligataires convertibles,lu_2011_account_19,view,account_type_2011_1_provision,f,
-lu_2011_account_1921,1921,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_192,view,account_type_2011_1_provision,f,account_financial_report_89
-lu_2011_account_19211,19211,Montant principal,lu_2011_account_1921,other,account_type_2011_1_provision,f,
-lu_2011_account_19212,19212,Intérêts courus,lu_2011_account_1921,other,account_type_2011_1_provision,f,
-lu_2011_account_1922,1922,dont la durée résiduelle est supérieure à un an,lu_2011_account_192,view,account_type_2011_1_provision,f,account_financial_report_90
-lu_2011_account_19221,19221,Montant principal,lu_2011_account_1922,other,account_type_2011_1_provision,f,
-lu_2011_account_19222,19222,Intérêts courus,lu_2011_account_1922,other,account_type_2011_1_provision,f,
-lu_2011_account_193,193,Emprunts obligataires non convertibles,lu_2011_account_19,view,account_type_2011_1_provision,f,
-lu_2011_account_1931,1931,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_193,view,account_type_2011_1_provision,f,account_financial_report_92
-lu_2011_account_19311,19311,Montant principal,lu_2011_account_1931,other,account_type_2011_1_provision,f,
-lu_2011_account_19312,19312,Intérêts courus,lu_2011_account_1931,other,account_type_2011_1_provision,f,
-lu_2011_account_1932,1932,dont la durée résiduelle est supérieure à un an,lu_2011_account_193,view,account_type_2011_1_provision,f,account_financial_report_93
-lu_2011_account_19321,19321,Montant principal,lu_2011_account_1932,other,account_type_2011_1_provision,f,
-lu_2011_account_19322,19322,Intérêts courus,lu_2011_account_1932,other,account_type_2011_1_provision,f,
-lu_2011_account_194,194,Dettes envers des établissements de crédit,lu_2011_account_19,view,account_type_2011_1_provision,f,
-lu_2011_account_1941,1941,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_194,view,account_type_2011_1_provision,f,account_financial_report_95
-lu_2011_account_19411,19411,Montant principal,lu_2011_account_1941,other,account_type_2011_1_provision,f,
-lu_2011_account_19412,19412,Intérêts courus,lu_2011_account_1941,other,account_type_2011_1_provision,f,
-lu_2011_account_1942,1942,dont la durée résiduelle est supérieure à un an,lu_2011_account_194,view,account_type_2011_1_provision,f,account_financial_report_96
-lu_2011_account_19421,19421,Montant principal,lu_2011_account_1942,other,account_type_2011_1_provision,f,
-lu_2011_account_19422,19422,Intérêts courus,lu_2011_account_1942,other,account_type_2011_1_provision,f,
-lu_2011_account_195,195,Dettes de leasing financier,lu_2011_account_19,view,account_type_2011_1_provision,f,
-lu_2011_account_1951,1951,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_195,other,account_type_2011_1_provision,f,
-lu_2011_account_1952,1952,dont la durée résiduelle est supérieure à un an,lu_2011_account_195,other,account_type_2011_1_provision,f,
-lu_2011_account_198,198,Autres emprunts et dettes assimilées,lu_2011_account_19,view,account_type_2011_1_provision,f,
-lu_2011_account_1981,1981,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_198,view,account_type_2011_1_provision,f,
-lu_2011_account_19811,19811,Autres emprunts,lu_2011_account_1981,other,account_type_2011_1_provision,f,
-lu_2011_account_19812,19812,Rentes viagères capitalisées,lu_2011_account_1981,other,account_type_2011_1_provision,f,
-lu_2011_account_19813,19813,Autres dettes assimilées,lu_2011_account_1981,other,account_type_2011_1_provision,f,
-lu_2011_account_19814,19814,Intérêts courus sur autres emprunts et dettes assimilées,lu_2011_account_1981,other,account_type_2011_1_provision,f,
-lu_2011_account_1982,1982,dont la durée résiduelle est supérieure à un an,lu_2011_account_198,view,account_type_2011_1_provision,f,
-lu_2011_account_19821,19821,Autres emprunts,lu_2011_account_1982,other,account_type_2011_1_provision,f,
-lu_2011_account_19822,19822,Rentes viagères capitalisées,lu_2011_account_1982,other,account_type_2011_1_provision,f,
-lu_2011_account_19823,19823,Autres dettes assimilées,lu_2011_account_1982,other,account_type_2011_1_provision,f,
-lu_2011_account_19824,19824,Intérêts courus sur autres emprunts et dettes assimilées,lu_2011_account_1982,other,account_type_2011_1_provision,f,
-lu_2011_account_2,2,CLASSE 2 - COMPTES DE FRAIS D’ETABLISSEMENT ET D’ACTIFS IMMOBILISES,lu_2011_account_bilan,view,account.data_account_type_view,f,
-lu_2011_account_20,20,Frais d’établissement et frais assimilés,lu_2011_account_2,view,account_type_2011_2_immo,f,account_financial_report_19
-lu_2011_account_201,201,Frais de constitution,lu_2011_account_20,other,account_type_2011_2_immo,f,
-lu_2011_account_202,202,Frais de premier établissement,lu_2011_account_20,view,account_type_2011_2_immo,f,
-lu_2011_account_2021,2021,Frais de prospection,lu_2011_account_202,other,account_type_2011_2_immo,f,
-lu_2011_account_2022,2022,Frais de publicité,lu_2011_account_202,other,account_type_2011_2_immo,f,
-lu_2011_account_203,203,"Frais d’augmentation de capital et d’opérations diverses (fusions, scissions, transformations)",lu_2011_account_20,other,account_type_2011_2_immo,f,
-lu_2011_account_204,204,Frais d’émission d’emprunts,lu_2011_account_20,other,account_type_2011_2_immo,f,
-lu_2011_account_208,208,Autres frais assimilés,lu_2011_account_20,other,account_type_2011_2_immo,f,
-lu_2011_account_21,21,Immobilisations incorporelles,lu_2011_account_2,view,account_type_2011_2_immo,f,
-lu_2011_account_211,211,Frais de recherche et de développement,lu_2011_account_21,other,account_type_2011_2_immo,f,account_financial_report_22
-lu_2011_account_212,212,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_21,view,account_type_2011_2_immo,f,
-lu_2011_account_2121,2121,Acquis à titre onéreux (Actifs incorporels non produits),lu_2011_account_212,view,account_type_2011_2_immo,f,account_financial_report_24
-lu_2011_account_21211,21211,Concessions,lu_2011_account_2121,other,account_type_2011_2_immo,f,
-lu_2011_account_21212,21212,Brevets,lu_2011_account_2121,other,account_type_2011_2_immo,f,
-lu_2011_account_21213,21213,Licences informatiques (logiciels et progiciels informatiques),lu_2011_account_2121,other,account_type_2011_2_immo,f,
-lu_2011_account_21214,21214,Marques et franchises,lu_2011_account_2121,other,account_type_2011_2_immo,f,
-lu_2011_account_21215,21215,Droits et valeurs similaires acquis à titre onéreux,lu_2011_account_2121,view,account_type_2011_2_immo,f,
-lu_2011_account_212151,212151,Droits d’auteur et de reproduction,lu_2011_account_21215,other,account_type_2011_2_immo,f,
-lu_2011_account_212152,212152,Droits d’émission,lu_2011_account_21215,other,account_type_2011_2_immo,f,
-lu_2011_account_212158,212158,Autres droits et valeurs similaires acquis à titre onéreux,lu_2011_account_21215,other,account_type_2011_2_immo,f,
-lu_2011_account_2122,2122,Créés par l’entreprise elle-même (Actifs incorporels produits),lu_2011_account_212,view,account_type_2011_2_immo,f,account_financial_report_25
-lu_2011_account_21221,21221,Concessions,lu_2011_account_2122,other,account_type_2011_2_immo,f,
-lu_2011_account_21222,21222,Brevets,lu_2011_account_2122,other,account_type_2011_2_immo,f,
-lu_2011_account_21223,21223,Licences informatiques (logiciels et progiciels informatiques),lu_2011_account_2122,other,account_type_2011_2_immo,f,
-lu_2011_account_21224,21224,Marques et franchises,lu_2011_account_2122,other,account_type_2011_2_immo,f,
-lu_2011_account_21225,21225,Droits et valeurs similaires créés par l’entreprise elle-même,lu_2011_account_2122,view,account_type_2011_2_immo,f,
-lu_2011_account_212251,212251,Droits d’auteur et de reproduction,lu_2011_account_21225,other,account_type_2011_2_immo,f,
-lu_2011_account_212252,212252,Droits d’émission,lu_2011_account_21225,other,account_type_2011_2_immo,f,
-lu_2011_account_212258,212258,Autres droits et valeurs similaires créés par l’entreprise elle-même,lu_2011_account_21225,other,account_type_2011_2_immo,f,
-lu_2011_account_213,213,"Fonds de commerce, dans la mesure où il a été acquis à titre onéreux",lu_2011_account_21,other,account_type_2011_2_immo,f,account_financial_report_26
-lu_2011_account_214,214,Acomptes versés et immobilisations incorporelles en cours,lu_2011_account_21,view,account_type_2011_2_immo,f,account_financial_report_27
-lu_2011_account_2141,2141,Frais de recherche et de développement,lu_2011_account_214,other,account_type_2011_2_immo,f,
-lu_2011_account_2142,2142,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_214,other,account_type_2011_2_immo,f,
-lu_2011_account_2143,2143,Fonds de commerce,lu_2011_account_214,other,account_type_2011_2_immo,f,
-lu_2011_account_22,22,Immobilisations corporelles,lu_2011_account_2,view,account_type_2011_2_immo,f,
-lu_2011_account_221,221,Terrains et constructions,lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_29
-lu_2011_account_2211,2211,Terrains,lu_2011_account_221,view,account_type_2011_2_immo,f,
-lu_2011_account_22111,22111,Terrains nus,lu_2011_account_2211,other,account_type_2011_2_immo,f,
-lu_2011_account_22112,22112,Terrains aménagés,lu_2011_account_2211,other,account_type_2011_2_immo,f,
-lu_2011_account_22113,22113,Sous-sols et sursols,lu_2011_account_2211,other,account_type_2011_2_immo,f,
-lu_2011_account_22114,22114,Terrains de gisement,lu_2011_account_2211,other,account_type_2011_2_immo,f,
-lu_2011_account_22115,22115,Terrains bâtis,lu_2011_account_2211,other,account_type_2011_2_immo,f,
-lu_2011_account_22118,22118,Autres terrains,lu_2011_account_2211,other,account_type_2011_2_immo,f,
-lu_2011_account_2212,2212,Agencements et aménagements de terrains,lu_2011_account_221,view,account_type_2011_2_immo,f,
-lu_2011_account_22121,22121,Agencements et aménagements de terrains nus,lu_2011_account_2212,other,account_type_2011_2_immo,f,
-lu_2011_account_22122,22122,Agencements et aménagements de terrains aménagés,lu_2011_account_2212,other,account_type_2011_2_immo,f,
-lu_2011_account_22123,22123,Agencements et aménagements de sous-sols et sursols,lu_2011_account_2212,other,account_type_2011_2_immo,f,
-lu_2011_account_22124,22124,Agencements et aménagements de terrains de gisement,lu_2011_account_2212,other,account_type_2011_2_immo,f,
-lu_2011_account_22125,22125,Agencements et aménagements de terrains bâtis,lu_2011_account_2212,other,account_type_2011_2_immo,f,
-lu_2011_account_22128,22128,Agencements et aménagements d’autres terrains,lu_2011_account_2212,other,account_type_2011_2_immo,f,
-lu_2011_account_2213,2213,Constructions,lu_2011_account_221,view,account_type_2011_2_immo,f,
-lu_2011_account_22131,22131,Constructions sur sol propre,lu_2011_account_2213,other,account_type_2011_2_immo,f,
-lu_2011_account_22132,22132,Constructions sur sol d’autrui,lu_2011_account_2213,other,account_type_2011_2_immo,f,
-lu_2011_account_222,222,Installations techniques et machines,lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_30
-lu_2011_account_2221,2221,Installations techniques,lu_2011_account_222,other,account_type_2011_2_immo,f,
-lu_2011_account_2222,2222,Machines,lu_2011_account_222,other,account_type_2011_2_immo,f,
-lu_2011_account_223,223,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_31
-lu_2011_account_2231,2231,Equipement de transport et de manutention,lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_2232,2232,Véhicules de transport,lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_2233,2233,Outillage,lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_2234,2234,Mobilier,lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_2235,2235,Matériel informatique (hardware),lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_2236,2236,Cheptel,lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_2237,2237,Emballages récupérables,lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_2238,2238,Autres installations,lu_2011_account_223,other,account_type_2011_2_immo,f,
-lu_2011_account_224,224,Acomptes versés et immobilisations corporelles en cours,lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_32
-lu_2011_account_2241,2241,Terrains et constructions,lu_2011_account_224,view,account_type_2011_2_immo,f,
-lu_2011_account_22411,22411,Terrains,lu_2011_account_2241,other,account_type_2011_2_immo,f,
-lu_2011_account_22412,22412,Agencements et aménagements de terrains,lu_2011_account_2241,other,account_type_2011_2_immo,f,
-lu_2011_account_22413,22413,Constructions,lu_2011_account_2241,other,account_type_2011_2_immo,f,
-lu_2011_account_2242,2242,Installations techniques et machines,lu_2011_account_224,other,account_type_2011_2_immo,f,
-lu_2011_account_2243,2243,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_224,other,account_type_2011_2_immo,f,
-lu_2011_account_23,23,Immobilisations financières,lu_2011_account_2,view,account_type_2011_2_immo,f,
-lu_2011_account_231,231,Parts dans des entreprises liées,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_34
-lu_2011_account_232,232,Créances sur des entreprises liées,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_35
-lu_2011_account_233,233,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_36
-lu_2011_account_234,234,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_37
-lu_2011_account_235,235,Titres ayant le caractère d’immobilisations,lu_2011_account_23,view,account_type_2011_2_immo,f,account_financial_report_38
-lu_2011_account_2351,2351,Titres immobilisés (droit de propriété),lu_2011_account_235,view,account_type_2011_2_immo,f,
-lu_2011_account_23511,23511,Actions,lu_2011_account_2351,other,account_type_2011_2_immo,f,
-lu_2011_account_23518,23518,Autres titres immobilisés (droit de propriété),lu_2011_account_2351,other,account_type_2011_2_immo,f,
-lu_2011_account_2352,2352,Titres immobilisés (droit de créance),lu_2011_account_235,view,account_type_2011_2_immo,f,
-lu_2011_account_23521,23521,Obligations,lu_2011_account_2352,other,account_type_2011_2_immo,f,
-lu_2011_account_23528,23528,Autres titres immobilisés (droit de créance),lu_2011_account_2352,other,account_type_2011_2_immo,f,
-lu_2011_account_2358,2358,Autres titres ayant le caractère d’immobilisations,lu_2011_account_235,other,account_type_2011_2_immo,f,
-lu_2011_account_236,236,Prêts et créances immobilisées,lu_2011_account_23,view,account_type_2011_2_immo,f,account_financial_report_39
-lu_2011_account_2361,2361,Prêts,lu_2011_account_236,view,account_type_2011_2_immo,f,
-lu_2011_account_23611,23611,Prêts participatifs,lu_2011_account_2361,other,account_type_2011_2_immo,f,
-lu_2011_account_23612,23612,Prêts aux associés,lu_2011_account_2361,other,account_type_2011_2_immo,f,
-lu_2011_account_23613,23613,Prêts au personnel,lu_2011_account_2361,other,account_type_2011_2_immo,f,
-lu_2011_account_23618,23618,Autres prêts,lu_2011_account_2361,other,account_type_2011_2_immo,f,
-lu_2011_account_2362,2362,Dépôts et cautionnements versés,lu_2011_account_236,view,account_type_2011_2_immo,f,
-lu_2011_account_23621,23621,Dépôts,lu_2011_account_2362,other,account_type_2011_2_immo,f,
-lu_2011_account_23622,23622,Cautionnements,lu_2011_account_2362,other,account_type_2011_2_immo,f,
-lu_2011_account_2363,2363,Créances immobilisées,lu_2011_account_236,other,account_type_2011_2_immo,f,
-lu_2011_account_237,237,Actions propres ou parts propres,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_40
-lu_2011_account_3,3,CLASSE 3 - COMPTES DE STOCKS,lu_2011_account_bilan,view,account.data_account_type_view,f,
-lu_2011_account_30,30,Matières premières et consommables,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_43
-lu_2011_account_301,301,Matières premières,lu_2011_account_30,other,account_type_2011_3_stock,f,
-lu_2011_account_302,302,Matières consommables,lu_2011_account_30,other,account_type_2011_3_stock,f,
-lu_2011_account_303,303,Fournitures consommables,lu_2011_account_30,view,account_type_2011_3_stock,f,
-lu_2011_account_3031,3031,Combustibles,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_3032,3032,Produits d’entretien,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_3033,3033,Fournitures d’atelier et d’usine,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_3034,3034,Fournitures de magasin,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_3035,3035,Fournitures de bureau,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_3036,3036,Carburants,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_3037,3037,Lubrifiants,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_3038,3038,Autres fournitures consommables,lu_2011_account_303,other,account_type_2011_3_stock,f,
-lu_2011_account_304,304,Emballages,lu_2011_account_30,view,account_type_2011_3_stock,f,
-lu_2011_account_3041,3041,Emballages non-récupérables,lu_2011_account_304,other,account_type_2011_3_stock,f,
-lu_2011_account_3042,3042,Emballages récupérables,lu_2011_account_304,other,account_type_2011_3_stock,f,
-lu_2011_account_3043,3043,Emballages à usage mixte,lu_2011_account_304,other,account_type_2011_3_stock,f,
-lu_2011_account_305,305,Approvisionnements,lu_2011_account_30,other,account_type_2011_3_stock,f,
-lu_2011_account_31,31,Produits en cours de fabrication et commandes en cours,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_44
-lu_2011_account_311,311,Produits en cours de fabrication,lu_2011_account_31,other,account_type_2011_3_stock,f,
-lu_2011_account_312,312,Commandes en cours – Produits,lu_2011_account_31,other,account_type_2011_3_stock,f,
-lu_2011_account_313,313,Commandes en cours – Prestations de services,lu_2011_account_31,other,account_type_2011_3_stock,f,
-lu_2011_account_314,314,Immeubles en construction,lu_2011_account_31,other,account_type_2011_3_stock,f,
-lu_2011_account_32,32,Produits finis et marchandises,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_45
-lu_2011_account_321,321,Produits finis,lu_2011_account_32,other,account_type_2011_3_stock,f,
-lu_2011_account_322,322,Produits intermédiaires,lu_2011_account_32,other,account_type_2011_3_stock,f,
-lu_2011_account_323,323,Produits résiduels,lu_2011_account_32,view,account_type_2011_3_stock,f,
-lu_2011_account_3231,3231,Déchets,lu_2011_account_323,other,account_type_2011_3_stock,f,
-lu_2011_account_3232,3232,Rebuts,lu_2011_account_323,other,account_type_2011_3_stock,f,
-lu_2011_account_3233,3233,Matières de récupération,lu_2011_account_323,other,account_type_2011_3_stock,f,
-lu_2011_account_326,326,Marchandises,lu_2011_account_32,other,account_type_2011_3_stock,f,
-lu_2011_account_327,327,"Marchandises en voie d’acheminement, mises en dépôt ou données en consignation",lu_2011_account_32,other,account_type_2011_3_stock,f,
-lu_2011_account_33,33,Terrains et immeubles destinés à la revente,lu_2011_account_3,view,account_type_2011_3_stock,f,
-lu_2011_account_331,331,Terrains,lu_2011_account_33,other,account_type_2011_3_stock,f,
-lu_2011_account_332,332,Immeubles,lu_2011_account_33,view,account_type_2011_3_stock,f,
-lu_2011_account_3321,3321,Immeubles acquis,lu_2011_account_332,other,account_type_2011_3_stock,f,
-lu_2011_account_3322,3322,Immeubles construits,lu_2011_account_332,other,account_type_2011_3_stock,f,
-lu_2011_account_34,34,Acomptes versés,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_46
-lu_2011_account_341,341,Acomptes versés sur matières premières et consommables,lu_2011_account_34,other,account_type_2011_3_stock,f,
-lu_2011_account_342,342,Acomptes versés sur produits en cours de fabrication et commandes en cours,lu_2011_account_34,other,account_type_2011_3_stock,f,
-lu_2011_account_343,343,Acomptes versés sur produits finis et marchandises,lu_2011_account_34,other,account_type_2011_3_stock,f,
-lu_2011_account_344,344,Acomptes versés sur terrains et immeubles destinés à la revente,lu_2011_account_34,other,account_type_2011_3_stock,f,
-lu_2011_account_4,4,CLASSE 4 - COMPTES DE TIERS,lu_2011_account_bilan,view,account.data_account_type_view,f,
-lu_2011_account_40,40,Créances résultant de ventes et prestations de services,lu_2011_account_4,view,account_type_2011_4_creance,f,
-lu_2011_account_401,401,Créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_40,view,account_type_2011_4_creance,f,account_financial_report_49
-lu_2011_account_4011,4011,Clients,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4012,4012,Clients – Effets à recevoir,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4013,4013,Clients douteux ou litigieux,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4014,4014,Clients – Factures à établir,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4015,4015,Clients créditeurs,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4019,4019,Corrections de valeur,lu_2011_account_401,other,account_type_2011_4_creance,f,
-lu_2011_account_402,402,Créances dont la durée résiduelle est supérieure à un an,lu_2011_account_40,view,account_type_2011_4_creance,f,account_financial_report_50
-lu_2011_account_4021,4021,Clients,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4022,4022,Clients – Effets à recevoir,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4023,4023,Clients douteux ou litigieux,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4024,4024,Clients – Factures à établir,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4025,4025,Clients créditeurs,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
-lu_2011_account_4029,4029,Corrections de valeur,lu_2011_account_402,other,account_type_2011_4_creance,f,
-lu_2011_account_41,41,Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_4,view,account_type_2011_4_creance,f,
-lu_2011_account_411,411,Créances sur des entreprises liées,lu_2011_account_41,view,account_type_2011_4_creance,f,
-lu_2011_account_4111,4111,Créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_411,view,account_type_2011_4_creance,f,account_financial_report_52
-lu_2011_account_41111,41111,Ventes de marchandises et de prestations de services,lu_2011_account_4111,other,account_type_2011_4_creance,f,
-lu_2011_account_41112,41112,Prêts et avances,lu_2011_account_4111,other,account_type_2011_4_creance,f,
-lu_2011_account_41113,41113,Intérêts courus,lu_2011_account_4111,other,account_type_2011_4_creance,f,
-lu_2011_account_41114,41114,Dividendes à recevoir,lu_2011_account_4111,other,account_type_2011_4_creance,f,
-lu_2011_account_41118,41118,Autres créances,lu_2011_account_4111,other,account_type_2011_4_creance,f,
-lu_2011_account_41119,41119,Corrections de valeur,lu_2011_account_4111,other,account_type_2011_4_creance,f,
-lu_2011_account_4112,4112,Créances dont la durée résiduelle est supérieure à un an,lu_2011_account_411,view,account_type_2011_4_creance,f,account_financial_report_53
-lu_2011_account_41121,41121,Ventes de marchandises et de prestations de services,lu_2011_account_4112,other,account_type_2011_4_creance,f,
-lu_2011_account_41122,41122,Prêts et avances,lu_2011_account_4112,other,account_type_2011_4_creance,f,
-lu_2011_account_41123,41123,Intérêts courus,lu_2011_account_4112,other,account_type_2011_4_creance,f,
-lu_2011_account_41124,41124,Dividendes à recevoir,lu_2011_account_4112,other,account_type_2011_4_creance,f,
-lu_2011_account_41128,41128,Autres créances,lu_2011_account_4112,other,account_type_2011_4_creance,f,
-lu_2011_account_41129,41129,Corrections de valeur,lu_2011_account_4112,other,account_type_2011_4_creance,f,
-lu_2011_account_412,412,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_41,view,account_type_2011_4_creance,f,
-lu_2011_account_4121,4121,Créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_412,view,account_type_2011_4_creance,f,account_financial_report_55
-lu_2011_account_41211,41211,Ventes de marchandises et de prestations de service,lu_2011_account_4121,other,account_type_2011_4_creance,f,
-lu_2011_account_41212,41212,Prêts et avances,lu_2011_account_4121,other,account_type_2011_4_creance,f,
-lu_2011_account_41213,41213,Intérêts courus,lu_2011_account_4121,other,account_type_2011_4_creance,f,
-lu_2011_account_41214,41214,Dividendes à recevoir,lu_2011_account_4121,other,account_type_2011_4_creance,f,
-lu_2011_account_41218,41218,Autres créances,lu_2011_account_4121,other,account_type_2011_4_creance,f,
-lu_2011_account_41219,41219,Corrections de valeur,lu_2011_account_4121,other,account_type_2011_4_creance,f,
-lu_2011_account_4122,4122,Créances dont la durée résiduelle est supérieure à un an,lu_2011_account_412,view,account_type_2011_4_creance,f,account_financial_report_56
-lu_2011_account_41221,41221,Ventes de marchandises et de prestations de service,lu_2011_account_4122,other,account_type_2011_4_creance,f,
-lu_2011_account_41222,41222,Prêts et avances,lu_2011_account_4122,other,account_type_2011_4_creance,f,
-lu_2011_account_41223,41223,Intérêts courus,lu_2011_account_4122,other,account_type_2011_4_creance,f,
-lu_2011_account_41224,41224,Dividendes à recevoir,lu_2011_account_4122,other,account_type_2011_4_creance,f,
-lu_2011_account_41228,41228,Autres créances,lu_2011_account_4122,other,account_type_2011_4_creance,f,
-lu_2011_account_41229,41229,Corrections de valeur,lu_2011_account_4122,other,account_type_2011_4_creance,f,
-lu_2011_account_42,42,Autres créances,lu_2011_account_4,view,account_type_2011_4_creance,f,
-lu_2011_account_421,421,Autres créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_42,view,account_type_2011_4_creance,f,account_financial_report_58
-lu_2011_account_4211,4211,Personnel – Avances et acomptes,lu_2011_account_421,view,account_type_2011_4_creance,f,
-lu_2011_account_42111,42111,Avances et acomptes,lu_2011_account_4211,other,account_type_2011_4_creance,f,
-lu_2011_account_42119,42119,Corrections de valeur,lu_2011_account_4211,other,account_type_2011_4_creance,f,
-lu_2011_account_4212,4212,Créances sur associés ou actionnaires,lu_2011_account_421,view,account_type_2011_4_creance,f,
-lu_2011_account_42121,42121,Montant principal,lu_2011_account_4212,other,account_type_2011_4_creance,f,
-lu_2011_account_42122,42122,Intérêts courus,lu_2011_account_4212,other,account_type_2011_4_creance,f,
-lu_2011_account_42129,42129,Corrections de valeur sur créances,lu_2011_account_4212,other,account_type_2011_4_creance,f,
-lu_2011_account_4213,4213,Etat – Subventions à recevoir,lu_2011_account_421,view,account_type_2011_4_creance,f,
-lu_2011_account_42131,42131,Subventions d’investissement,lu_2011_account_4213,other,account_type_2011_4_creance,f,
-lu_2011_account_42132,42132,Subventions d’exploitation,lu_2011_account_4213,other,account_type_2011_4_creance,f,
-lu_2011_account_42138,42138,Autres subventions,lu_2011_account_4213,other,account_type_2011_4_creance,f,
-lu_2011_account_4214,4214,Administration des Contributions Directes (ACD),lu_2011_account_421,other,account_type_2011_4_creance,f,
-lu_2011_account_4215,4215,Administration des Douanes et Accises (ADA),lu_2011_account_421,other,account_type_2011_4_creance,f,
-lu_2011_account_4216,4216,Administration de l’Enregistrement et des Domaines (AED),lu_2011_account_421,view,account_type_2011_4_creance,f,
-lu_2011_account_42161,42161,Taxe sur la valeur ajoutée – TVA,lu_2011_account_4216,view,account_type_2011_4_creance,f,
-lu_2011_account_421611,421611,TVA en amont,lu_2011_account_42161,other,account_type_2011_4_creance,f,
-lu_2011_account_421612,421612,TVA à recevoir,lu_2011_account_42161,other,account_type_2011_4_creance,f,
-lu_2011_account_421613,421613,TVA acomptes versés,lu_2011_account_42161,other,account_type_2011_4_creance,f,
-lu_2011_account_421618,421618,TVA – Autres créances,lu_2011_account_42161,other,account_type_2011_4_creance,f,
-lu_2011_account_42162,42162,Impôts indirects,lu_2011_account_4216,view,account_type_2011_4_creance,f,
-lu_2011_account_421621,421621,Droits d’enregistrement,lu_2011_account_42162,other,account_type_2011_4_creance,f,
-lu_2011_account_421622,421622,Taxe d’abonnement,lu_2011_account_42162,other,account_type_2011_4_creance,f,
-lu_2011_account_421623,421623,Droits d’hypothèques,lu_2011_account_42162,other,account_type_2011_4_creance,f,
-lu_2011_account_421624,421624,Droits de timbre,lu_2011_account_42162,other,account_type_2011_4_creance,f,
-lu_2011_account_421628,421628,Autres impôts indirects,lu_2011_account_42162,other,account_type_2011_4_creance,f,
-lu_2011_account_42168,42168,AED – Autres créances,lu_2011_account_4216,other,account_type_2011_4_creance,f,
-lu_2011_account_4217,4217,Créances sur la sécurité sociale et autres organismes sociaux,lu_2011_account_421,view,account_type_2011_4_creance,f,
-lu_2011_account_42171,42171,Centre Commun de Sécurité Sociale,lu_2011_account_4217,other,account_type_2011_4_creance,f,
-lu_2011_account_42172,42172,Mutualité des employeurs,lu_2011_account_4217,other,account_type_2011_4_creance,f,
-lu_2011_account_42178,42178,Autres organismes sociaux,lu_2011_account_4217,other,account_type_2011_4_creance,f,
-lu_2011_account_4218,4218,Créances diverses,lu_2011_account_421,view,account_type_2011_4_creance,f,
-lu_2011_account_42181,42181,Impôts étrangers,lu_2011_account_4218,view,account_type_2011_4_creance,f,
-lu_2011_account_421811,421811,TVA étrangères,lu_2011_account_42181,other,account_type_2011_4_creance,f,
-lu_2011_account_421818,421818,Autres impôts étrangers,lu_2011_account_42181,other,account_type_2011_4_creance,f,
-lu_2011_account_42188,42188,Autres créances diverses,lu_2011_account_4218,other,account_type_2011_4_creance,f,
-lu_2011_account_42189,42189,Corrections de valeur,lu_2011_account_4218,other,account_type_2011_4_creance,f,
-lu_2011_account_422,422,Autres créances dont la durée résiduelle est supérieure à un an,lu_2011_account_42,view,account_type_2011_4_creance,f,account_financial_report_59
-lu_2011_account_4221,4221,Personnel – Avances et acomptes,lu_2011_account_422,view,account_type_2011_4_creance,f,
-lu_2011_account_42211,42211,Avances et acomptes,lu_2011_account_4221,other,account_type_2011_4_creance,f,
-lu_2011_account_42219,42219,Corrections de valeur,lu_2011_account_4221,other,account_type_2011_4_creance,f,
-lu_2011_account_4222,4222,Associés ou actionnaires,lu_2011_account_422,view,account_type_2011_4_creance,f,
-lu_2011_account_42221,42221,Montant principal,lu_2011_account_4222,other,account_type_2011_4_creance,f,
-lu_2011_account_42222,42222,Intérêts courus,lu_2011_account_4222,other,account_type_2011_4_creance,f,
-lu_2011_account_42229,42229,Corrections de valeur sur créances,lu_2011_account_4222,other,account_type_2011_4_creance,f,
-lu_2011_account_4223,4223,Etat – Subventions à recevoir,lu_2011_account_422,view,account_type_2011_4_creance,f,
-lu_2011_account_42231,42231,Subventions d’investissement,lu_2011_account_4223,other,account_type_2011_4_creance,f,
-lu_2011_account_42232,42232,Subventions d’exploitation,lu_2011_account_4223,other,account_type_2011_4_creance,f,
-lu_2011_account_42238,42238,Autres subventions,lu_2011_account_4223,other,account_type_2011_4_creance,f,
-lu_2011_account_4224,4224,Administration des Contributions Directes (ACD),lu_2011_account_422,other,account_type_2011_4_creance,f,
-lu_2011_account_4225,4225,Administration des Douanes et Accises (ADA),lu_2011_account_422,other,account_type_2011_4_creance,f,
-lu_2011_account_4226,4226,Administration de l’Enregistrement et des Domaines (AED),lu_2011_account_422,view,account_type_2011_4_creance,f,
-lu_2011_account_42261,42261,Taxe sur la valeur ajoutée – TVA,lu_2011_account_4226,view,account_type_2011_4_creance,f,
-lu_2011_account_422611,422611,TVA en amont,lu_2011_account_42261,view,account_type_2011_4_creance,f,
-lu_2011_account_4226111,4226111,TVA en amont – Pays,lu_2011_account_422611,other,account_type_2011_4_creance,f,
-lu_2011_account_4226112,4226112,TVA en amont – Intracommunautaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
-lu_2011_account_4226113,4226113,TVA en amont – Triangulaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
-lu_2011_account_4226114,4226114,TVA en amont – Exonérations spéciales,lu_2011_account_422611,other,account_type_2011_4_creance,f,
-lu_2011_account_422612,422612,TVA à recevoir,lu_2011_account_42261,other,account_type_2011_4_creance,f,
-lu_2011_account_422613,422613,TVA acomptes versés,lu_2011_account_42261,other,account_type_2011_4_creance,f,
-lu_2011_account_422618,422618,TVA – Autres créances,lu_2011_account_42261,other,account_type_2011_4_creance,f,
-lu_2011_account_42262,42262,Impôts indirects,lu_2011_account_4226,view,account_type_2011_4_creance,f,
-lu_2011_account_422621,422621,Droits d’enregistrement,lu_2011_account_42262,other,account_type_2011_4_creance,f,
-lu_2011_account_422622,422622,Taxe d’abonnement,lu_2011_account_42262,other,account_type_2011_4_creance,f,
-lu_2011_account_422623,422623,Droits d’hypothèques,lu_2011_account_42262,other,account_type_2011_4_creance,f,
-lu_2011_account_422624,422624,Droits de timbre,lu_2011_account_42262,other,account_type_2011_4_creance,f,
-lu_2011_account_422628,422628,Autres impôts indirects,lu_2011_account_42262,other,account_type_2011_4_creance,f,
-lu_2011_account_4227,4227,Créances sur la sécurité sociale et autres organismes sociaux,lu_2011_account_422,view,account_type_2011_4_creance,f,
-lu_2011_account_42271,42271,Centre Commun de Sécurité Sociale,lu_2011_account_4227,other,account_type_2011_4_creance,f,
-lu_2011_account_42272,42272,Mutualité des employeurs,lu_2011_account_4227,other,account_type_2011_4_creance,f,
-lu_2011_account_42278,42278,Autres organismes sociaux,lu_2011_account_4227,other,account_type_2011_4_creance,f,
-lu_2011_account_4228,4228,Créances diverses,lu_2011_account_422,view,account_type_2011_4_creance,f,
-lu_2011_account_42281,42281,Impôts étrangers,lu_2011_account_4228,view,account_type_2011_4_creance,f,
-lu_2011_account_422811,422811,TVA étrangères,lu_2011_account_42281,other,account_type_2011_4_creance,f,
-lu_2011_account_422818,422818,Autres impôts étrangers,lu_2011_account_42281,other,account_type_2011_4_creance,f,
-lu_2011_account_42288,42288,Autres créances diverses,lu_2011_account_4228,other,account_type_2011_4_creance,f,
-lu_2011_account_42289,42289,Corrections de valeur sur autres créances diverses,lu_2011_account_4228,other,account_type_2011_4_creance,f,
-lu_2011_account_43,43,Acomptes reçus sur commandes pour autant qu’ils ne sont pas déduits des stocks de façon distincte,lu_2011_account_4,view,account_type_2011_4_dette,f,
-lu_2011_account_431,431,Acomptes reçus dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_43,other,account_type_2011_4_dette,f,account_financial_report_98
-lu_2011_account_432,432,Acomptes reçus dont la durée résiduelle est supérieure à un an,lu_2011_account_43,other,account_type_2011_4_dette,f,account_financial_report_99
-lu_2011_account_44,44,Dettes sur achats et prestations de services et dettes représentées par des effets de commerce,lu_2011_account_4,view,account_type_2011_4_dette,f,
-lu_2011_account_441,441,Dettes sur achats et prestations de services,lu_2011_account_44,view,account_type_2011_4_dette,f,
-lu_2011_account_4411,4411,Dettes sur achats et prestations de services dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_441,view,account_type_2011_4_dette,f,account_financial_report_101
-lu_2011_account_44111,44111,Fournisseurs,lu_2011_account_4411,payable,account_type_2011_4_dette,t,
-lu_2011_account_44112,44112,Fournisseurs – Factures non parvenues,lu_2011_account_4411,payable,account_type_2011_4_dette,t,
-lu_2011_account_44113,44113,Fournisseurs débiteurs,lu_2011_account_4411,view,account_type_2011_4_dette,f,
-lu_2011_account_441131,441131,Fournisseurs – Avances et acomptes versés sur commandes,lu_2011_account_44113,payable,account_type_2011_4_dette,t,
-lu_2011_account_441132,441132,Fournisseurs – Créances pour emballages et matériel à rendre,lu_2011_account_44113,payable,account_type_2011_4_dette,t,
-lu_2011_account_441133,441133,Fournisseurs – Autres avoirs,lu_2011_account_44113,payable,account_type_2011_4_dette,t,
-lu_2011_account_441134,441134,"Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus",lu_2011_account_44113,payable,account_type_2011_4_dette,t,
-lu_2011_account_4412,4412,Dettes sur achats et prestations de services dont la durée résiduelle est supérieure à un an,lu_2011_account_441,view,account_type_2011_4_dette,f,account_financial_report_102
-lu_2011_account_44121,44121,Fournisseurs,lu_2011_account_4412,payable,account_type_2011_4_dette,t,
-lu_2011_account_44122,44122,Fournisseurs – Factures non parvenues,lu_2011_account_4412,payable,account_type_2011_4_dette,t,
-lu_2011_account_44123,44123,Fournisseurs débiteurs,lu_2011_account_4412,view,account_type_2011_4_dette,f,
-lu_2011_account_441231,441231,Fournisseurs – Avances et acomptes versés sur commandes,lu_2011_account_44123,payable,account_type_2011_4_dette,t,
-lu_2011_account_441232,441232,Fournisseurs – Créances pour emballages et matériel à rendre,lu_2011_account_44123,payable,account_type_2011_4_dette,t,
-lu_2011_account_441233,441233,Fournisseurs – Autres avoirs,lu_2011_account_44123,payable,account_type_2011_4_dette,t,
-lu_2011_account_441234,441234,"Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus",lu_2011_account_44123,payable,account_type_2011_4_dette,t,
-lu_2011_account_442,442,Dettes représentées par des effets de commerce,lu_2011_account_44,view,account_type_2011_4_dette,f,
-lu_2011_account_4421,4421,Dettes représentées par des effets de commerce dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_442,other,account_type_2011_4_dette,f,account_financial_report_104
-lu_2011_account_4422,4422,Dettes représentées par des effets de commerce dont la durée résiduelle est supérieure à un an,lu_2011_account_442,other,account_type_2011_4_dette,f,account_financial_report_105
-lu_2011_account_45,45,Dettes envers des entreprises liées et des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_4,view,account_type_2011_4_dette,f,
-lu_2011_account_451,451,Dettes envers des entreprises liées,lu_2011_account_45,view,account_type_2011_4_dette,f,
-lu_2011_account_4511,4511,Dettes envers des entreprises liées dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_451,view,account_type_2011_4_dette,f,account_financial_report_107
-lu_2011_account_45111,45111,Ventes de marchandises et de prestations de services,lu_2011_account_4511,other,account_type_2011_4_dette,f,
-lu_2011_account_45112,45112,Prêts et avances,lu_2011_account_4511,other,account_type_2011_4_dette,f,
-lu_2011_account_45113,45113,Intérêts courus,lu_2011_account_4511,other,account_type_2011_4_dette,f,
-lu_2011_account_45114,45114,Dividendes à payer,lu_2011_account_4511,other,account_type_2011_4_dette,f,
-lu_2011_account_45118,45118,Autres dettes,lu_2011_account_4511,other,account_type_2011_4_dette,f,
-lu_2011_account_4512,4512,Dettes envers des entreprises liées dont la durée résiduelle est supérieure à un an,lu_2011_account_451,view,account_type_2011_4_dette,f,account_financial_report_108
-lu_2011_account_45121,45121,Ventes de marchandises et de prestations de services,lu_2011_account_4512,other,account_type_2011_4_dette,f,
-lu_2011_account_45122,45122,Prêts et avances,lu_2011_account_4512,other,account_type_2011_4_dette,f,
-lu_2011_account_45123,45123,Intérêts courus,lu_2011_account_4512,other,account_type_2011_4_dette,f,
-lu_2011_account_45124,45124,Dividendes à payer,lu_2011_account_4512,other,account_type_2011_4_dette,f,
-lu_2011_account_45128,45128,Autres dettes,lu_2011_account_4512,other,account_type_2011_4_dette,f,
-lu_2011_account_452,452,Dettes envers des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_45,view,account_type_2011_4_dette,f,
-lu_2011_account_4521,4521,Dettes envers des entreprises avec lesquelles la société a un lien de participation dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_452,view,account_type_2011_4_dette,f,account_financial_report_110
-lu_2011_account_45211,45211,Ventes de marchandises et de prestations de services,lu_2011_account_4521,other,account_type_2011_4_dette,f,
-lu_2011_account_45212,45212,Prêts et avances,lu_2011_account_4521,other,account_type_2011_4_dette,f,
-lu_2011_account_45213,45213,Intérêts courus,lu_2011_account_4521,other,account_type_2011_4_dette,f,
-lu_2011_account_45214,45214,Dividendes à payer,lu_2011_account_4521,other,account_type_2011_4_dette,f,
-lu_2011_account_45218,45218,Autres dettes,lu_2011_account_4521,other,account_type_2011_4_dette,f,
-lu_2011_account_4522,4522,Dettes envers des entreprises avec lesquelles la société a un lien de participation dont la durée résiduelle est supérieure à un an,lu_2011_account_452,view,account_type_2011_4_dette,f,account_financial_report_111
-lu_2011_account_45221,45221,Ventes de marchandises et de prestations de services,lu_2011_account_4522,other,account_type_2011_4_dette,f,
-lu_2011_account_45222,45222,Prêts et avances,lu_2011_account_4522,other,account_type_2011_4_dette,f,
-lu_2011_account_45223,45223,Intérêts courus,lu_2011_account_4522,other,account_type_2011_4_dette,f,
-lu_2011_account_45224,45224,Dividendes à payer,lu_2011_account_4522,other,account_type_2011_4_dette,f,
-lu_2011_account_45228,45228,Autres dettes,lu_2011_account_4522,other,account_type_2011_4_dette,f,
-lu_2011_account_46,46,Dettes fiscales et dettes envers la sécurité sociale,lu_2011_account_4,view,account_type_2011_4_dette,f,
-lu_2011_account_461,461,Dettes fiscales,lu_2011_account_46,view,account_type_2011_4_dette,f,account_financial_report_113
-lu_2011_account_4611,4611,Administrations communales,lu_2011_account_461,view,account_type_2011_4_dette,f,
-lu_2011_account_46111,46111,Impôts communaux,lu_2011_account_4611,other,account_type_2011_4_dette,f,
-lu_2011_account_46112,46112,Taxes communales,lu_2011_account_4611,other,account_type_2011_4_dette,f,
-lu_2011_account_4612,4612,Administration des Contributions Directes (ACD),lu_2011_account_461,view,account_type_2011_4_dette,f,
-lu_2011_account_46121,46121,Impôt sur le revenu des collectivités,lu_2011_account_4612,view,account_type_2011_4_dette,f,
-lu_2011_account_461211,461211,Impôt sur le revenu des collectivités – charge fiscale estimée,lu_2011_account_46121,other,account_type_2011_4_dette,f,
-lu_2011_account_461212,461212,Impôt sur le revenu des collectivités – dette fiscale à payer,lu_2011_account_46121,other,account_type_2011_4_dette,f,
-lu_2011_account_46122,46122,Impôt commercial,lu_2011_account_4612,view,account_type_2011_4_dette,f,
-lu_2011_account_461221,461221,Impôt commercial – charge fiscale estimée,lu_2011_account_46122,other,account_type_2011_4_dette,f,
-lu_2011_account_461222,461222,Impôt commercial – dette fiscale à payer,lu_2011_account_46122,other,account_type_2011_4_dette,f,
-lu_2011_account_46123,46123,Impôt sur la fortune,lu_2011_account_4612,view,account_type_2011_4_dette,f,
-lu_2011_account_461231,461231,Impôt sur la fortune – charge fiscale estimée,lu_2011_account_46123,other,account_type_2011_4_dette,f,
-lu_2011_account_461232,461232,Impôt sur la fortune – dette fiscale à payer,lu_2011_account_46123,other,account_type_2011_4_dette,f,
-lu_2011_account_46124,46124,Retenue d’impôt sur traitements et salaires,lu_2011_account_4612,other,account_type_2011_4_dette,f,
-lu_2011_account_46125,46125,Retenue d’impôt sur revenus de capitaux mobiliers,lu_2011_account_4612,other,account_type_2011_4_dette,f,
-lu_2011_account_46126,46126,Retenue d’impôt sur les tantièmes,lu_2011_account_4612,other,account_type_2011_4_dette,f,
-lu_2011_account_46128,46128,ACD – Autres dettes,lu_2011_account_4612,other,account_type_2011_4_dette,f,
-lu_2011_account_4613,4613,Administration des Douanes et Accises (ADA),lu_2011_account_461,view,account_type_2011_4_dette,f,
-lu_2011_account_46131,46131,Taxe sur les véhicules automoteurs,lu_2011_account_4613,other,account_type_2011_4_dette,f,
-lu_2011_account_46132,46132,Droits d’accises et taxe de consommation,lu_2011_account_4613,other,account_type_2011_4_dette,f,
-lu_2011_account_46138,46138,ADA – Autres dettes,lu_2011_account_4613,other,account_type_2011_4_dette,f,
-lu_2011_account_4614,4614,Administration de l’Enregistrement et des Domaines (AED),lu_2011_account_461,view,account_type_2011_4_dette,f,
-lu_2011_account_46141,46141,Taxe sur la valeur ajoutée – TVA,lu_2011_account_4614,view,account_type_2011_4_dette,f,
-lu_2011_account_461411,461411,TVA en aval,lu_2011_account_46141,view,account_type_2011_4_dette,f,
-lu_2011_account_4614111,4614111,TVA en aval – Pays,lu_2011_account_461411,other,account_type_2011_4_dette,f,
-lu_2011_account_4614112,4614112,TVA en aval – Intracommunautaire,lu_2011_account_461411,other,account_type_2011_4_dette,f,
-lu_2011_account_4614113,4614113,TVA en aval – Extracommunautaire,lu_2011_account_461411,other,account_type_2011_4_dette,f,
-lu_2011_account_4614114,4614114,TVA en aval – Triangulaire,lu_2011_account_461411,other,account_type_2011_4_dette,f,
-lu_2011_account_4614115,4614115,TVA en aval – Exonérations spéciales,lu_2011_account_461411,other,account_type_2011_4_dette,f,
-lu_2011_account_461412,461412,TVA due,lu_2011_account_46141,other,account_type_2011_4_dette,f,
-lu_2011_account_461413,461413,TVA acomptes reçus,lu_2011_account_46141,other,account_type_2011_4_dette,f,
-lu_2011_account_461418,461418,TVA – Autres dettes,lu_2011_account_46141,other,account_type_2011_4_dette,f,
-lu_2011_account_46142,46142,Impôts indirects,lu_2011_account_4614,view,account_type_2011_4_dette,f,
-lu_2011_account_461421,461421,Droits d’enregistrement,lu_2011_account_46142,other,account_type_2011_4_dette,f,
-lu_2011_account_461422,461422,Taxe d’abonnement,lu_2011_account_46142,other,account_type_2011_4_dette,f,
-lu_2011_account_461423,461423,Droits d’hypothèques,lu_2011_account_46142,other,account_type_2011_4_dette,f,
-lu_2011_account_461424,461424,Droits de timbre,lu_2011_account_46142,other,account_type_2011_4_dette,f,
-lu_2011_account_461428,461428,Autres impôts indirects,lu_2011_account_46142,other,account_type_2011_4_dette,f,
-lu_2011_account_4615,4615,Administrations fiscales étrangères,lu_2011_account_461,other,account_type_2011_4_dette,f,
-lu_2011_account_462,462,Dettes au titre de la sécurité sociale,lu_2011_account_46,view,account_type_2011_4_dette,f,account_financial_report_114
-lu_2011_account_4621,4621,Centre Commun de Sécurité Sociale,lu_2011_account_462,other,account_type_2011_4_dette,f,
-lu_2011_account_4622,4622,Organismes de sécurité sociale étrangers,lu_2011_account_462,other,account_type_2011_4_dette,f,
-lu_2011_account_4628,4628,Autres organismes sociaux,lu_2011_account_462,other,account_type_2011_4_dette,f,
-lu_2011_account_47,47,Autres dettes,lu_2011_account_4,view,account_type_2011_4_dette,f,
-lu_2011_account_471,471,Autres dettes dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_47,view,account_type_2011_4_dette,f,account_financial_report_116
-lu_2011_account_4711,4711,Dépôts et cautionnements reçus,lu_2011_account_471,view,account_type_2011_4_dette,f,
-lu_2011_account_47111,47111,Dépôts,lu_2011_account_4711,other,account_type_2011_4_dette,f,
-lu_2011_account_47112,47112,Cautionnements,lu_2011_account_4711,other,account_type_2011_4_dette,f,
-lu_2011_account_47113,47113,Intérêts courus,lu_2011_account_4711,other,account_type_2011_4_dette,f,
-lu_2011_account_4712,4712,Dettes envers associés et actionnaires,lu_2011_account_471,view,account_type_2011_4_dette,f,
-lu_2011_account_47121,47121,Montant principal,lu_2011_account_4712,other,account_type_2011_4_dette,f,
-lu_2011_account_47122,47122,Intérêts courus,lu_2011_account_4712,other,account_type_2011_4_dette,f,
-lu_2011_account_4713,4713,"Dettes envers administrateurs, gérants et commissaires",lu_2011_account_471,other,account_type_2011_4_dette,f,
-lu_2011_account_4714,4714,Dettes envers le personnel,lu_2011_account_471,view,account_type_2011_4_dette,f,
-lu_2011_account_47141,47141,Personnel – Rémunérations dues,lu_2011_account_4714,other,account_type_2011_4_dette,f,
-lu_2011_account_47142,47142,Personnel – Dépôts,lu_2011_account_4714,other,account_type_2011_4_dette,f,
-lu_2011_account_47143,47143,"Personnel – Oppositions, saisies",lu_2011_account_4714,other,account_type_2011_4_dette,f,
-lu_2011_account_47148,47148,Personnel – Autres,lu_2011_account_4714,other,account_type_2011_4_dette,f,
-lu_2011_account_4715,4715,Etat – Droits d’émission à restituer,lu_2011_account_471,other,account_type_2011_4_dette,f,
-lu_2011_account_4718,4718,Autres dettes diverses,lu_2011_account_471,other,account_type_2011_4_dette,f,
-lu_2011_account_472,472,Autres dettes dont la durée résiduelle est supérieure à un an,lu_2011_account_47,view,account_type_2011_4_dette,f,account_financial_report_117
-lu_2011_account_4721,4721,Dépôts et cautionnements reçus,lu_2011_account_472,view,account_type_2011_4_dette,f,
-lu_2011_account_47211,47211,Dépôts,lu_2011_account_4721,other,account_type_2011_4_dette,f,
-lu_2011_account_47212,47212,Cautionnements,lu_2011_account_4721,other,account_type_2011_4_dette,f,
-lu_2011_account_47213,47213,Intérêts courus,lu_2011_account_4721,other,account_type_2011_4_dette,f,
-lu_2011_account_4722,4722,Dettes envers associés et actionnaires,lu_2011_account_472,view,account_type_2011_4_dette,f,
-lu_2011_account_47221,47221,Montant principal,lu_2011_account_4722,other,account_type_2011_4_dette,f,
-lu_2011_account_47222,47222,Intérêts courus,lu_2011_account_4722,other,account_type_2011_4_dette,f,
-lu_2011_account_4723,4723,"Dettes envers administrateurs, gérants et commissaires",lu_2011_account_472,other,account_type_2011_4_dette,f,
-lu_2011_account_4724,4724,Dettes envers le personnel,lu_2011_account_472,view,account_type_2011_4_dette,f,
-lu_2011_account_47241,47241,Personnel – Rémunérations dues,lu_2011_account_4724,other,account_type_2011_4_dette,f,
-lu_2011_account_47242,47242,Personnel – Dépôts,lu_2011_account_4724,other,account_type_2011_4_dette,f,
-lu_2011_account_47243,47243,"Personnel – Oppositions, saisies",lu_2011_account_4724,other,account_type_2011_4_dette,f,
-lu_2011_account_47248,47248,Personnel – Autres,lu_2011_account_4724,other,account_type_2011_4_dette,f,
-lu_2011_account_4726,4726,Etat – Droits d’émission à restituer,lu_2011_account_472,other,account_type_2011_4_dette,f,
-lu_2011_account_4728,4728,Autres dettes diverses,lu_2011_account_472,other,account_type_2011_4_dette,f,
-lu_2011_account_48,48,Comptes de régularisation,lu_2011_account_4,view,account.data_account_type_view,f,
-lu_2011_account_481,481,Charges à reporter,lu_2011_account_48,other,account_type_2011_4_regul_actif,f,account_financial_report_65
-lu_2011_account_482,482,Produits à reporter,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
-lu_2011_account_483,483,Etat – droits d’émission alloués,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
-lu_2011_account_484,484,Comptes transitoires ou d’attente – Actif,lu_2011_account_48,other,account_type_2011_4_regul_actif,f,account_financial_report_65
-lu_2011_account_485,485,Comptes transitoires ou d’attente – Passif,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
-lu_2011_account_486,486,Comptes de liaison – Actif,lu_2011_account_48,other,account_type_2011_4_regul_actif,f,account_financial_report_65
-lu_2011_account_487,487,Comptes de liaison – Passif,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
-lu_2011_account_5,5,CLASSE 5 - COMPTES FINANCIERS,lu_2011_account_bilan,view,account.data_account_type_view,f,
-lu_2011_account_50,50,Valeurs mobilières,lu_2011_account_5,view,account_type_2011_5_disponibilite,f,
-lu_2011_account_501,501,Parts dans des entreprises liées,lu_2011_account_50,other,account_type_2011_5_disponibilite,f,account_financial_report_61
-lu_2011_account_502,502,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_50,other,account_type_2011_5_disponibilite,f,account_financial_report_61
-lu_2011_account_503,503,Actions propres ou parts propres,lu_2011_account_50,other,account_type_2011_5_disponibilite,f,account_financial_report_62
-lu_2011_account_508,508,Autres valeurs mobilières,lu_2011_account_50,view,account_type_2011_5_disponibilite,f,account_financial_report_63
-lu_2011_account_5081,5081,Actions – Titres cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_5082,5082,Actions – Titres non cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_5083,5083,Obligations et autres titres de créance émis par la société et rachetés par elle,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_5084,5084,Obligations – Titres cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_5085,5085,Obligations – Titres non cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_5088,5088,Autres valeurs mobilières diverses,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_51,51,"Avoirs en banques, avoirs en comptes de chèques postaux, chèques et encaisse",lu_2011_account_5,view,account_type_2011_5_disponibilite,f,account_financial_report_64
-lu_2011_account_511,511,Chèques à encaisser,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_512,512,Valeurs à l’encaissement,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_513,513,Banques,lu_2011_account_51,view,account_type_2011_5_disponibilite,f,
-lu_2011_account_5131,5131,Banques comptes courants,lu_2011_account_513,view,account_type_2011_5_disponibilite,f,
-lu_2011_account_5132,5132,Banques comptes à terme,lu_2011_account_513,view,account_type_2011_5_disponibilite,f,
-lu_2011_account_514,514,Compte chèque postal,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_516,516,Caisse,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_517,517,Virements internes,lu_2011_account_51,other,account_type_2011_5_disponibilite,t,
-lu_2011_account_518,518,Autres avoirs,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
-lu_2011_account_resultat,resultat,COMPTES DE PERTES ET PROFITS,lu_2011_account_0,view,account.data_account_type_view,,"account_financial_report_77,account_financial_report_161"
-lu_2011_account_6,6,CLASSE 6 - COMPTES DE CHARGES,lu_2011_account_resultat,view,account.data_account_type_view,f,
-lu_2011_account_60,60,Consommation de marchandises et de matières premières et consommables,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,account_financial_report_120
-lu_2011_account_601,601,Matières premières,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_602,602,Matières consommables,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_603,603,Fournitures consommables,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6031,6031,Combustibles,lu_2011_account_603,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60311,60311,Solides,lu_2011_account_6031,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60312,60312,Liquides,lu_2011_account_6031,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60313,60313,Gaz comprimé,lu_2011_account_6031,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6032,6032,Produits d’entretien,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6033,6033,Fournitures d’atelier et d’usine,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6034,6034,Fournitures de magasin,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6035,6035,Fournitures de bureau,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6036,6036,Carburants,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6037,6037,Lubrifiants,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6038,6038,Autres fournitures consommables,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_604,604,Emballages,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6041,6041,Emballages non récupérables,lu_2011_account_604,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6042,6042,Emballages récupérables,lu_2011_account_604,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6043,6043,Emballages à usage mixte,lu_2011_account_604,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_605,605,Approvisionnements,lu_2011_account_60,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_606,606,Achats de biens destinés à la revente,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6061,6061,Terrains,lu_2011_account_606,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6062,6062,Immeubles,lu_2011_account_606,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6063,6063,Marchandises,lu_2011_account_606,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_607,607,Variation des stocks,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6071,6071,Variation des stocks de matières premières,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6072,6072,Variation des stocks de matières consommables,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6073,6073,Variation des stocks de fournitures consommables,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6074,6074,Variation des stocks d’emballages,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6075,6075,Variation des stocks d’approvisionnements,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6076,6076,Variation des stocks de biens destinés à la revente,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_608,608,Achats non stockés et achats incorporés aux ouvrages et produits,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6081,6081,Achats non stockés de matières et fournitures,lu_2011_account_608,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60811,60811,Fournitures non stockables,lu_2011_account_6081,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_608111,608111,Eau,lu_2011_account_60811,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_608112,608112,Electricité,lu_2011_account_60811,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_608113,608113,Gaz de canalisation,lu_2011_account_60811,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60812,60812,Fournitures d’entretien et de petit équipement,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60813,60813,Fournitures administratives,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60814,60814,Carburants,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60815,60815,Lubrifiants,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60816,60816,Vêtements professionnels,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60818,60818,Autres matières et fournitures non stockées,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6082,6082,Achats incorporés aux ouvrages et produits,lu_2011_account_608,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60821,60821,Achats d’études et prestations de service (incorporés aux ouvrages et produits),lu_2011_account_6082,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_608211,608211,Travail à façon,lu_2011_account_60821,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_608212,608212,Recherche et développement,lu_2011_account_60821,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_608213,608213,Frais d’architectes et d’ingénieurs,lu_2011_account_60821,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60822,60822,"Achats de matériel, équipements, pièces détachées et travaux (incorporés aux ouvrages et produits)",lu_2011_account_6082,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_60828,60828,Autres achats d’études et de prestations de service,lu_2011_account_6082,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_609,609,"   Rabais, remises et ristournes obtenus",lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6091,6091,   Matières premières,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6092,6092,   Matières consommables,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6093,6093,   Fournitures consommables,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6094,6094,   Emballages,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6095,6095,   Approvisionnements,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6096,6096,   Achats de biens destinés à la revente,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6098,6098,   Achats non stockés et achats incorporés aux ouvrages et produits,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6099,6099,"   Rabais, remises et ristournes non affectés",lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61,61,Autres charges externes,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,account_financial_report_121
-lu_2011_account_611,611,Loyers et charges locatives,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6111,6111,Locations immobilières,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61111,61111,Terrains,lu_2011_account_6111,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61112,61112,Bâtiments,lu_2011_account_6111,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6112,6112,Locations mobilières,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61121,61121,Installations techniques et machines,lu_2011_account_6112,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61122,61122,"Autres installations, outillages et machines",lu_2011_account_6112,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61123,61123,Matériel roulant,lu_2011_account_6112,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6113,6113,Charges locatives et de copropriété,lu_2011_account_611,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6114,6114,Leasing immobilier,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61141,61141,Terrains,lu_2011_account_6114,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61142,61142,Bâtiments,lu_2011_account_6114,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6115,6115,Leasing mobilier,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61151,61151,Installations techniques et machines,lu_2011_account_6115,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61152,61152,"Autres installations, outillages et machines",lu_2011_account_6115,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61153,61153,Matériel roulant,lu_2011_account_6115,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6116,6116,Malis sur emballages,lu_2011_account_611,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_612,612,"Sous-traitance, entretiens et réparations",lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6121,6121,"Sous-traitance générale (non incorporée directement aux ouvrages, travaux et produits)",lu_2011_account_612,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6122,6122,Entretien et réparations,lu_2011_account_612,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61221,61221,Sur installations techniques et machines,lu_2011_account_6122,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61222,61222,"Sur autres installations, outillages et machines",lu_2011_account_6122,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61223,61223,Sur matériel roulant,lu_2011_account_6122,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6123,6123,Contrats de maintenance,lu_2011_account_612,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6124,6124,Etudes et recherches (non incorporées dans les produits),lu_2011_account_612,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_613,613,Rémunérations d’intermédiaires et honoraires,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6131,6131,Commissions et courtages,lu_2011_account_613,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61311,61311,Commissions et courtages sur achats,lu_2011_account_6131,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61312,61312,Commissions et courtages sur ventes,lu_2011_account_6131,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61313,61313,Rémunérations des transitaires,lu_2011_account_6131,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6132,6132,Traitement informatique,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6133,6133,Services bancaires et assimilés,lu_2011_account_613,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61331,61331,"Frais sur titres (achat, vente, garde)",lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61332,61332,Commissions et frais sur émission d’emprunts,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61333,61333,Frais de compte,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61334,61334,Frais sur cartes de crédit,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61335,61335,Frais sur effets,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61336,61336,Rémunérations d’affacturage,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61337,61337,Location de coffres,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61338,61338,Autres frais et commissions bancaires (hors intérêts et frais assimilés),lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6134,6134,Honoraires,lu_2011_account_613,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61341,61341,Honoraires juridiques,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61342,61342,Honoraires comptables et d’audit,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61343,61343,Honoraires fiscaux,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61348,61348,Autres honoraires,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6135,6135,Frais d’actes et de contentieux,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6136,6136,Frais de recrutement de personnel,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6138,6138,Autres rémunérations d’intermédiaires et honoraires,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_614,614,Primes d’assurance,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6141,6141,Assurances sur biens de l’actif,lu_2011_account_614,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61411,61411,Bâtiments,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61412,61412,Véhicules,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61413,61413,Installations,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61418,61418,Sur autres biens de l’actif,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6142,6142,Assurances sur biens pris en location,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6143,6143,Assurance-transport,lu_2011_account_614,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61431,61431,Sur achats,lu_2011_account_6143,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61432,61432,Sur ventes,lu_2011_account_6143,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61438,61438,Sur autres biens,lu_2011_account_6143,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6144,6144,Assurance risque d’exploitation,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6145,6145,Assurance insolvabilité clients,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6146,6146,Assurance responsabilité civile,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6148,6148,Autres assurances,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_615,615,Frais de marketing et de communication,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6151,6151,Frais de marketing et de publicité,lu_2011_account_615,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61511,61511,Annonces et insertions,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61512,61512,Echantillons,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61513,61513,Foires et expositions,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61514,61514,Cadeaux à la clientèle,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61515,61515,Catalogues et imprimés et publications,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61516,61516,Dons courants,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61517,61517,Sponsoring,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61518,61518,Autres achats de services publicitaires,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6152,6152,Frais de déplacements et de représentation,lu_2011_account_615,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61521,61521,Voyages et déplacements,lu_2011_account_6152,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_615211,615211,Direction (respectivement exploitant et associés),lu_2011_account_61521,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_615212,615212,Personnel,lu_2011_account_61521,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61522,61522,Frais de déménagement de l’entreprise,lu_2011_account_6152,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61523,61523,Missions,lu_2011_account_6152,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61524,61524,Réceptions et frais de représentation,lu_2011_account_6152,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6153,6153,Frais postaux et frais de télécommunications,lu_2011_account_615,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61531,61531,Timbres,lu_2011_account_6153,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61532,61532,Téléphone et autres frais de télécommunication,lu_2011_account_6153,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61538,61538,"Autres frais postaux (location de boîtes postales, etc.)",lu_2011_account_6153,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_616,616, Transports de biens et transports collectifs du personnel,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6161,6161,Transports sur achats,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6162,6162,Transports sur ventes,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6163,6163,Transports entre établissements ou chantiers,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6164,6164,Transports administratifs,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6165,6165,Transports collectifs du personnel,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6168,6168,Autres transports,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_617,617, Personnel extérieur à l’entreprise,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6171,6171,Personnel intérimaire,lu_2011_account_617,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6172,6172,Personnel prêté à l’entreprise,lu_2011_account_617,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_618,618, Charges externes diverses,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6181,6181,Documentation,lu_2011_account_618,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61811,61811,Documentation générale,lu_2011_account_6181,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_61812,61812,Documentation technique,lu_2011_account_6181,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6182,6182,"Frais de colloques, séminaires, conférences",lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6183,6183,Elimination des déchets industriels,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6184,6184,Elimination de déchets non industriels,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6185,6185,Evacuation des eaux usées,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6186,6186,Frais de surveillance,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6187,6187,Cotisations aux associations professionnelles,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6188,6188,Autres charges externes diverses,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_619,619," Rabais, remises et ristournes obtenus sur autres charges externes",lu_2011_account_61,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62,62,Frais de personnel,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_621,621,Rémunérations des salariés,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_123
-lu_2011_account_6211,6211,Salaires bruts,lu_2011_account_621,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62111,62111,Salaires de base,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62112,62112,Suppléments pour travail,lu_2011_account_6211,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_621121,621121,Dimanche,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_621122,621122,Jours fériés légaux,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_621123,621123,Heures supplémentaires,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_621128,621128,Autres suppléments,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62113,62113,Primes de ménage,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62114,62114,"Gratifications, primes et commissions",lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62115,62115,Avantages en nature (leasing),lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62116,62116,Indemnités de licenciement,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62117,62117,Trimestre de faveur,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6218,6218,Autres avantages (font social),lu_2011_account_621,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6219,6219,Remboursements sur salaires,lu_2011_account_621,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62191,62191,Remboursements mutualité,lu_2011_account_6219,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62192,62192,"Remboursements pour congé politique, sportif, culturel, éducatif et mandats sociaux",lu_2011_account_6219,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62193,62193,Remboursements trimestre de faveur,lu_2011_account_6219,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_622,622,Autre personnel,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_123
-lu_2011_account_6221,6221,Etudiants,lu_2011_account_622,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6222,6222,Salaires occasionnels,lu_2011_account_622,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6228,6228,Autre personnel temporaire,lu_2011_account_622,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_623,623,Charges sociales (part patronale),lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_124
-lu_2011_account_6231,6231,Charges sociales salariés,lu_2011_account_623,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62311,62311,Caisse Nationale de Santé,lu_2011_account_6231,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62312,62312,Caisse Nationale d’Assurance-Pension,lu_2011_account_6231,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_62318,62318,Cotisations patronales complémentaires,lu_2011_account_6231,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6232,6232,Assurance accidents du travail,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6233,6233,Service de santé au travail,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6238,6238,Autres charges sociales patronales,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6239,6239,Remboursements de charges sociales,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_624,624,Pensions complémentaires,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_125
-lu_2011_account_6241,6241,Primes à des fonds de pensions extérieurs,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6242,6242,Dotation aux provisions pour pensions complémentaires,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6243,6243,Retenue d’impôt sur pension complémentaire,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6244,6244,Prime d’assurance insolvabilité,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6245,6245,Pensions complémentaires versées par l’employeur,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_628,628,Autres charges sociales,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_126
-lu_2011_account_6281,6281,Médecine du travail,lu_2011_account_628,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6288,6288,Autres charges sociales diverses,lu_2011_account_628,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_63,63,Dotations aux corrections de valeur des éléments d’actif non financiers,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_631,631,Dotations aux corrections de valeur sur frais d’établissement et frais assimilés,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_128
-lu_2011_account_6311,6311,Frais de constitution,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6312,6312,Frais de premier établissement,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6313,6313,Frais d’augmentation de capital et d’opérations diverses,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6314,6314,Frais d’émission d’emprunts,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6318,6318,Autres frais assimilés,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_632,632,Dotations aux corrections de valeur sur immobilisations incorporelles,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_128
-lu_2011_account_6321,6321,Frais de recherche et de développement,lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6322,6322,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6323,6323,Fonds de commerce dans la mesure où il a été acquis à titre onéreux,lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6324,6324,Acomptes versés et immobilisations incorporelles en cours,lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_633,633,Dotations aux corrections de valeur sur immobilisations corporelles,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_128
-lu_2011_account_6331,6331,Terrains et constructions,lu_2011_account_633,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_63311,63311,Terrains,lu_2011_account_6331,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_63312,63312,Agencements et aménagements de terrains,lu_2011_account_6331,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_63313,63313,Constructions,lu_2011_account_6331,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6332,6332,Installations techniques et machines,lu_2011_account_633,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6333,6333,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_633,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6334,6334,Acomptes versés et immobilisations corporelles en cours,lu_2011_account_633,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_634,634,Dotations aux corrections de valeur sur stocks,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6341,6341,Matières premières et consommables,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6342,6342,Produits en cours de fabrication et commandes en cours,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6343,6343,Produits finis et marchandises,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6344,6344,Terrains et immeubles destinés à la revente,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6345,6345,Acomptes versés,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_635,635,Dotations aux corrections de valeur sur créances de l’actif circulant,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_129
-lu_2011_account_6351,6351,Créances résultant de ventes et prestations de services,lu_2011_account_635,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6352,6352,Créances sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_635,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6353,6353,Autres créances,lu_2011_account_635,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64,64,Autres charges d’exploitation,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,account_financial_report_130
-lu_2011_account_641,641,"Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires",lu_2011_account_64,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6411,6411,Concessions,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6412,6412,Brevets,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6413,6413,Licences informatiques,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6414,6414,Marques et franchises,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6415,6415,Droits et valeurs similaires,lu_2011_account_641,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64151,64151,Droits d’auteur et de reproduction,lu_2011_account_6415,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64158,64158,Autres droits et valeurs similaires,lu_2011_account_6415,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_642,642,Indemnités,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_643,643,Jetons de présence,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_644,644,Tantièmes,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_645,645,Pertes sur créances irrécouvrables,lu_2011_account_64,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6451,6451,Créances résultant de ventes et de prestations de services,lu_2011_account_645,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6452,6452,Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_645,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6453,6453,Autres créances,lu_2011_account_645,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_646,646,"Impôts, taxes et versements assimilés",lu_2011_account_64,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6461,6461,Impôt foncier,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6462,6462,TVA non déductible,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6463,6463,Droits sur les marchandises en provenance de l’étranger,lu_2011_account_646,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64631,64631,Droits d’accises et taxe de consommation sur marchandises en provenance de l’étranger,lu_2011_account_6463,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64632,64632,Droits de douane,lu_2011_account_6463,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64633,64633,Montants compensatoires,lu_2011_account_6463,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6464,6464,Droits d’accises à la production et taxe de consommation,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6465,6465,"Droits d’enregistrement et de timbre, droits d’hypothèques",lu_2011_account_646,view,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64651,64651,Droits d’enregistrement,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64652,64652,Taxe d’abonnement,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64653,64653,Droits d’hypothèques,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64654,64654,Droits de timbre,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_64658,64658,"Autres droits d’enregistrement et de timbre, droits d’hypothèques",lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6466,6466,Taxes sur les véhicules,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6467,6467,Taxe de cabaretage,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6468,6468,Autres droits et impôts,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_6469,6469,Dotations aux provisions pour impôts,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_647,647,Dotations aux plus-values immunisées,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_648,648,Autres charges d’exploitation diverses,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_649,649,Dotations aux provisions d’exploitation,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
-lu_2011_account_65,65,Charges financières,lu_2011_account_6,view,account_type_2011_6_charge_finance,f,
-lu_2011_account_651,651,Dotations aux corrections de valeur et ajustements pour juste valeur sur immobilisations financières,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_131
-lu_2011_account_6511,6511,Dotations aux corrections de valeur sur immobilisations financières,lu_2011_account_651,view,account_type_2011_6_charge_finance,f,
-lu_2011_account_65111,65111,Parts dans des entreprises liées,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65112,65112,Créances sur des entreprises liées,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65113,65113,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65114,65114,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65115,65115,Titres ayant le caractère d’immobilisations,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65116,65116,Prêts et créances immobilisées,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65117,65117,Actions propres ou parts propres,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6512,6512,Ajustements pour juste valeur sur immobilisations financières,lu_2011_account_651,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_653,653,Dotations aux corrections de valeur et ajustements pour juste valeur sur éléments financiers de l’actif circulant,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_132
-lu_2011_account_6531,6531,Dotations aux corrections de valeur sur valeurs mobilières,lu_2011_account_653,view,account_type_2011_6_charge_finance,f,
-lu_2011_account_65311,65311,Parts dans des entreprises liées,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65312,65312,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65313,65313,Actions propres ou parts propres,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65318,65318,Autres valeurs mobilières,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6532,6532,Dotations aux corrections de valeur sur créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_653,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6533,6533,Dotations aux corrections de valeur sur autres créances,lu_2011_account_653,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6534,6534,Ajustements pour juste valeur sur éléments financiers de l’actif circulant,lu_2011_account_653,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_654,654,Moins-values de cession de valeurs mobilières,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_6541,6541,Parts dans des entreprises liées,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6542,6542,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6543,6543,Actions propres ou parts propres,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6548,6548,Autres valeurs mobilières,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_655,655,Intérêts et escomptes,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_6551,6551,Intérêts des dettes financières,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,
-lu_2011_account_65511,65511,Intérêts des dettes subordonnées,lu_2011_account_6551,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65512,65512,Intérêts des emprunts obligataires,lu_2011_account_6551,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6552,6552,Intérêts bancaires et assimilés,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,
-lu_2011_account_65521,65521,Intérêts bancaires sur comptes courants,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65522,65522,Intérêts bancaires sur opérations de financement,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_65523,65523,Intérêts sur leasings financiers,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6553,6553,Intérêts sur dettes commerciales,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6554,6554,Intérêts sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_134
-lu_2011_account_6555,6555,Escomptes et frais sur effets,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6556,6556,Escomptes accordés,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
-lu_2011_account_6558,6558,Intérêts sur autres emprunts et dettes,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_656,656,Pertes de change,lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_657,657,Quote-part de perte dans les entreprises collectives (autres que les sociétés de capitaux),lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_658,658,Autres charges financières (différence et frais de paiement (-)),lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_659,659,Dotations aux provisions financières,lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
-lu_2011_account_66,66,Charges exceptionnelles,lu_2011_account_6,view,account_type_2011_6_charge_exception,f,account_financial_report_136
-lu_2011_account_661,661,Dotations aux corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
-lu_2011_account_6611,6611,sur immobilisations incorporelles,lu_2011_account_661,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6612,6612,sur immobilisations corporelles,lu_2011_account_661,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_662,662,Dotations aux corrections de valeur exceptionnelles sur éléments de l’actif circulant,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
-lu_2011_account_6621,6621,sur stocks,lu_2011_account_662,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6622,6622,sur créances,lu_2011_account_662,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_663,663,Valeur comptable des immobilisations incorporelles et corporelles cédées,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
-lu_2011_account_6631,6631,Immobilisations incorporelles,lu_2011_account_663,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6632,6632,Immobilisations corporelles,lu_2011_account_663,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_664,664,Valeur comptable des immobilisations financières cédées,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
-lu_2011_account_6641,6641,Parts dans des entreprises liées,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6642,6642,Créances sur des entreprises liées,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6643,6643,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6644,6644,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6645,6645,Titres ayant le caractère d’immobilisations,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6646,6646,Prêts et créances immobilisées,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6647,6647,Actions propres ou parts propres,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_665,665,Valeur comptable des créances de l’actif circulant financier cédées,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
-lu_2011_account_6651,6651,Sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_665,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6652,6652,Sur autres créances,lu_2011_account_665,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_668,668,Autres charges exceptionnelles,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
-lu_2011_account_6681,6681,Pénalités sur marchés et dédits payés sur achats et ventes,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6682,6682,"Amendes et pénalités fiscales, sociales et pénales",lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6683,6683,Dommages et intérêts,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6684,6684,Malis provenant de clauses d’indexation,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_6688,6688,Autres charges exceptionnelles diverses,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_669,669,Dotations aux provisions exceptionnelles,lu_2011_account_66,other,account_type_2011_6_charge_exception,f,
-lu_2011_account_67,67,Impôts sur le résultat,lu_2011_account_6,view,account_type_2011_6_charge_impot,f,account_financial_report_137
-lu_2011_account_671,671,Impôt sur le revenu des collectivités,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
-lu_2011_account_6711,6711,Exercice courant,lu_2011_account_671,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_6712,6712,Exercices antérieurs,lu_2011_account_671,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_672,672,Impôt commercial,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
-lu_2011_account_6721,6721,Exercice courant,lu_2011_account_672,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_6722,6722,Exercices antérieurs,lu_2011_account_672,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_673,673,Impôts étrangers sur le résultat,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
-lu_2011_account_6731,6731,Retenues d’impôt à la source,lu_2011_account_673,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_6732,6732,Impôts supportés par les établissements stables,lu_2011_account_673,view,account_type_2011_6_charge_impot,f,
-lu_2011_account_67321,67321,Exercice courant,lu_2011_account_6732,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_67322,67322,Exercices antérieurs,lu_2011_account_6732,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_6733,6733,Impôts supportés par les entreprises non résidentes,lu_2011_account_673,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_6738,6738,Autres impôts étrangers,lu_2011_account_673,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_679,679,Dotations aux provisions pour impôts sur le résultat,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
-lu_2011_account_6791,6791,Dotations aux provisions pour impôts,lu_2011_account_679,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_6792,6792,Dotations aux provisions pour impôts différés,lu_2011_account_679,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_68,68,Autres impôts ne figurant pas sous le poste ci-dessus,lu_2011_account_6,view,account_type_2011_6_charge_impot,f,account_financial_report_138
-lu_2011_account_681,681,Impôt sur la fortune,lu_2011_account_68,view,account_type_2011_6_charge_impot,f,
-lu_2011_account_6811,6811,Exercice courant,lu_2011_account_681,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_6812,6812,Exercices antérieurs,lu_2011_account_681,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_682,682,Taxe d’abonnement,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_683,683,Impôts étrangers,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_688,688,Autres impôts et taxes,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_689,689,Dotations aux provisions pour autres impôts,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
-lu_2011_account_7,7,CLASSE 7 - COMPTES DE PRODUITS,lu_2011_account_resultat,view,account.data_account_type_view,f,
-lu_2011_account_70,70,Montant net du chiffre d’affaires,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_141
-lu_2011_account_701,701,Ventes sur commandes en cours,lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7011,7011,Produits,lu_2011_account_701,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7012,7012,Prestations de services,lu_2011_account_701,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7013,7013,Immeubles en construction,lu_2011_account_701,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_702,702,Ventes de produits finis,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_703,703,Ventes de produits intermédiaires,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_704,704,Ventes de produits résiduels,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_705,705,Ventes d’éléments destinés à la revente,lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7051,7051,Ventes de marchandises,lu_2011_account_705,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7052,7052,Ventes de terrains et d’immeubles existants (promotion immobilière),lu_2011_account_705,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7053,7053,Ventes d’autres éléments destinés à la revente,lu_2011_account_705,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_706,706,Prestations de services,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_708,708,Autres éléments du chiffre d’affaires,lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7081,7081,Commissions et courtages,lu_2011_account_708,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7082,7082,Locations,lu_2011_account_708,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_70821,70821,Loyer immobilier,lu_2011_account_7082,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_70822,70822,Loyer mobilier,lu_2011_account_7082,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7083,7083,Ventes d’emballages,lu_2011_account_708,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7088,7088,Autres éléments divers du chiffre d’affaires,lu_2011_account_708,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_709,709,"Rabais, remises et ristournes accordés par l’entreprise",lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7091,7091,sur ventes sur commandes en cours,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7092,7092,sur ventes de produits finis,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7093,7093,sur ventes de produits intermédiaires,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7094,7094,sur ventes de produits résiduels,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7095,7095,sur ventes d’éléments destinés à la revente,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7096,7096,sur prestations de services,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7098,7098,sur autres éléments du chiffre d’affaires,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_71,71,"Variation des stocks de produits finis, d’en cours de fabrication et des commandes en cours",lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_142
-lu_2011_account_711,711,Variation des stocks de produits en cours de fabrication et de commandes en cours,lu_2011_account_71,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7111,7111,Variation des stocks de produits en cours,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7112,7112,Variation des stocks de commandes en cours – produits,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7113,7113,Variation des stocks de commandes en cours – prestations de services,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7114,7114,Variation des stocks d’immeubles en construction,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_712,712,Variation des stocks de produits finis et marchandises,lu_2011_account_71,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7121,7121,Variation des stocks de produits finis,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7122,7122,Variation des stocks de produits intermédiaires,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7123,7123,Variation des stocks de produits résiduels,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7126,7126,Variation des stocks de marchandises,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7127,7127,"Variation des stocks de marchandises en voie d’acheminement, mises en dépôt ou données en consignation",lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_72,72,Production immobilisée,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_143
-lu_2011_account_721,721,Immobilisations incorporelles,lu_2011_account_72,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7211,7211,Frais de recherche et développement,lu_2011_account_721,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7212,7212,"Concessions, brevets, licences, marques, droits et valeurs similaires",lu_2011_account_721,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_72121,72121,Concessions,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_72122,72122,Brevets,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_72123,72123,Licences informatiques,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_72124,72124,Marques et franchises,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_72125,72125,Droits et valeurs similaires,lu_2011_account_7212,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_721251,721251,Droits d’auteur et de reproduction,lu_2011_account_72125,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_721258,721258,Autres droits et valeurs similaires,lu_2011_account_72125,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_722,722,Immobilisations corporelles,lu_2011_account_72,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7221,7221,Terrains et constructions,lu_2011_account_722,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7222,7222,Installations techniques et machines,lu_2011_account_722,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7223,7223,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_722,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_73,73,Reprises de corrections de valeur des éléments d’actif non financiers,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_732,732,Reprises de corrections de valeur sur immobilisations incorporelles,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,account_financial_report_145
-lu_2011_account_7321,7321,Frais de recherche et de développement,lu_2011_account_732,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7322,7322,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_732,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7323,7323,Fonds de commerce dans la mesure où il a été acquis à titre onéreux,lu_2011_account_732,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7324,7324,Acomptes versés et immobilisations incorporelles en cours,lu_2011_account_732,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_733,733,Reprises de corrections de valeur sur immobilisations corporelles,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,account_financial_report_145
-lu_2011_account_7331,7331,Terrains et constructions,lu_2011_account_733,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_73311,73311,Terrains,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_73312,73312,Agencements et aménagements de terrains,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_73313,73313,Constructions,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_73314,73314,Constructions sur sol d’autrui,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7332,7332,Installations techniques et machines,lu_2011_account_733,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7333,7333,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_733,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7334,7334,Acomptes versés et immobilisations corporelles en cours,lu_2011_account_733,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_734,734,Reprises de corrections de valeur sur stocks,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7341,7341,Matières premières et consommables,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7342,7342,Produits en cours de fabrication et commandes en cours,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7343,7343,Produits finis et marchandises,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7344,7344,Terrains et immeubles destinés à la revente,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7345,7345,Acomptes versés,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_735,735,Reprises de corrections de valeur sur créances de l’actif circulant,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,account_financial_report_146
-lu_2011_account_7351,7351,Créances résultant de ventes et prestations de services,lu_2011_account_735,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7352,7352,Créances sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_735,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7353,7353,Autres créances,lu_2011_account_735,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_74,74,Autres produits d’exploitation,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_147
-lu_2011_account_741,741,"Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires",lu_2011_account_74,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7411,7411,Concessions,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7412,7412,Brevets,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7413,7413,Licences informatiques,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7414,7414,Marques et franchises,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7415,7415,Droits et valeurs similaires,lu_2011_account_741,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_74151,74151,Droits d’auteur et de reproduction,lu_2011_account_7415,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_74158,74158,Autres droits et valeurs similaires,lu_2011_account_7415,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_742,742,Revenus des immeubles non affectés aux activités professionnelles,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_743,743,"Jetons de présence, tantièmes et rémunérations assimilées",lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_744,744,Subventions d’exploitation,lu_2011_account_74,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7441,7441,Subventions sur produits,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7442,7442,Bonifications d’intérêt,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7443,7443,Montants compensatoires,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7444,7444,Subventions destinées à promouvoir l’emploi,lu_2011_account_744,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_74441,74441,Primes d’apprentissage reçues,lu_2011_account_7444,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_74442,74442,Autres subventions destinées à promouvoir l’emploi,lu_2011_account_7444,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7448,7448,Autres subventions d’exploitation,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_745,745,Ristournes perçues des coopératives (provenant des excédents),lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_746,746,Indemnités d’assurance touchées,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_747,747,Reprises de plus-values immunisées et de subventions d’investissement en capital,lu_2011_account_74,view,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7471,7471,Plus-values immunisées non réinvesties,lu_2011_account_747,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7472,7472,Plus-values immunisées réinvesties,lu_2011_account_747,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_7473,7473,Subventions d’investissement en capital,lu_2011_account_747,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_748,748,Autres produits d’exploitation divers,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_749,749,Reprises sur provisions d’exploitation,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
-lu_2011_account_75,75,Produits financiers,lu_2011_account_7,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_751,751,Reprises sur corrections de valeur et ajustements pour juste valeur sur immobilisations financières,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_7511,7511,Reprises sur corrections de valeur sur immobilisations financières,lu_2011_account_751,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_75111,75111,Parts dans des entreprises liées,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75112,75112,Créances sur des entreprises liées,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75113,75113,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75114,75114,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75115,75115,Titres ayant le caractère d’immobilisations,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75116,75116,Prêts et créances immobilisées,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75117,75117,Actions propres ou parts propres,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7512,7512,Ajustements pour juste valeur sur immobilisations financières,lu_2011_account_751,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_752,752,Revenus des immobilisations financières,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_7521,7521,Parts dans des entreprises liées,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_149
-lu_2011_account_7522,7522,Créances sur des entreprises liées,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7523,7523,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_150
-lu_2011_account_7524,7524,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7525,7525,Titres ayant le caractère d’immobilisations,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7526,7526,Prêts et créances immobilisées,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7527,7527,Actions propres ou parts propres,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_753,753,Reprises sur corrections de valeur et ajustements pour juste valeur sur éléments financiers de l’actif circulant,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_7531,7531,Reprises sur corrections de valeur sur créances sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_753,other,account_type_2011_7_produit_financier,f,account_financial_report_152
-lu_2011_account_7532,7532,Reprises sur corrections de valeur sur autres créances,lu_2011_account_753,other,account_type_2011_7_produit_financier,f,account_financial_report_153
-lu_2011_account_7533,7533,Reprises sur corrections de valeur sur valeurs mobilières,lu_2011_account_753,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_75331,75331,Parts dans les entreprises liées,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75332,75332,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75333,75333,Actions propres ou parts propres,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75338,75338,Autres valeurs mobilières,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7534,7534,Ajustements pour juste valeur sur éléments financiers de l’actif circulant,lu_2011_account_753,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_754,754,Plus-value de cession et autres produits de valeurs mobilières,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_7541,7541,Plus-value de cession de valeurs mobilières,lu_2011_account_754,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_75411,75411,Parts dans les entreprises liées,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75412,75412,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75413,75413,Actions propres ou parts propres,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75418,75418,Autres valeurs mobilières,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7548,7548,Autres produits de valeurs mobilières,lu_2011_account_754,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_75481,75481,Parts dans les entreprises liées,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75482,75482,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75483,75483,Actions propres ou parts propres,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75488,75488,Autres valeurs mobilières,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_755,755,Autres intérêts et escomptes,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
-lu_2011_account_7552,7552,Intérêts bancaires et assimilés,lu_2011_account_755,view,account_type_2011_7_produit_financier,f,account_financial_report_156
-lu_2011_account_75521,75521,Intérêts sur comptes courants,lu_2011_account_7552,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75522,75522,Intérêts sur comptes à terme,lu_2011_account_7552,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_75523,75523,Intérêts sur leasings financiers,lu_2011_account_7552,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7553,7553,Intérêts sur créances commerciales,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,account_financial_report_156
-lu_2011_account_7554,7554,Intérêts sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,account_financial_report_155
-lu_2011_account_7555,7555,Escomptes d’effets de commerce,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7556,7556,Escomptes obtenus,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_7558,7558,Intérêts sur autres créances,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_756,756,Gains de change,lu_2011_account_75,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_757,757,Quote-part de bénéfice dans les entreprises collectives (autres que les sociétés de capitaux),lu_2011_account_75,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_758,758,Autres produits financiers,lu_2011_account_75,other,account_type_2011_7_produit_financier,f,account_financial_report_156
-lu_2011_account_759,759,Reprises sur provisions financières,lu_2011_account_75,other,account_type_2011_7_produit_financier,f,
-lu_2011_account_76,76,Produits exceptionnels,lu_2011_account_7,view,account_type_2011_7_produit_exceptionnel,f,account_financial_report_157
-lu_2011_account_761,761,Reprises sur corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7611,7611,Immobilisations incorporelles,lu_2011_account_761,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7612,7612,Immobilisations corporelles,lu_2011_account_761,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_762,762,Reprises sur corrections de valeur exceptionnelles sur éléments de l’actif circulant,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7621,7621,Sur stocks,lu_2011_account_762,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7622,7622,Sur créances de l’actif circulant,lu_2011_account_762,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_763,763,Produits de cession d’immobilisations incorporelles et corporelles,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7631,7631,Immobilisations incorporelles,lu_2011_account_763,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7632,7632,Immobilisations corporelles,lu_2011_account_763,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_764,764,Produits de cession d’immobilisations financières,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7641,7641,Parts dans les entreprises liées,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7642,7642,Créances sur entreprises liées,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7643,7643,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7644,7644,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7645,7645,Titres ayant le caractère d’immobilisations,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7646,7646,Prêts et créances immobilisés,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7647,7647,Actions propres ou parts propres,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_765,765,Produits de cession sur créances de l’actif circulant financier,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7651,7651,Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_765,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7652,7652,Autres créances,lu_2011_account_765,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_768,768,Autres produits exceptionnels,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7681,7681,Pénalités sur marchés et dédits perçus sur achats et sur ventes,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7682,7682,Libéralités reçues,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7683,7683,Rentrées sur créances amorties,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7684,7684,Subventions exceptionnelles,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7685,7685,Bonis provenant de clauses d’indexation,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7686,7686,Bonis provenant du rachat par l’entreprise d’actions et d’obligations émises par elle-même,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7688,7688,Autres produits exceptionnels divers,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_769,769,Reprises sur provisions exceptionnelles,lu_2011_account_76,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_77,77,Régularisations d’impôts sur le résultat,lu_2011_account_7,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_771,771,Régularisations d’impôt sur le revenu des collectivités,lu_2011_account_77,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_772,772,Régularisations d’impôt commercial,lu_2011_account_77,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_773,773,Régularisations d’impôts étrangers sur le résultat,lu_2011_account_77,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_779,779,Reprises sur provisions pour impôts sur le résultat,lu_2011_account_77,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7791,7791,Reprises sur provisions pour impôts,lu_2011_account_779,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_7792,7792,Reprises sur provisions pour impôts différés,lu_2011_account_779,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_78,78,Régularisations d’autres impôts ne figurant pas sous le poste ci-dessus,lu_2011_account_7,view,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_781,781,Régularisations d’impôt sur la fortune,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_782,782,Régularisations de taxes d’abonnement,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_783,783,Régularisations d’impôts étrangers,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_788,788,Régularisations d’autres impôts et taxes,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
-lu_2011_account_789,789,Reprises sur provisions pour autres impôts,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
+id,code,name,parent_id/id,type,user_type/id,reconcile,financial_report_ids/id
+lu_2011_account_0,0,Plan de compte Luxembourgeois - Loi de Juin 2009 (THAMINI & ADN & ACSONE),,view,account.data_account_type_view,f,
+lu_2011_account_bilan,bilan,TOTAL CLASSES 1 A 5,lu_2011_account_0,view,account.data_account_type_view,f,
+lu_2011_account_1,1,"CLASSE 1 - COMPTES DE CAPITAUX, DE PROVISIONS ET DE DETTES FINANCIERES",lu_2011_account_bilan,view,account_type_2011_1_capital,f,
+lu_2011_account_10,10,Capital ou dotation des succursales et comptes de l'exploitant,lu_2011_account_1,view,account_type_2011_1_capital,f,
+lu_2011_account_101,101,Capital souscrit (Sociétés de capitaux - Montant total),lu_2011_account_10,other,account_type_2011_1_capital,f,account_financial_report_68
+lu_2011_account_102,102,Capital souscrit non appelé (Sociétés de capitaux),lu_2011_account_10,other,account_type_2011_1_capital,f,account_financial_report_17
+lu_2011_account_103,103,Capital souscrit appelé et non versé (Sociétés de capitaux),lu_2011_account_10,other,account_type_2011_1_capital,f,account_financial_report_18
+lu_2011_account_104,104,Capital des entreprises commerçants personnes physiques et des sociétés de personnes,lu_2011_account_10,view,account_type_2011_1_capital,f,account_financial_report_68
+lu_2011_account_1041,1041,Commerçants personnes physiques,lu_2011_account_104,other,account_type_2011_1_capital,f,
+lu_2011_account_1042,1042,Sociétés de personnes,lu_2011_account_104,other,account_type_2011_1_capital,f,
+lu_2011_account_105,105,Dotation des succursales,lu_2011_account_10,other,account_type_2011_1_capital,f,account_financial_report_68
+lu_2011_account_106,106,Comptes de l'exploitant ou des coexploitants,lu_2011_account_10,view,account_type_2011_1_capital,f,account_financial_report_68
+lu_2011_account_1061,1061,Prélèvements privés de l'exploitant ou des coexploitants,lu_2011_account_106,view,account_type_2011_1_capital,f,
+lu_2011_account_10611,10611,Prélèvements en numéraire (train de vie),lu_2011_account_1061,other,account_type_2011_1_capital,f,
+lu_2011_account_10612,10612,"Prélèvements en nature de marchandises, de produits finis et services (au prix de revient)",lu_2011_account_1061,other,account_type_2011_1_capital,f,
+lu_2011_account_10613,10613,Part personnelle des frais de maladie,lu_2011_account_1061,other,account_type_2011_1_capital,f,
+lu_2011_account_10614,10614,Primes d'assurances privées,lu_2011_account_1061,view,account_type_2011_1_capital,f,
+lu_2011_account_106141,106141,Vie,lu_2011_account_10614,other,account_type_2011_1_capital,f,
+lu_2011_account_106142,106142,Accident,lu_2011_account_10614,other,account_type_2011_1_capital,f,
+lu_2011_account_106143,106143,Incendie,lu_2011_account_10614,other,account_type_2011_1_capital,f,
+lu_2011_account_106144,106144,Responsabilité civile,lu_2011_account_10614,other,account_type_2011_1_capital,f,
+lu_2011_account_106145,106145,Multirisques,lu_2011_account_10614,other,account_type_2011_1_capital,f,
+lu_2011_account_106148,106148,Autres primes d'assurances privées,lu_2011_account_10614,other,account_type_2011_1_capital,f,
+lu_2011_account_10615,10615,Cotisations,lu_2011_account_1061,view,account_type_2011_1_capital,f,
+lu_2011_account_106151,106151,Assurances sociales (assurance dépendance),lu_2011_account_10615,other,account_type_2011_1_capital,f,
+lu_2011_account_106152,106152,Allocations familiales,lu_2011_account_10615,other,account_type_2011_1_capital,f,
+lu_2011_account_106153,106153,Cotisations pour mutuelles,lu_2011_account_10615,other,account_type_2011_1_capital,f,
+lu_2011_account_106154,106154,"Caisse de décès, médico-chirurgicale, Prestaplus",lu_2011_account_10615,other,account_type_2011_1_capital,f,
+lu_2011_account_106158,106158,Autres cotisations,lu_2011_account_10615,other,account_type_2011_1_capital,f,
+lu_2011_account_10616,10616,Prélèvements en nature (quote-part privée dans les frais généraux),lu_2011_account_1061,view,account_type_2011_1_capital,f,
+lu_2011_account_106161,106161,Salaires,lu_2011_account_10616,other,account_type_2011_1_capital,f,
+lu_2011_account_106162,106162,Loyer,lu_2011_account_10616,other,account_type_2011_1_capital,f,
+lu_2011_account_106163,106163,"Chauffage, gaz, électricité",lu_2011_account_10616,other,account_type_2011_1_capital,f,
+lu_2011_account_106164,106164,Eau,lu_2011_account_10616,other,account_type_2011_1_capital,f,
+lu_2011_account_106165,106165,Téléphone,lu_2011_account_10616,other,account_type_2011_1_capital,f,
+lu_2011_account_106166,106166,Voiture,lu_2011_account_10616,other,account_type_2011_1_capital,f,
+lu_2011_account_106168,106168,Autres prélèvements en nature,lu_2011_account_10616,other,account_type_2011_1_capital,f,
+lu_2011_account_10617,10617,Acquisitions,lu_2011_account_1061,view,account_type_2011_1_capital,f,
+lu_2011_account_106171,106171,Mobilier privé,lu_2011_account_10617,other,account_type_2011_1_capital,f,
+lu_2011_account_106172,106172,Voiture privée,lu_2011_account_10617,other,account_type_2011_1_capital,f,
+lu_2011_account_106173,106173,Titres privés,lu_2011_account_10617,other,account_type_2011_1_capital,f,
+lu_2011_account_106174,106174,Immeubles privés,lu_2011_account_10617,other,account_type_2011_1_capital,f,
+lu_2011_account_106178,106178,Autres acquisitions,lu_2011_account_10617,other,account_type_2011_1_capital,f,
+lu_2011_account_10618,10618,Impôts,lu_2011_account_1061,view,account_type_2011_1_capital,f,
+lu_2011_account_106181,106181,Impôt sur le revenu payé,lu_2011_account_10618,other,account_type_2011_1_capital,f,
+lu_2011_account_106182,106182,Impôt sur la fortune payé,lu_2011_account_10618,other,account_type_2011_1_capital,f,
+lu_2011_account_106183,106183,Impôt commercial - arriérés payés,lu_2011_account_10618,other,account_type_2011_1_capital,f,
+lu_2011_account_106188,106188,Autres impôts,lu_2011_account_10618,other,account_type_2011_1_capital,f,
+lu_2011_account_10619,10619,Prélèvements privés particuliers,lu_2011_account_1061,view,account_type_2011_1_capital,f,
+lu_2011_account_106191,106191,Réparations aux immeubles privés,lu_2011_account_10619,other,account_type_2011_1_capital,f,
+lu_2011_account_106192,106192,Placements sur comptes financiers privés,lu_2011_account_10619,other,account_type_2011_1_capital,f,
+lu_2011_account_106193,106193,Remboursements de dettes privées,lu_2011_account_10619,other,account_type_2011_1_capital,f,
+lu_2011_account_106194,106194,Dons et dotations aux enfants,lu_2011_account_10619,other,account_type_2011_1_capital,f,
+lu_2011_account_106195,106195,Droits de succession et droits de mutation par décès,lu_2011_account_10619,other,account_type_2011_1_capital,f,
+lu_2011_account_106198,106198,Autres prélèvements privés particuliers,lu_2011_account_10619,other,account_type_2011_1_capital,f,
+lu_2011_account_1062,1062,Suppléments d'apports privés de l'exploitant ou des coexploitants,lu_2011_account_106,view,account_type_2011_1_capital,f,
+lu_2011_account_10621,10621,Héritage ou donation,lu_2011_account_1062,other,account_type_2011_1_capital,f,
+lu_2011_account_10622,10622,Avoirs privés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
+lu_2011_account_10623,10623,Emprunts privés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
+lu_2011_account_10624,10624,Cessions,lu_2011_account_1062,view,account_type_2011_1_capital,f,
+lu_2011_account_106241,106241,Mobilier privé,lu_2011_account_10624,other,account_type_2011_1_capital,f,
+lu_2011_account_106242,106242,Voiture privée,lu_2011_account_10624,other,account_type_2011_1_capital,f,
+lu_2011_account_106243,106243,Titres privés,lu_2011_account_10624,other,account_type_2011_1_capital,f,
+lu_2011_account_106244,106244,Immeubles privés,lu_2011_account_10624,other,account_type_2011_1_capital,f,
+lu_2011_account_106248,106248,Autres cessions,lu_2011_account_10624,other,account_type_2011_1_capital,f,
+lu_2011_account_10625,10625,Loyers encaissés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
+lu_2011_account_10626,10626,Salaires ou rentes touchés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
+lu_2011_account_10627,10627,Allocations familiales reçues,lu_2011_account_1062,other,account_type_2011_1_capital,f,
+lu_2011_account_10628,10628,Remboursements d'impôts,lu_2011_account_1062,view,account_type_2011_1_capital,f,
+lu_2011_account_106281,106281,Impôt sur le revenu,lu_2011_account_10628,other,account_type_2011_1_capital,f,
+lu_2011_account_106283,106283,Impôt sur la fortune,lu_2011_account_10628,other,account_type_2011_1_capital,f,
+lu_2011_account_106284,106284,Impôt commercial,lu_2011_account_10628,other,account_type_2011_1_capital,f,
+lu_2011_account_106288,106288,Autres remboursements d'impôts,lu_2011_account_10628,other,account_type_2011_1_capital,f,
+lu_2011_account_10629,10629,Quote-part professionnelle de frais privés,lu_2011_account_1062,other,account_type_2011_1_capital,f,
+lu_2011_account_11,11,Primes d'émission et primes assimilées,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_69
+lu_2011_account_111,111,Primes d'émission,lu_2011_account_11,other,account_type_2011_1_capital,f,
+lu_2011_account_112,112,Primes de fusion,lu_2011_account_11,other,account_type_2011_1_capital,f,
+lu_2011_account_113,113,Primes d'apport,lu_2011_account_11,other,account_type_2011_1_capital,f,
+lu_2011_account_114,114,Primes de conversion d'obligations en actions,lu_2011_account_11,other,account_type_2011_1_capital,f,
+lu_2011_account_115,115,"Apport en capitaux propres non rémunéré par des titres (""Capital contribution"")",lu_2011_account_11,other,account_type_2011_1_capital,f,
+lu_2011_account_12,12,Réserves de réévaluation,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_70
+lu_2011_account_121,121,Réserves de réévaluation en application de la juste valeur,lu_2011_account_12,other,account_type_2011_1_capital,f,
+lu_2011_account_122,122,Réserves de mise en équivalence (Participations valorisées suivant l'art. 58),lu_2011_account_12,other,account_type_2011_1_capital,f,
+lu_2011_account_123,123,Plus-values sur écarts de conversion immunisées,lu_2011_account_12,other,account_type_2011_1_capital,f,
+lu_2011_account_128,128,Autres réserves de réévaluation,lu_2011_account_12,other,account_type_2011_1_capital,f,
+lu_2011_account_13,13,Réserves,lu_2011_account_1,view,account_type_2011_1_capital,f,
+lu_2011_account_131,131,Réserve légale,lu_2011_account_13,other,account_type_2011_1_capital,f,account_financial_report_72
+lu_2011_account_132,132,Réserve pour actions propres ou parts propres,lu_2011_account_13,other,account_type_2011_1_capital,f,account_financial_report_73
+lu_2011_account_133,133,Réserves statutaires,lu_2011_account_13,other,account_type_2011_1_capital,f,account_financial_report_74
+lu_2011_account_138,138,Autres réserves,lu_2011_account_13,view,account_type_2011_1_capital,f,account_financial_report_75
+lu_2011_account_1381,1381,Réserve pour l'impôt sur la fortune,lu_2011_account_138,other,account_type_2011_1_capital,f,
+lu_2011_account_1382,1382,Autres réserves indisponibles,lu_2011_account_138,other,account_type_2011_1_capital,f,
+lu_2011_account_1383,1383,Autres réserves disponibles,lu_2011_account_138,other,account_type_2011_1_capital,f,
+lu_2011_account_14,14,Résultats,lu_2011_account_1,view,account_type_2011_1_capital,f,
+lu_2011_account_141,141,Résultats reportés,lu_2011_account_14,other,account_type_2011_1_capital,f,account_financial_report_76
+lu_2011_account_142,142,Résultat de l'exercice,lu_2011_account_14,other,account_type_2011_1_capital,f,account_financial_report_77
+lu_2011_account_15,15,Acomptes sur dividendes,lu_2011_account_1,other,account_type_2011_1_capital,f,account_financial_report_78
+lu_2011_account_16,16,Subventions d'investissement en capital,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_79
+lu_2011_account_161,161,Terrains et constructions,lu_2011_account_16,other,account_type_2011_1_capital,f,
+lu_2011_account_162,162,Installations techniques et machines,lu_2011_account_16,other,account_type_2011_1_capital,f,
+lu_2011_account_163,163,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_16,other,account_type_2011_1_capital,f,
+lu_2011_account_168,168,Autres subventions d'investissement en capital,lu_2011_account_16,other,account_type_2011_1_capital,f,
+lu_2011_account_17,17,Plus-values immunisées,lu_2011_account_1,view,account_type_2011_1_capital,f,account_financial_report_80
+lu_2011_account_171,171,Plus-values immunisées à réinvestir,lu_2011_account_17,other,account_type_2011_1_capital,f,
+lu_2011_account_172,172,Plus-values immunisées réinvesties,lu_2011_account_17,other,account_type_2011_1_capital,f,
+lu_2011_account_18,18,Provisions,lu_2011_account_1,view,account_type_2011_1_provision,f,
+lu_2011_account_181,181,Provisions pour pensions et obligations similaires,lu_2011_account_18,other,account_type_2011_1_provision,f,account_financial_report_83
+lu_2011_account_182,182,Provisions pour impôts,lu_2011_account_18,view,account_type_2011_1_provision,f,account_financial_report_84
+lu_2011_account_1821,1821,Provisions pour impôt sur le revenu des collectivités,lu_2011_account_182,other,account_type_2011_1_provision,f,
+lu_2011_account_1822,1822,Provisions pour impôt commercial,lu_2011_account_182,other,account_type_2011_1_provision,f,
+lu_2011_account_1823,1823,Provisions pour impôt sur la fortune,lu_2011_account_182,other,account_type_2011_1_provision,f,
+lu_2011_account_1828,1828,Autres provisions pour impôts,lu_2011_account_182,other,account_type_2011_1_provision,f,
+lu_2011_account_183,183,Provisions pour impôts différés,lu_2011_account_18,other,account_type_2011_1_provision,f,account_financial_report_84
+lu_2011_account_188,188,Autres provisions,lu_2011_account_18,view,account_type_2011_1_provision,f,account_financial_report_85
+lu_2011_account_1881,1881,Provisions d'exploitation,lu_2011_account_188,other,account_type_2011_1_provision,f,
+lu_2011_account_1882,1882,Provisions financières,lu_2011_account_188,other,account_type_2011_1_provision,f,
+lu_2011_account_1883,1883,Provisions exceptionnelles,lu_2011_account_188,other,account_type_2011_1_provision,f,
+lu_2011_account_19,19,Dettes financières et dettes assimilées,lu_2011_account_1,view,account_type_2011_1_provision,f,
+lu_2011_account_191,191,Dettes subordonnées,lu_2011_account_19,view,account_type_2011_1_provision,f,account_financial_report_81
+lu_2011_account_1911,1911,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_191,view,account_type_2011_1_provision,f,
+lu_2011_account_19111,19111,Montant principal,lu_2011_account_1911,other,account_type_2011_1_provision,f,
+lu_2011_account_19112,19112,Intérêts courus,lu_2011_account_1911,other,account_type_2011_1_provision,f,
+lu_2011_account_1912,1912,dont la durée résiduelle est supérieure à un an,lu_2011_account_191,view,account_type_2011_1_provision,f,
+lu_2011_account_19121,19121,Montant principal,lu_2011_account_1912,other,account_type_2011_1_provision,f,
+lu_2011_account_19122,19122,Intérêts courus,lu_2011_account_1912,other,account_type_2011_1_provision,f,
+lu_2011_account_192,192,Emprunts obligataires convertibles,lu_2011_account_19,view,account_type_2011_1_provision,f,
+lu_2011_account_1921,1921,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_192,view,account_type_2011_1_provision,f,account_financial_report_89
+lu_2011_account_19211,19211,Montant principal,lu_2011_account_1921,other,account_type_2011_1_provision,f,
+lu_2011_account_19212,19212,Intérêts courus,lu_2011_account_1921,other,account_type_2011_1_provision,f,
+lu_2011_account_1922,1922,dont la durée résiduelle est supérieure à un an,lu_2011_account_192,view,account_type_2011_1_provision,f,account_financial_report_90
+lu_2011_account_19221,19221,Montant principal,lu_2011_account_1922,other,account_type_2011_1_provision,f,
+lu_2011_account_19222,19222,Intérêts courus,lu_2011_account_1922,other,account_type_2011_1_provision,f,
+lu_2011_account_193,193,Emprunts obligataires non convertibles,lu_2011_account_19,view,account_type_2011_1_provision,f,
+lu_2011_account_1931,1931,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_193,view,account_type_2011_1_provision,f,account_financial_report_92
+lu_2011_account_19311,19311,Montant principal,lu_2011_account_1931,other,account_type_2011_1_provision,f,
+lu_2011_account_19312,19312,Intérêts courus,lu_2011_account_1931,other,account_type_2011_1_provision,f,
+lu_2011_account_1932,1932,dont la durée résiduelle est supérieure à un an,lu_2011_account_193,view,account_type_2011_1_provision,f,account_financial_report_93
+lu_2011_account_19321,19321,Montant principal,lu_2011_account_1932,other,account_type_2011_1_provision,f,
+lu_2011_account_19322,19322,Intérêts courus,lu_2011_account_1932,other,account_type_2011_1_provision,f,
+lu_2011_account_194,194,Dettes envers des établissements de crédit,lu_2011_account_19,view,account_type_2011_1_provision,f,
+lu_2011_account_1941,1941,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_194,view,account_type_2011_1_provision,f,account_financial_report_95
+lu_2011_account_19411,19411,Montant principal,lu_2011_account_1941,other,account_type_2011_1_provision,f,
+lu_2011_account_19412,19412,Intérêts courus,lu_2011_account_1941,other,account_type_2011_1_provision,f,
+lu_2011_account_1942,1942,dont la durée résiduelle est supérieure à un an,lu_2011_account_194,view,account_type_2011_1_provision,f,account_financial_report_96
+lu_2011_account_19421,19421,Montant principal,lu_2011_account_1942,other,account_type_2011_1_provision,f,
+lu_2011_account_19422,19422,Intérêts courus,lu_2011_account_1942,other,account_type_2011_1_provision,f,
+lu_2011_account_195,195,Dettes de leasing financier,lu_2011_account_19,view,account_type_2011_1_provision,f,
+lu_2011_account_1951,1951,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_195,other,account_type_2011_1_provision,f,account_financial_report_95
+lu_2011_account_1952,1952,dont la durée résiduelle est supérieure à un an,lu_2011_account_195,other,account_type_2011_1_provision,f,account_financial_report_96
+lu_2011_account_198,198,Autres emprunts et dettes assimilées,lu_2011_account_19,view,account_type_2011_1_provision,f,
+lu_2011_account_1981,1981,dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_198,view,account_type_2011_1_provision,f,account_financial_report_116
+lu_2011_account_19811,19811,Autres emprunts,lu_2011_account_1981,other,account_type_2011_1_provision,f,
+lu_2011_account_19812,19812,Rentes viagères capitalisées,lu_2011_account_1981,other,account_type_2011_1_provision,f,
+lu_2011_account_19813,19813,Autres dettes assimilées,lu_2011_account_1981,other,account_type_2011_1_provision,f,
+lu_2011_account_19814,19814,Intérêts courus sur autres emprunts et dettes assimilées,lu_2011_account_1981,other,account_type_2011_1_provision,f,
+lu_2011_account_1982,1982,dont la durée résiduelle est supérieure à un an,lu_2011_account_198,view,account_type_2011_1_provision,f,account_financial_report_117
+lu_2011_account_19821,19821,Autres emprunts,lu_2011_account_1982,other,account_type_2011_1_provision,f,
+lu_2011_account_19822,19822,Rentes viagères capitalisées,lu_2011_account_1982,other,account_type_2011_1_provision,f,
+lu_2011_account_19823,19823,Autres dettes assimilées,lu_2011_account_1982,other,account_type_2011_1_provision,f,
+lu_2011_account_19824,19824,Intérêts courus sur autres emprunts et dettes assimilées,lu_2011_account_1982,other,account_type_2011_1_provision,f,
+lu_2011_account_2,2,CLASSE 2 - COMPTES DE FRAIS D’ETABLISSEMENT ET D’ACTIFS IMMOBILISES,lu_2011_account_bilan,view,account.data_account_type_view,f,
+lu_2011_account_20,20,Frais d'établissement et frais assimilés,lu_2011_account_2,view,account_type_2011_2_immo,f,account_financial_report_19
+lu_2011_account_201,201,Frais de constitution,lu_2011_account_20,other,account_type_2011_2_immo,f,
+lu_2011_account_202,202,Frais de premier établissement,lu_2011_account_20,view,account_type_2011_2_immo,f,
+lu_2011_account_2021,2021,Frais de prospection,lu_2011_account_202,other,account_type_2011_2_immo,f,
+lu_2011_account_2022,2022,Frais de publicité,lu_2011_account_202,other,account_type_2011_2_immo,f,
+lu_2011_account_203,203,"Frais d'augmentation de capital et d'opérations diverses (fusions, scissions, transformations)",lu_2011_account_20,other,account_type_2011_2_immo,f,
+lu_2011_account_204,204,Frais d'émission d'emprunts,lu_2011_account_20,other,account_type_2011_2_immo,f,
+lu_2011_account_208,208,Autres frais assimilés,lu_2011_account_20,other,account_type_2011_2_immo,f,
+lu_2011_account_21,21,Immobilisations incorporelles,lu_2011_account_2,view,account_type_2011_2_immo,f,
+lu_2011_account_211,211,Frais de recherche et de développement,lu_2011_account_21,other,account_type_2011_2_immo,f,account_financial_report_22
+lu_2011_account_212,212,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_21,view,account_type_2011_2_immo,f,
+lu_2011_account_2121,2121,Acquis à titre onéreux (Actifs incorporels non produits),lu_2011_account_212,view,account_type_2011_2_immo,f,account_financial_report_24
+lu_2011_account_21211,21211,Concessions,lu_2011_account_2121,other,account_type_2011_2_immo,f,
+lu_2011_account_21212,21212,Brevets,lu_2011_account_2121,other,account_type_2011_2_immo,f,
+lu_2011_account_21213,21213,Licences informatiques (logiciels et progiciels informatiques),lu_2011_account_2121,other,account_type_2011_2_immo,f,
+lu_2011_account_21214,21214,Marques et franchises,lu_2011_account_2121,other,account_type_2011_2_immo,f,
+lu_2011_account_21215,21215,Droits et valeurs similaires acquis à titre onéreux,lu_2011_account_2121,view,account_type_2011_2_immo,f,
+lu_2011_account_212151,212151,Droits d'auteur et de reproduction,lu_2011_account_21215,other,account_type_2011_2_immo,f,
+lu_2011_account_212152,212152,Droits d'émission,lu_2011_account_21215,other,account_type_2011_2_immo,f,
+lu_2011_account_212158,212158,Autres droits et valeurs similaires acquis à titre onéreux,lu_2011_account_21215,other,account_type_2011_2_immo,f,
+lu_2011_account_2122,2122,Créés par l'entreprise elle-même (Actifs incorporels produits),lu_2011_account_212,view,account_type_2011_2_immo,f,account_financial_report_25
+lu_2011_account_21221,21221,Concessions,lu_2011_account_2122,other,account_type_2011_2_immo,f,
+lu_2011_account_21222,21222,Brevets,lu_2011_account_2122,other,account_type_2011_2_immo,f,
+lu_2011_account_21223,21223,Licences informatiques (logiciels et progiciels informatiques),lu_2011_account_2122,other,account_type_2011_2_immo,f,
+lu_2011_account_21224,21224,Marques et franchises,lu_2011_account_2122,other,account_type_2011_2_immo,f,
+lu_2011_account_21225,21225,Droits et valeurs similaires créés par l'entreprise elle-même,lu_2011_account_2122,view,account_type_2011_2_immo,f,
+lu_2011_account_212251,212251,Droits d'auteur et de reproduction,lu_2011_account_21225,other,account_type_2011_2_immo,f,
+lu_2011_account_212252,212252,Droits d'émission,lu_2011_account_21225,other,account_type_2011_2_immo,f,
+lu_2011_account_212258,212258,Autres droits et valeurs similaires créés par l'entreprise elle-même,lu_2011_account_21225,other,account_type_2011_2_immo,f,
+lu_2011_account_213,213,"Fonds de commerce, dans la mesure où il a été acquis à titre onéreux",lu_2011_account_21,other,account_type_2011_2_immo,f,account_financial_report_26
+lu_2011_account_214,214,Acomptes versés et immobilisations incorporelles en cours,lu_2011_account_21,view,account_type_2011_2_immo,f,account_financial_report_27
+lu_2011_account_2141,2141,Frais de recherche et de développement,lu_2011_account_214,other,account_type_2011_2_immo,f,
+lu_2011_account_2142,2142,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_214,other,account_type_2011_2_immo,f,
+lu_2011_account_2143,2143,Fonds de commerce,lu_2011_account_214,other,account_type_2011_2_immo,f,
+lu_2011_account_22,22,Immobilisations corporelles,lu_2011_account_2,view,account_type_2011_2_immo,f,
+lu_2011_account_221,221,Terrains et constructions,lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_29
+lu_2011_account_2211,2211,Terrains,lu_2011_account_221,view,account_type_2011_2_immo,f,
+lu_2011_account_22111,22111,Terrains nus,lu_2011_account_2211,other,account_type_2011_2_immo,f,
+lu_2011_account_22112,22112,Terrains aménagés,lu_2011_account_2211,other,account_type_2011_2_immo,f,
+lu_2011_account_22113,22113,Sous-sols et sursols,lu_2011_account_2211,other,account_type_2011_2_immo,f,
+lu_2011_account_22114,22114,Terrains de gisement,lu_2011_account_2211,other,account_type_2011_2_immo,f,
+lu_2011_account_22115,22115,Terrains bâtis,lu_2011_account_2211,other,account_type_2011_2_immo,f,
+lu_2011_account_22118,22118,Autres terrains,lu_2011_account_2211,other,account_type_2011_2_immo,f,
+lu_2011_account_2212,2212,Agencements et aménagements de terrains,lu_2011_account_221,view,account_type_2011_2_immo,f,
+lu_2011_account_22121,22121,Agencements et aménagements de terrains nus,lu_2011_account_2212,other,account_type_2011_2_immo,f,
+lu_2011_account_22122,22122,Agencements et aménagements de terrains aménagés,lu_2011_account_2212,other,account_type_2011_2_immo,f,
+lu_2011_account_22123,22123,Agencements et aménagements de sous-sols et sursols,lu_2011_account_2212,other,account_type_2011_2_immo,f,
+lu_2011_account_22124,22124,Agencements et aménagements de terrains de gisement,lu_2011_account_2212,other,account_type_2011_2_immo,f,
+lu_2011_account_22125,22125,Agencements et aménagements de terrains bâtis,lu_2011_account_2212,other,account_type_2011_2_immo,f,
+lu_2011_account_22128,22128,Agencements et aménagements d'autres terrains,lu_2011_account_2212,other,account_type_2011_2_immo,f,
+lu_2011_account_2213,2213,Constructions,lu_2011_account_221,view,account_type_2011_2_immo,f,
+lu_2011_account_22131,22131,Constructions sur sol propre,lu_2011_account_2213,other,account_type_2011_2_immo,f,
+lu_2011_account_22132,22132,Constructions sur sol d'autrui,lu_2011_account_2213,other,account_type_2011_2_immo,f,
+lu_2011_account_222,222,Installations techniques et machines,lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_30
+lu_2011_account_2221,2221,Installations techniques,lu_2011_account_222,other,account_type_2011_2_immo,f,
+lu_2011_account_2222,2222,Machines,lu_2011_account_222,other,account_type_2011_2_immo,f,
+lu_2011_account_223,223,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_31
+lu_2011_account_2231,2231,Equipement de transport et de manutention,lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_2232,2232,Véhicules de transport,lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_2233,2233,Outillage,lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_2234,2234,Mobilier,lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_2235,2235,Matériel informatique (hardware),lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_2236,2236,Cheptel,lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_2237,2237,Emballages récupérables,lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_2238,2238,Autres installations,lu_2011_account_223,other,account_type_2011_2_immo,f,
+lu_2011_account_224,224,Acomptes versés et immobilisations corporelles en cours,lu_2011_account_22,view,account_type_2011_2_immo,f,account_financial_report_32
+lu_2011_account_2241,2241,Terrains et constructions,lu_2011_account_224,view,account_type_2011_2_immo,f,
+lu_2011_account_22411,22411,Terrains,lu_2011_account_2241,other,account_type_2011_2_immo,f,
+lu_2011_account_22412,22412,Agencements et aménagements de terrains,lu_2011_account_2241,other,account_type_2011_2_immo,f,
+lu_2011_account_22413,22413,Constructions,lu_2011_account_2241,other,account_type_2011_2_immo,f,
+lu_2011_account_2242,2242,Installations techniques et machines,lu_2011_account_224,other,account_type_2011_2_immo,f,
+lu_2011_account_2243,2243,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_224,other,account_type_2011_2_immo,f,
+lu_2011_account_23,23,Immobilisations financières,lu_2011_account_2,view,account_type_2011_2_immo,f,
+lu_2011_account_231,231,Parts dans des entreprises liées,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_34
+lu_2011_account_232,232,Créances sur des entreprises liées,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_35
+lu_2011_account_233,233,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_36
+lu_2011_account_234,234,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_37
+lu_2011_account_235,235,Titres ayant le caractère d'immobilisations,lu_2011_account_23,view,account_type_2011_2_immo,f,account_financial_report_38
+lu_2011_account_2351,2351,Titres immobilisés (droit de propriété),lu_2011_account_235,view,account_type_2011_2_immo,f,
+lu_2011_account_23511,23511,Actions,lu_2011_account_2351,other,account_type_2011_2_immo,f,
+lu_2011_account_23518,23518,Autres titres immobilisés (droit de propriété),lu_2011_account_2351,other,account_type_2011_2_immo,f,
+lu_2011_account_2352,2352,Titres immobilisés (droit de créance),lu_2011_account_235,view,account_type_2011_2_immo,f,
+lu_2011_account_23521,23521,Obligations,lu_2011_account_2352,other,account_type_2011_2_immo,f,
+lu_2011_account_23528,23528,Autres titres immobilisés (droit de créance),lu_2011_account_2352,other,account_type_2011_2_immo,f,
+lu_2011_account_2358,2358,Autres titres ayant le caractère d'immobilisations,lu_2011_account_235,other,account_type_2011_2_immo,f,
+lu_2011_account_236,236,Prêts et créances immobilisées,lu_2011_account_23,view,account_type_2011_2_immo,f,account_financial_report_39
+lu_2011_account_2361,2361,Prêts,lu_2011_account_236,view,account_type_2011_2_immo,f,
+lu_2011_account_23611,23611,Prêts participatifs,lu_2011_account_2361,other,account_type_2011_2_immo,f,
+lu_2011_account_23612,23612,Prêts aux associés,lu_2011_account_2361,other,account_type_2011_2_immo,f,
+lu_2011_account_23613,23613,Prêts au personnel,lu_2011_account_2361,other,account_type_2011_2_immo,f,
+lu_2011_account_23618,23618,Autres prêts,lu_2011_account_2361,other,account_type_2011_2_immo,f,
+lu_2011_account_2362,2362,Dépôts et cautionnements versés,lu_2011_account_236,view,account_type_2011_2_immo,f,
+lu_2011_account_23621,23621,Dépôts,lu_2011_account_2362,other,account_type_2011_2_immo,f,
+lu_2011_account_23622,23622,Cautionnements,lu_2011_account_2362,other,account_type_2011_2_immo,f,
+lu_2011_account_2363,2363,Créances immobilisées,lu_2011_account_236,other,account_type_2011_2_immo,f,
+lu_2011_account_237,237,Actions propres ou parts propres,lu_2011_account_23,other,account_type_2011_2_immo,f,account_financial_report_40
+lu_2011_account_3,3,CLASSE 3 - COMPTES DE STOCKS,lu_2011_account_bilan,view,account.data_account_type_view,f,
+lu_2011_account_30,30,Matières premières et consommables,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_43
+lu_2011_account_301,301,Matières premières,lu_2011_account_30,other,account_type_2011_3_stock,f,
+lu_2011_account_302,302,Matières consommables,lu_2011_account_30,other,account_type_2011_3_stock,f,
+lu_2011_account_303,303,Fournitures consommables,lu_2011_account_30,view,account_type_2011_3_stock,f,
+lu_2011_account_3031,3031,Combustibles,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_3032,3032,Produits d'entretien,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_3033,3033,Fournitures d'atelier et d'usine,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_3034,3034,Fournitures de magasin,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_3035,3035,Fournitures de bureau,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_3036,3036,Carburants,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_3037,3037,Lubrifiants,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_3038,3038,Autres fournitures consommables,lu_2011_account_303,other,account_type_2011_3_stock,f,
+lu_2011_account_304,304,Emballages,lu_2011_account_30,view,account_type_2011_3_stock,f,
+lu_2011_account_3041,3041,Emballages non-récupérables,lu_2011_account_304,other,account_type_2011_3_stock,f,
+lu_2011_account_3042,3042,Emballages récupérables,lu_2011_account_304,other,account_type_2011_3_stock,f,
+lu_2011_account_3043,3043,Emballages à usage mixte,lu_2011_account_304,other,account_type_2011_3_stock,f,
+lu_2011_account_305,305,Approvisionnements,lu_2011_account_30,other,account_type_2011_3_stock,f,
+lu_2011_account_31,31,Produits en cours de fabrication et commandes en cours,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_44
+lu_2011_account_311,311,Produits en cours de fabrication,lu_2011_account_31,other,account_type_2011_3_stock,f,
+lu_2011_account_312,312,Commandes en cours – Produits,lu_2011_account_31,other,account_type_2011_3_stock,f,
+lu_2011_account_313,313,Commandes en cours – Prestations de services,lu_2011_account_31,other,account_type_2011_3_stock,f,
+lu_2011_account_314,314,Immeubles en construction,lu_2011_account_31,other,account_type_2011_3_stock,f,
+lu_2011_account_32,32,Produits finis et marchandises,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_45
+lu_2011_account_321,321,Produits finis,lu_2011_account_32,other,account_type_2011_3_stock,f,
+lu_2011_account_322,322,Produits intermédiaires,lu_2011_account_32,other,account_type_2011_3_stock,f,
+lu_2011_account_323,323,Produits résiduels,lu_2011_account_32,view,account_type_2011_3_stock,f,
+lu_2011_account_3231,3231,Déchets,lu_2011_account_323,other,account_type_2011_3_stock,f,
+lu_2011_account_3232,3232,Rebuts,lu_2011_account_323,other,account_type_2011_3_stock,f,
+lu_2011_account_3233,3233,Matières de récupération,lu_2011_account_323,other,account_type_2011_3_stock,f,
+lu_2011_account_326,326,Marchandises,lu_2011_account_32,other,account_type_2011_3_stock,f,
+lu_2011_account_327,327,"Marchandises en voie d'acheminement, mises en dépôt ou données en consignation",lu_2011_account_32,other,account_type_2011_3_stock,f,
+lu_2011_account_33,33,Terrains et immeubles destinés à la revente,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_45
+lu_2011_account_331,331,Terrains,lu_2011_account_33,other,account_type_2011_3_stock,f,
+lu_2011_account_332,332,Immeubles,lu_2011_account_33,view,account_type_2011_3_stock,f,
+lu_2011_account_3321,3321,Immeubles acquis,lu_2011_account_332,other,account_type_2011_3_stock,f,
+lu_2011_account_3322,3322,Immeubles construits,lu_2011_account_332,other,account_type_2011_3_stock,f,
+lu_2011_account_34,34,Acomptes versés,lu_2011_account_3,view,account_type_2011_3_stock,f,account_financial_report_46
+lu_2011_account_341,341,Acomptes versés sur matières premières et consommables,lu_2011_account_34,other,account_type_2011_3_stock,f,
+lu_2011_account_342,342,Acomptes versés sur produits en cours de fabrication et commandes en cours,lu_2011_account_34,other,account_type_2011_3_stock,f,
+lu_2011_account_343,343,Acomptes versés sur produits finis et marchandises,lu_2011_account_34,other,account_type_2011_3_stock,f,
+lu_2011_account_344,344,Acomptes versés sur terrains et immeubles destinés à la revente,lu_2011_account_34,other,account_type_2011_3_stock,f,
+lu_2011_account_4,4,CLASSE 4 - COMPTES DE TIERS,lu_2011_account_bilan,view,account.data_account_type_view,f,
+lu_2011_account_40,40,Créances résultant de ventes et prestations de services,lu_2011_account_4,view,account_type_2011_4_creance,f,
+lu_2011_account_401,401,Créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_40,view,account_type_2011_4_creance,f,account_financial_report_49
+lu_2011_account_4011,4011,Clients,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4012,4012,Clients – Effets à recevoir,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4013,4013,Clients douteux ou litigieux,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4014,4014,Clients – Factures à établir,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4015,4015,Clients créditeurs,lu_2011_account_401,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4019,4019,Corrections de valeur,lu_2011_account_401,other,account_type_2011_4_creance,f,
+lu_2011_account_402,402,Créances dont la durée résiduelle est supérieure à un an,lu_2011_account_40,view,account_type_2011_4_creance,f,account_financial_report_50
+lu_2011_account_4021,4021,Clients,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4022,4022,Clients – Effets à recevoir,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4023,4023,Clients douteux ou litigieux,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4024,4024,Clients – Factures à établir,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4025,4025,Clients créditeurs,lu_2011_account_402,receivable,account_type_2011_4_creance,t,
+lu_2011_account_4029,4029,Corrections de valeur,lu_2011_account_402,other,account_type_2011_4_creance,f,
+lu_2011_account_41,41,Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_4,view,account_type_2011_4_creance,f,
+lu_2011_account_411,411,Créances sur des entreprises liées,lu_2011_account_41,view,account_type_2011_4_creance,f,
+lu_2011_account_4111,4111,Créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_411,view,account_type_2011_4_creance,f,account_financial_report_52
+lu_2011_account_41111,41111,Ventes de marchandises et de prestations de services,lu_2011_account_4111,other,account_type_2011_4_creance,f,
+lu_2011_account_41112,41112,Prêts et avances,lu_2011_account_4111,other,account_type_2011_4_creance,f,
+lu_2011_account_41113,41113,Intérêts courus,lu_2011_account_4111,other,account_type_2011_4_creance,f,
+lu_2011_account_41114,41114,Dividendes à recevoir,lu_2011_account_4111,other,account_type_2011_4_creance,f,
+lu_2011_account_41118,41118,Autres créances,lu_2011_account_4111,other,account_type_2011_4_creance,f,
+lu_2011_account_41119,41119,Corrections de valeur,lu_2011_account_4111,other,account_type_2011_4_creance,f,
+lu_2011_account_4112,4112,Créances dont la durée résiduelle est supérieure à un an,lu_2011_account_411,view,account_type_2011_4_creance,f,account_financial_report_53
+lu_2011_account_41121,41121,Ventes de marchandises et de prestations de services,lu_2011_account_4112,other,account_type_2011_4_creance,f,
+lu_2011_account_41122,41122,Prêts et avances,lu_2011_account_4112,other,account_type_2011_4_creance,f,
+lu_2011_account_41123,41123,Intérêts courus,lu_2011_account_4112,other,account_type_2011_4_creance,f,
+lu_2011_account_41124,41124,Dividendes à recevoir,lu_2011_account_4112,other,account_type_2011_4_creance,f,
+lu_2011_account_41128,41128,Autres créances,lu_2011_account_4112,other,account_type_2011_4_creance,f,
+lu_2011_account_41129,41129,Corrections de valeur,lu_2011_account_4112,other,account_type_2011_4_creance,f,
+lu_2011_account_412,412,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_41,view,account_type_2011_4_creance,f,
+lu_2011_account_4121,4121,Créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_412,view,account_type_2011_4_creance,f,account_financial_report_55
+lu_2011_account_41211,41211,Ventes de marchandises et de prestations de service,lu_2011_account_4121,other,account_type_2011_4_creance,f,
+lu_2011_account_41212,41212,Prêts et avances,lu_2011_account_4121,other,account_type_2011_4_creance,f,
+lu_2011_account_41213,41213,Intérêts courus,lu_2011_account_4121,other,account_type_2011_4_creance,f,
+lu_2011_account_41214,41214,Dividendes à recevoir,lu_2011_account_4121,other,account_type_2011_4_creance,f,
+lu_2011_account_41218,41218,Autres créances,lu_2011_account_4121,other,account_type_2011_4_creance,f,
+lu_2011_account_41219,41219,Corrections de valeur,lu_2011_account_4121,other,account_type_2011_4_creance,f,
+lu_2011_account_4122,4122,Créances dont la durée résiduelle est supérieure à un an,lu_2011_account_412,view,account_type_2011_4_creance,f,account_financial_report_56
+lu_2011_account_41221,41221,Ventes de marchandises et de prestations de service,lu_2011_account_4122,other,account_type_2011_4_creance,f,
+lu_2011_account_41222,41222,Prêts et avances,lu_2011_account_4122,other,account_type_2011_4_creance,f,
+lu_2011_account_41223,41223,Intérêts courus,lu_2011_account_4122,other,account_type_2011_4_creance,f,
+lu_2011_account_41224,41224,Dividendes à recevoir,lu_2011_account_4122,other,account_type_2011_4_creance,f,
+lu_2011_account_41228,41228,Autres créances,lu_2011_account_4122,other,account_type_2011_4_creance,f,
+lu_2011_account_41229,41229,Corrections de valeur,lu_2011_account_4122,other,account_type_2011_4_creance,f,
+lu_2011_account_42,42,Autres créances,lu_2011_account_4,view,account_type_2011_4_creance,f,
+lu_2011_account_421,421,Autres créances dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_42,view,account_type_2011_4_creance,f,account_financial_report_58
+lu_2011_account_4211,4211,Personnel – Avances et acomptes,lu_2011_account_421,view,account_type_2011_4_creance,f,
+lu_2011_account_42111,42111,Avances et acomptes,lu_2011_account_4211,other,account_type_2011_4_creance,f,
+lu_2011_account_42119,42119,Corrections de valeur,lu_2011_account_4211,other,account_type_2011_4_creance,f,
+lu_2011_account_4212,4212,Créances sur associés ou actionnaires,lu_2011_account_421,view,account_type_2011_4_creance,f,
+lu_2011_account_42121,42121,Montant principal,lu_2011_account_4212,other,account_type_2011_4_creance,f,
+lu_2011_account_42122,42122,Intérêts courus,lu_2011_account_4212,other,account_type_2011_4_creance,f,
+lu_2011_account_42129,42129,Corrections de valeur sur créances,lu_2011_account_4212,other,account_type_2011_4_creance,f,
+lu_2011_account_4213,4213,Etat – Subventions à recevoir,lu_2011_account_421,view,account_type_2011_4_creance,f,
+lu_2011_account_42131,42131,Subventions d'investissement,lu_2011_account_4213,other,account_type_2011_4_creance,f,
+lu_2011_account_42132,42132,Subventions d'exploitation,lu_2011_account_4213,other,account_type_2011_4_creance,f,
+lu_2011_account_42138,42138,Autres subventions,lu_2011_account_4213,other,account_type_2011_4_creance,f,
+lu_2011_account_4214,4214,Administration des Contributions Directes (ACD),lu_2011_account_421,other,account_type_2011_4_creance,f,
+lu_2011_account_4215,4215,Administration des Douanes et Accises (ADA),lu_2011_account_421,other,account_type_2011_4_creance,f,
+lu_2011_account_4216,4216,Administration de l'Enregistrement et des Domaines (AED),lu_2011_account_421,view,account_type_2011_4_creance,f,
+lu_2011_account_42161,42161,Taxe sur la valeur ajoutée – TVA,lu_2011_account_4216,view,account_type_2011_4_creance,f,
+lu_2011_account_421611,421611,TVA en amont,lu_2011_account_42161,other,account_type_2011_4_creance,f,
+lu_2011_account_421612,421612,TVA à recevoir,lu_2011_account_42161,other,account_type_2011_4_creance,f,
+lu_2011_account_421613,421613,TVA acomptes versés,lu_2011_account_42161,other,account_type_2011_4_creance,f,
+lu_2011_account_421618,421618,TVA – Autres créances,lu_2011_account_42161,other,account_type_2011_4_creance,f,
+lu_2011_account_42162,42162,Impôts indirects,lu_2011_account_4216,view,account_type_2011_4_creance,f,
+lu_2011_account_421621,421621,Droits d'enregistrement,lu_2011_account_42162,other,account_type_2011_4_creance,f,
+lu_2011_account_421622,421622,Taxe d'abonnement,lu_2011_account_42162,other,account_type_2011_4_creance,f,
+lu_2011_account_421623,421623,Droits d'hypothèques,lu_2011_account_42162,other,account_type_2011_4_creance,f,
+lu_2011_account_421624,421624,Droits de timbre,lu_2011_account_42162,other,account_type_2011_4_creance,f,
+lu_2011_account_421628,421628,Autres impôts indirects,lu_2011_account_42162,other,account_type_2011_4_creance,f,
+lu_2011_account_42168,42168,AED – Autres créances,lu_2011_account_4216,other,account_type_2011_4_creance,f,
+lu_2011_account_4217,4217,Créances sur la sécurité sociale et autres organismes sociaux,lu_2011_account_421,view,account_type_2011_4_creance,f,
+lu_2011_account_42171,42171,Centre Commun de Sécurité Sociale (CCSS),lu_2011_account_4217,other,account_type_2011_4_creance,f,
+lu_2011_account_42172,42172,Mutualité des employeurs,lu_2011_account_4217,other,account_type_2011_4_creance,f,
+lu_2011_account_42178,42178,Autres organismes sociaux,lu_2011_account_4217,other,account_type_2011_4_creance,f,
+lu_2011_account_4218,4218,Créances diverses,lu_2011_account_421,view,account_type_2011_4_creance,f,
+lu_2011_account_42181,42181,Impôts étrangers,lu_2011_account_4218,view,account_type_2011_4_creance,f,
+lu_2011_account_421811,421811,TVA étrangères,lu_2011_account_42181,other,account_type_2011_4_creance,f,
+lu_2011_account_421818,421818,Autres impôts étrangers,lu_2011_account_42181,other,account_type_2011_4_creance,f,
+lu_2011_account_42188,42188,Autres créances diverses,lu_2011_account_4218,other,account_type_2011_4_creance,f,
+lu_2011_account_42189,42189,Corrections de valeur,lu_2011_account_4218,other,account_type_2011_4_creance,f,
+lu_2011_account_422,422,Autres créances dont la durée résiduelle est supérieure à un an,lu_2011_account_42,view,account_type_2011_4_creance,f,account_financial_report_59
+lu_2011_account_4221,4221,Personnel – Avances et acomptes,lu_2011_account_422,view,account_type_2011_4_creance,f,
+lu_2011_account_42211,42211,Avances et acomptes,lu_2011_account_4221,other,account_type_2011_4_creance,f,
+lu_2011_account_42219,42219,Corrections de valeur,lu_2011_account_4221,other,account_type_2011_4_creance,f,
+lu_2011_account_4222,4222,Associés ou actionnaires,lu_2011_account_422,view,account_type_2011_4_creance,f,
+lu_2011_account_42221,42221,Montant principal,lu_2011_account_4222,other,account_type_2011_4_creance,f,
+lu_2011_account_42222,42222,Intérêts courus,lu_2011_account_4222,other,account_type_2011_4_creance,f,
+lu_2011_account_42229,42229,Corrections de valeur sur créances,lu_2011_account_4222,other,account_type_2011_4_creance,f,
+lu_2011_account_4223,4223,Etat – Subventions à recevoir,lu_2011_account_422,view,account_type_2011_4_creance,f,
+lu_2011_account_42231,42231,Subventions d'investissement,lu_2011_account_4223,other,account_type_2011_4_creance,f,
+lu_2011_account_42232,42232,Subventions d'exploitation,lu_2011_account_4223,other,account_type_2011_4_creance,f,
+lu_2011_account_42238,42238,Autres subventions,lu_2011_account_4223,other,account_type_2011_4_creance,f,
+lu_2011_account_4224,4224,Administration des Contributions Directes (ACD),lu_2011_account_422,other,account_type_2011_4_creance,f,
+lu_2011_account_4225,4225,Administration des Douanes et Accises (ADA),lu_2011_account_422,other,account_type_2011_4_creance,f,
+lu_2011_account_4226,4226,Administration de l'Enregistrement et des Domaines (AED),lu_2011_account_422,view,account_type_2011_4_creance,f,
+lu_2011_account_42261,42261,Taxe sur la valeur ajoutée – TVA,lu_2011_account_4226,view,account_type_2011_4_creance,f,
+lu_2011_account_422611,422611,TVA en amont,lu_2011_account_42261,view,account_type_2011_4_creance,f,
+lu_2011_account_4226111,4226111,TVA en amont – Pays,lu_2011_account_422611,other,account_type_2011_4_creance,f,
+lu_2011_account_4226112,4226112,TVA en amont – Intracommunautaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
+lu_2011_account_4226113,4226113,TVA en amont – Triangulaire,lu_2011_account_422611,other,account_type_2011_4_creance,f,
+lu_2011_account_4226114,4226114,TVA en amont – Exonérations spéciales,lu_2011_account_422611,other,account_type_2011_4_creance,f,
+lu_2011_account_422612,422612,TVA à recevoir,lu_2011_account_42261,other,account_type_2011_4_creance,f,
+lu_2011_account_422613,422613,TVA acomptes versés,lu_2011_account_42261,other,account_type_2011_4_creance,f,
+lu_2011_account_422618,422618,TVA – Autres créances,lu_2011_account_42261,other,account_type_2011_4_creance,f,
+lu_2011_account_42262,42262,Impôts indirects,lu_2011_account_4226,view,account_type_2011_4_creance,f,
+lu_2011_account_422621,422621,Droits d'enregistrement,lu_2011_account_42262,other,account_type_2011_4_creance,f,
+lu_2011_account_422622,422622,Taxe d'abonnement,lu_2011_account_42262,other,account_type_2011_4_creance,f,
+lu_2011_account_422623,422623,Droits d'hypothèques,lu_2011_account_42262,other,account_type_2011_4_creance,f,
+lu_2011_account_422624,422624,Droits de timbre,lu_2011_account_42262,other,account_type_2011_4_creance,f,
+lu_2011_account_422628,422628,Autres impôts indirects,lu_2011_account_42262,other,account_type_2011_4_creance,f,
+lu_2011_account_4227,4227,Créances sur la sécurité sociale et autres organismes sociaux,lu_2011_account_422,view,account_type_2011_4_creance,f,
+lu_2011_account_42271,42271,Centre Commun de Sécurité Sociale (CCSS),lu_2011_account_4227,other,account_type_2011_4_creance,f,
+lu_2011_account_42272,42272,Mutualité des employeurs,lu_2011_account_4227,other,account_type_2011_4_creance,f,
+lu_2011_account_42278,42278,Autres organismes sociaux,lu_2011_account_4227,other,account_type_2011_4_creance,f,
+lu_2011_account_4228,4228,Créances diverses,lu_2011_account_422,view,account_type_2011_4_creance,f,
+lu_2011_account_42281,42281,Impôts étrangers,lu_2011_account_4228,view,account_type_2011_4_creance,f,
+lu_2011_account_422811,422811,TVA étrangères,lu_2011_account_42281,other,account_type_2011_4_creance,f,
+lu_2011_account_422818,422818,Autres impôts étrangers,lu_2011_account_42281,other,account_type_2011_4_creance,f,
+lu_2011_account_42288,42288,Autres créances diverses,lu_2011_account_4228,other,account_type_2011_4_creance,f,
+lu_2011_account_42289,42289,Corrections de valeur sur autres créances diverses,lu_2011_account_4228,other,account_type_2011_4_creance,f,
+lu_2011_account_43,43,Acomptes reçus sur commandes pour autant qu'ils ne sont pas déduits des stocks de façon distincte,lu_2011_account_4,view,account_type_2011_4_dette,f,
+lu_2011_account_431,431,Acomptes reçus dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_43,other,account_type_2011_4_dette,f,account_financial_report_98
+lu_2011_account_432,432,Acomptes reçus dont la durée résiduelle est supérieure à un an,lu_2011_account_43,other,account_type_2011_4_dette,f,account_financial_report_99
+lu_2011_account_44,44,Dettes sur achats et prestations de services et dettes représentées par des effets de commerce,lu_2011_account_4,view,account_type_2011_4_dette,f,
+lu_2011_account_441,441,Dettes sur achats et prestations de services,lu_2011_account_44,view,account_type_2011_4_dette,f,
+lu_2011_account_4411,4411,Dettes sur achats et prestations de services dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_441,view,account_type_2011_4_dette,f,account_financial_report_101
+lu_2011_account_44111,44111,Fournisseurs,lu_2011_account_4411,payable,account_type_2011_4_dette,t,
+lu_2011_account_44112,44112,Fournisseurs – Factures non parvenues,lu_2011_account_4411,payable,account_type_2011_4_dette,t,
+lu_2011_account_44113,44113,Fournisseurs débiteurs,lu_2011_account_4411,view,account_type_2011_4_dette,f,
+lu_2011_account_441131,441131,Fournisseurs – Avances et acomptes versés sur commandes,lu_2011_account_44113,payable,account_type_2011_4_dette,t,
+lu_2011_account_441132,441132,Fournisseurs – Créances pour emballages et matériel à rendre,lu_2011_account_44113,payable,account_type_2011_4_dette,t,
+lu_2011_account_441133,441133,Fournisseurs – Autres avoirs,lu_2011_account_44113,payable,account_type_2011_4_dette,t,
+lu_2011_account_441134,441134,"Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus",lu_2011_account_44113,payable,account_type_2011_4_dette,t,
+lu_2011_account_4412,4412,Dettes sur achats et prestations de services dont la durée résiduelle est supérieure à un an,lu_2011_account_441,view,account_type_2011_4_dette,f,account_financial_report_102
+lu_2011_account_44121,44121,Fournisseurs,lu_2011_account_4412,payable,account_type_2011_4_dette,t,
+lu_2011_account_44122,44122,Fournisseurs – Factures non parvenues,lu_2011_account_4412,payable,account_type_2011_4_dette,t,
+lu_2011_account_44123,44123,Fournisseurs débiteurs,lu_2011_account_4412,view,account_type_2011_4_dette,f,
+lu_2011_account_441231,441231,Fournisseurs – Avances et acomptes versés sur commandes,lu_2011_account_44123,payable,account_type_2011_4_dette,t,
+lu_2011_account_441232,441232,Fournisseurs – Créances pour emballages et matériel à rendre,lu_2011_account_44123,payable,account_type_2011_4_dette,t,
+lu_2011_account_441233,441233,Fournisseurs – Autres avoirs,lu_2011_account_44123,payable,account_type_2011_4_dette,t,
+lu_2011_account_441234,441234,"Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus",lu_2011_account_44123,payable,account_type_2011_4_dette,t,
+lu_2011_account_442,442,Dettes représentées par des effets de commerce,lu_2011_account_44,view,account_type_2011_4_dette,f,
+lu_2011_account_4421,4421,Dettes représentées par des effets de commerce dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_442,other,account_type_2011_4_dette,f,account_financial_report_104
+lu_2011_account_4422,4422,Dettes représentées par des effets de commerce dont la durée résiduelle est supérieure à un an,lu_2011_account_442,other,account_type_2011_4_dette,f,account_financial_report_105
+lu_2011_account_45,45,Dettes envers des entreprises liées et des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_4,view,account_type_2011_4_dette,f,
+lu_2011_account_451,451,Dettes envers des entreprises liées,lu_2011_account_45,view,account_type_2011_4_dette,f,
+lu_2011_account_4511,4511,Dettes envers des entreprises liées dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_451,view,account_type_2011_4_dette,f,account_financial_report_107
+lu_2011_account_45111,45111,Ventes de marchandises et de prestations de services,lu_2011_account_4511,other,account_type_2011_4_dette,f,
+lu_2011_account_45112,45112,Prêts et avances,lu_2011_account_4511,other,account_type_2011_4_dette,f,
+lu_2011_account_45113,45113,Intérêts courus,lu_2011_account_4511,other,account_type_2011_4_dette,f,
+lu_2011_account_45114,45114,Dividendes à payer,lu_2011_account_4511,other,account_type_2011_4_dette,f,
+lu_2011_account_45118,45118,Autres dettes,lu_2011_account_4511,other,account_type_2011_4_dette,f,
+lu_2011_account_4512,4512,Dettes envers des entreprises liées dont la durée résiduelle est supérieure à un an,lu_2011_account_451,view,account_type_2011_4_dette,f,account_financial_report_108
+lu_2011_account_45121,45121,Ventes de marchandises et de prestations de services,lu_2011_account_4512,other,account_type_2011_4_dette,f,
+lu_2011_account_45122,45122,Prêts et avances,lu_2011_account_4512,other,account_type_2011_4_dette,f,
+lu_2011_account_45123,45123,Intérêts courus,lu_2011_account_4512,other,account_type_2011_4_dette,f,
+lu_2011_account_45124,45124,Dividendes à payer,lu_2011_account_4512,other,account_type_2011_4_dette,f,
+lu_2011_account_45128,45128,Autres dettes,lu_2011_account_4512,other,account_type_2011_4_dette,f,
+lu_2011_account_452,452,Dettes envers des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_45,view,account_type_2011_4_dette,f,
+lu_2011_account_4521,4521,Dettes envers des entreprises avec lesquelles la société a un lien de participation dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_452,view,account_type_2011_4_dette,f,account_financial_report_110
+lu_2011_account_45211,45211,Ventes de marchandises et de prestations de services,lu_2011_account_4521,other,account_type_2011_4_dette,f,
+lu_2011_account_45212,45212,Prêts et avances,lu_2011_account_4521,other,account_type_2011_4_dette,f,
+lu_2011_account_45213,45213,Intérêts courus,lu_2011_account_4521,other,account_type_2011_4_dette,f,
+lu_2011_account_45214,45214,Dividendes à payer,lu_2011_account_4521,other,account_type_2011_4_dette,f,
+lu_2011_account_45218,45218,Autres dettes,lu_2011_account_4521,other,account_type_2011_4_dette,f,
+lu_2011_account_4522,4522,Dettes envers des entreprises avec lesquelles la société a un lien de participation dont la durée résiduelle est supérieure à un an,lu_2011_account_452,view,account_type_2011_4_dette,f,account_financial_report_111
+lu_2011_account_45221,45221,Ventes de marchandises et de prestations de services,lu_2011_account_4522,other,account_type_2011_4_dette,f,
+lu_2011_account_45222,45222,Prêts et avances,lu_2011_account_4522,other,account_type_2011_4_dette,f,
+lu_2011_account_45223,45223,Intérêts courus,lu_2011_account_4522,other,account_type_2011_4_dette,f,
+lu_2011_account_45224,45224,Dividendes à payer,lu_2011_account_4522,other,account_type_2011_4_dette,f,
+lu_2011_account_45228,45228,Autres dettes,lu_2011_account_4522,other,account_type_2011_4_dette,f,
+lu_2011_account_46,46,Dettes fiscales et dettes envers la sécurité sociale,lu_2011_account_4,view,account_type_2011_4_dette,f,
+lu_2011_account_461,461,Dettes fiscales,lu_2011_account_46,view,account_type_2011_4_dette,f,account_financial_report_113
+lu_2011_account_4611,4611,Administrations communales,lu_2011_account_461,view,account_type_2011_4_dette,f,
+lu_2011_account_46111,46111,Impôts communaux,lu_2011_account_4611,other,account_type_2011_4_dette,f,
+lu_2011_account_46112,46112,Taxes communales,lu_2011_account_4611,other,account_type_2011_4_dette,f,
+lu_2011_account_4612,4612,Administration des Contributions Directes (ACD),lu_2011_account_461,view,account_type_2011_4_dette,f,
+lu_2011_account_46121,46121,Impôt sur le revenu des collectivités,lu_2011_account_4612,view,account_type_2011_4_dette,f,
+lu_2011_account_461211,461211,Impôt sur le revenu des collectivités – charge fiscale estimée,lu_2011_account_46121,other,account_type_2011_4_dette,f,
+lu_2011_account_461212,461212,Impôt sur le revenu des collectivités – dette fiscale à payer,lu_2011_account_46121,other,account_type_2011_4_dette,f,
+lu_2011_account_46122,46122,Impôt commercial,lu_2011_account_4612,view,account_type_2011_4_dette,f,
+lu_2011_account_461221,461221,Impôt commercial – charge fiscale estimée,lu_2011_account_46122,other,account_type_2011_4_dette,f,
+lu_2011_account_461222,461222,Impôt commercial – dette fiscale à payer,lu_2011_account_46122,other,account_type_2011_4_dette,f,
+lu_2011_account_46123,46123,Impôt sur la fortune,lu_2011_account_4612,view,account_type_2011_4_dette,f,
+lu_2011_account_461231,461231,Impôt sur la fortune – charge fiscale estimée,lu_2011_account_46123,other,account_type_2011_4_dette,f,
+lu_2011_account_461232,461232,Impôt sur la fortune – dette fiscale à payer,lu_2011_account_46123,other,account_type_2011_4_dette,f,
+lu_2011_account_46124,46124,Retenue d'impôt sur traitements et salaires,lu_2011_account_4612,other,account_type_2011_4_dette,f,
+lu_2011_account_46125,46125,Retenue d'impôt sur revenus de capitaux mobiliers,lu_2011_account_4612,other,account_type_2011_4_dette,f,
+lu_2011_account_46126,46126,Retenue d'impôt sur les tantièmes,lu_2011_account_4612,other,account_type_2011_4_dette,f,
+lu_2011_account_46128,46128,ACD – Autres dettes,lu_2011_account_4612,other,account_type_2011_4_dette,f,
+lu_2011_account_4613,4613,Administration des Douanes et Accises (ADA),lu_2011_account_461,view,account_type_2011_4_dette,f,
+lu_2011_account_46131,46131,Taxe sur les véhicules automoteurs,lu_2011_account_4613,other,account_type_2011_4_dette,f,
+lu_2011_account_46132,46132,Droits d'accises et taxe de consommation,lu_2011_account_4613,other,account_type_2011_4_dette,f,
+lu_2011_account_46138,46138,ADA – Autres dettes,lu_2011_account_4613,other,account_type_2011_4_dette,f,
+lu_2011_account_4614,4614,Administration de l'Enregistrement et des Domaines (AED),lu_2011_account_461,view,account_type_2011_4_dette,f,
+lu_2011_account_46141,46141,Taxe sur la valeur ajoutée – TVA,lu_2011_account_4614,view,account_type_2011_4_dette,f,
+lu_2011_account_461411,461411,TVA en aval,lu_2011_account_46141,view,account_type_2011_4_dette,f,
+lu_2011_account_4614111,4614111,TVA en aval – Pays,lu_2011_account_461411,other,account_type_2011_4_dette,f,
+lu_2011_account_4614112,4614112,TVA en aval – Intracommunautaire,lu_2011_account_461411,other,account_type_2011_4_dette,f,
+lu_2011_account_4614113,4614113,TVA en aval – Extracommunautaire,lu_2011_account_461411,other,account_type_2011_4_dette,f,
+lu_2011_account_4614114,4614114,TVA en aval – Triangulaire,lu_2011_account_461411,other,account_type_2011_4_dette,f,
+lu_2011_account_4614115,4614115,TVA en aval – Exonérations spéciales,lu_2011_account_461411,other,account_type_2011_4_dette,f,
+lu_2011_account_461412,461412,TVA due,lu_2011_account_46141,other,account_type_2011_4_dette,f,
+lu_2011_account_461413,461413,TVA acomptes reçus,lu_2011_account_46141,other,account_type_2011_4_dette,f,
+lu_2011_account_461418,461418,TVA – Autres dettes,lu_2011_account_46141,other,account_type_2011_4_dette,f,
+lu_2011_account_46142,46142,Impôts indirects,lu_2011_account_4614,view,account_type_2011_4_dette,f,
+lu_2011_account_461421,461421,Droits d'enregistrement,lu_2011_account_46142,other,account_type_2011_4_dette,f,
+lu_2011_account_461422,461422,Taxe d'abonnement,lu_2011_account_46142,other,account_type_2011_4_dette,f,
+lu_2011_account_461423,461423,Droits d'hypothèques,lu_2011_account_46142,other,account_type_2011_4_dette,f,
+lu_2011_account_461424,461424,Droits de timbre,lu_2011_account_46142,other,account_type_2011_4_dette,f,
+lu_2011_account_461428,461428,Autres impôts indirects,lu_2011_account_46142,other,account_type_2011_4_dette,f,
+lu_2011_account_4615,4615,Administrations fiscales étrangères,lu_2011_account_461,other,account_type_2011_4_dette,f,
+lu_2011_account_462,462,Dettes au titre de la sécurité sociale,lu_2011_account_46,view,account_type_2011_4_dette,f,account_financial_report_114
+lu_2011_account_4621,4621,Centre Commun de Sécurité Sociale (CCSS),lu_2011_account_462,other,account_type_2011_4_dette,f,
+lu_2011_account_4622,4622,Organismes de sécurité sociale étrangers,lu_2011_account_462,other,account_type_2011_4_dette,f,
+lu_2011_account_4628,4628,Autres organismes sociaux,lu_2011_account_462,other,account_type_2011_4_dette,f,
+lu_2011_account_47,47,Autres dettes,lu_2011_account_4,view,account_type_2011_4_dette,f,
+lu_2011_account_471,471,Autres dettes dont la durée résiduelle est inférieure ou égale à un an,lu_2011_account_47,view,account_type_2011_4_dette,f,account_financial_report_116
+lu_2011_account_4711,4711,Dépôts et cautionnements reçus,lu_2011_account_471,view,account_type_2011_4_dette,f,
+lu_2011_account_47111,47111,Dépôts,lu_2011_account_4711,other,account_type_2011_4_dette,f,
+lu_2011_account_47112,47112,Cautionnements,lu_2011_account_4711,other,account_type_2011_4_dette,f,
+lu_2011_account_47113,47113,Intérêts courus,lu_2011_account_4711,other,account_type_2011_4_dette,f,
+lu_2011_account_4712,4712,Dettes envers associés et actionnaires,lu_2011_account_471,view,account_type_2011_4_dette,f,
+lu_2011_account_47121,47121,Montant principal,lu_2011_account_4712,other,account_type_2011_4_dette,f,
+lu_2011_account_47122,47122,Intérêts courus,lu_2011_account_4712,other,account_type_2011_4_dette,f,
+lu_2011_account_4713,4713,"Dettes envers administrateurs, gérants et commissaires",lu_2011_account_471,other,account_type_2011_4_dette,f,
+lu_2011_account_4714,4714,Dettes envers le personnel,lu_2011_account_471,view,account_type_2011_4_dette,f,
+lu_2011_account_47141,47141,Personnel – Rémunérations dues,lu_2011_account_4714,other,account_type_2011_4_dette,f,
+lu_2011_account_47142,47142,Personnel – Dépôts,lu_2011_account_4714,other,account_type_2011_4_dette,f,
+lu_2011_account_47143,47143,"Personnel – Oppositions, saisies",lu_2011_account_4714,other,account_type_2011_4_dette,f,
+lu_2011_account_47148,47148,Personnel – Autres,lu_2011_account_4714,other,account_type_2011_4_dette,f,
+lu_2011_account_4715,4715,Etat – Droits d'émission à restituer,lu_2011_account_471,other,account_type_2011_4_dette,f,
+lu_2011_account_4718,4718,Autres dettes diverses,lu_2011_account_471,other,account_type_2011_4_dette,f,
+lu_2011_account_472,472,Autres dettes dont la durée résiduelle est supérieure à un an,lu_2011_account_47,view,account_type_2011_4_dette,f,account_financial_report_117
+lu_2011_account_4721,4721,Dépôts et cautionnements reçus,lu_2011_account_472,view,account_type_2011_4_dette,f,
+lu_2011_account_47211,47211,Dépôts,lu_2011_account_4721,other,account_type_2011_4_dette,f,
+lu_2011_account_47212,47212,Cautionnements,lu_2011_account_4721,other,account_type_2011_4_dette,f,
+lu_2011_account_47213,47213,Intérêts courus,lu_2011_account_4721,other,account_type_2011_4_dette,f,
+lu_2011_account_4722,4722,Dettes envers associés et actionnaires,lu_2011_account_472,view,account_type_2011_4_dette,f,
+lu_2011_account_47221,47221,Montant principal,lu_2011_account_4722,other,account_type_2011_4_dette,f,
+lu_2011_account_47222,47222,Intérêts courus,lu_2011_account_4722,other,account_type_2011_4_dette,f,
+lu_2011_account_4723,4723,"Dettes envers administrateurs, gérants et commissaires",lu_2011_account_472,other,account_type_2011_4_dette,f,
+lu_2011_account_4724,4724,Dettes envers le personnel,lu_2011_account_472,view,account_type_2011_4_dette,f,
+lu_2011_account_47241,47241,Personnel – Rémunérations dues,lu_2011_account_4724,other,account_type_2011_4_dette,f,
+lu_2011_account_47242,47242,Personnel – Dépôts,lu_2011_account_4724,other,account_type_2011_4_dette,f,
+lu_2011_account_47243,47243,"Personnel – Oppositions, saisies",lu_2011_account_4724,other,account_type_2011_4_dette,f,
+lu_2011_account_47248,47248,Personnel – Autres,lu_2011_account_4724,other,account_type_2011_4_dette,f,
+lu_2011_account_4726,4726,Etat – Droits d'émission à restituer,lu_2011_account_472,other,account_type_2011_4_dette,f,
+lu_2011_account_4728,4728,Autres dettes diverses,lu_2011_account_472,other,account_type_2011_4_dette,f,
+lu_2011_account_48,48,Comptes de régularisation,lu_2011_account_4,view,account.data_account_type_view,f,
+lu_2011_account_481,481,Charges à reporter,lu_2011_account_48,other,account_type_2011_4_regul_actif,f,account_financial_report_65
+lu_2011_account_482,482,Produits à reporter,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
+lu_2011_account_483,483,Etat - Droits d'émission alloués,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
+lu_2011_account_484,484,Comptes transitoires ou d'attente – Actif,lu_2011_account_48,other,account_type_2011_4_regul_actif,f,account_financial_report_65
+lu_2011_account_485,485,Comptes transitoires ou d'attente – Passif,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
+lu_2011_account_486,486,Comptes de liaison – Actif,lu_2011_account_48,other,account_type_2011_4_regul_actif,f,account_financial_report_65
+lu_2011_account_487,487,Comptes de liaison – Passif,lu_2011_account_48,other,account_type_2011_4_regul_passif,f,account_financial_report_118
+lu_2011_account_5,5,CLASSE 5 - COMPTES FINANCIERS,lu_2011_account_bilan,view,account.data_account_type_view,f,
+lu_2011_account_50,50,Valeurs mobilières,lu_2011_account_5,view,account_type_2011_5_disponibilite,f,
+lu_2011_account_501,501,Parts dans des entreprises liées,lu_2011_account_50,other,account_type_2011_5_disponibilite,f,account_financial_report_61
+lu_2011_account_502,502,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_50,other,account_type_2011_5_disponibilite,f,account_financial_report_61
+lu_2011_account_503,503,Actions propres ou parts propres,lu_2011_account_50,other,account_type_2011_5_disponibilite,f,account_financial_report_62
+lu_2011_account_508,508,Autres valeurs mobilières,lu_2011_account_50,view,account_type_2011_5_disponibilite,f,account_financial_report_63
+lu_2011_account_5081,5081,Actions – Titres cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_5082,5082,Actions – Titres non cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_5083,5083,Obligations et autres titres de créance émis par la société et rachetés par elle,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_5084,5084,Obligations – Titres cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_5085,5085,Obligations – Titres non cotés,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_5088,5088,Autres valeurs mobilières diverses,lu_2011_account_508,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_51,51,"Avoirs en banques, avoirs en comptes de chèques postaux, chèques et encaisse",lu_2011_account_5,view,account_type_2011_5_disponibilite,f,account_financial_report_64
+lu_2011_account_511,511,Chèques à encaisser,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_512,512,Valeurs à l'encaissement,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_513,513,Banques,lu_2011_account_51,view,account_type_2011_5_disponibilite,f,
+lu_2011_account_5131,5131,Banques comptes courants,lu_2011_account_513,view,account_type_2011_5_disponibilite,f,
+lu_2011_account_5132,5132,Banques comptes à terme,lu_2011_account_513,view,account_type_2011_5_disponibilite,f,
+lu_2011_account_514,514,Compte chèque postal,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_516,516,Caisse,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_517,517,Virements internes,lu_2011_account_51,other,account_type_2011_5_disponibilite,t,
+lu_2011_account_518,518,Autres avoirs,lu_2011_account_51,other,account_type_2011_5_disponibilite,f,
+lu_2011_account_resultat,resultat,TOTAL CLASSES 6 ET 7,lu_2011_account_0,view,account.data_account_type_view,,"account_financial_report_77,account_financial_report_161"
+lu_2011_account_6,6,CLASSE 6 - COMPTES DE CHARGES,lu_2011_account_resultat,view,account.data_account_type_view,f,
+lu_2011_account_60,60,Consommation de marchandises et de matières premières et consommables,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,account_financial_report_120
+lu_2011_account_601,601,Matières premières,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_602,602,Matières consommables,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_603,603,Fournitures consommables,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6031,6031,Combustibles,lu_2011_account_603,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60311,60311,Solides,lu_2011_account_6031,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60312,60312,Liquides,lu_2011_account_6031,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60313,60313,Gaz comprimé,lu_2011_account_6031,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6032,6032,Produits d'entretien,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6033,6033,Fournitures d'atelier et d'usine,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6034,6034,Fournitures de magasin,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6035,6035,Fournitures de bureau,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6036,6036,Carburants,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6037,6037,Lubrifiants,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6038,6038,Autres fournitures consommables,lu_2011_account_603,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_604,604,Emballages,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6041,6041,Emballages non récupérables,lu_2011_account_604,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6042,6042,Emballages récupérables,lu_2011_account_604,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6043,6043,Emballages à usage mixte,lu_2011_account_604,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_605,605,Approvisionnements,lu_2011_account_60,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_606,606,Achats de biens destinés à la revente,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6061,6061,Terrains,lu_2011_account_606,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6062,6062,Immeubles,lu_2011_account_606,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6063,6063,Marchandises,lu_2011_account_606,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_607,607,Variation des stocks,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6071,6071,Variation des stocks de matières premières,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6072,6072,Variation des stocks de matières consommables,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6073,6073,Variation des stocks de fournitures consommables,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6074,6074,Variation des stocks d'emballages,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6075,6075,Variation des stocks d'approvisionnements,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6076,6076,Variation des stocks de biens destinés à la revente,lu_2011_account_607,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_608,608,Achats non stockés et achats incorporés aux ouvrages et produits,lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6081,6081,Achats non stockés de matières et fournitures,lu_2011_account_608,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60811,60811,Fournitures non stockables,lu_2011_account_6081,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_608111,608111,Eau,lu_2011_account_60811,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_608112,608112,Electricité,lu_2011_account_60811,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_608113,608113,Gaz de canalisation,lu_2011_account_60811,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60812,60812,Fournitures d'entretien et de petit équipement,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60813,60813,Fournitures administratives,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60814,60814,Carburants,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60815,60815,Lubrifiants,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60816,60816,Vêtements professionnels,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60818,60818,Autres matières et fournitures non stockées,lu_2011_account_6081,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6082,6082,Achats incorporés aux ouvrages et produits,lu_2011_account_608,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60821,60821,Achats d'études et prestations de service (incorporés aux ouvrages et produits),lu_2011_account_6082,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_608211,608211,Travail à façon,lu_2011_account_60821,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_608212,608212,Recherche et développement,lu_2011_account_60821,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_608213,608213,Frais d'architectes et d'ingénieurs,lu_2011_account_60821,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60822,60822,"Achats de matériel, équipements, pièces détachées et travaux (incorporés aux ouvrages et produits)",lu_2011_account_6082,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_60828,60828,Autres achats d'études et de prestations de service,lu_2011_account_6082,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_609,609,"Rabais, remises et ristournes obtenus",lu_2011_account_60,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6091,6091,Matières premières,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6092,6092,Matières consommables,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6093,6093,Fournitures consommables,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6094,6094,Emballages,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6095,6095,Approvisionnements,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6096,6096,Achats de biens destinés à la revente,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6098,6098,Achats non stockés et achats incorporés aux ouvrages et produits,lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6099,6099,"Rabais, remises et ristournes non affectés",lu_2011_account_609,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61,61,Autres charges externes,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,account_financial_report_121
+lu_2011_account_611,611,Loyers et charges locatives,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6111,6111,Locations immobilières,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61111,61111,Terrains,lu_2011_account_6111,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61112,61112,Bâtiments,lu_2011_account_6111,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6112,6112,Locations mobilières,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61121,61121,Installations techniques et machines,lu_2011_account_6112,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61122,61122,"Autres installations, outillages et machines",lu_2011_account_6112,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61123,61123,Matériel roulant,lu_2011_account_6112,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6113,6113,Charges locatives et de copropriété,lu_2011_account_611,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6114,6114,Leasing immobilier,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61141,61141,Terrains,lu_2011_account_6114,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61142,61142,Bâtiments,lu_2011_account_6114,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6115,6115,Leasing mobilier,lu_2011_account_611,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61151,61151,Installations techniques et machines,lu_2011_account_6115,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61152,61152,"Autres installations, outillages et machines",lu_2011_account_6115,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61153,61153,Matériel roulant,lu_2011_account_6115,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6116,6116,Malis sur emballages,lu_2011_account_611,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_612,612,"Sous-traitance, entretiens et réparations",lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6121,6121,"Sous-traitance générale (non incorporée directement aux ouvrages, travaux et produits)",lu_2011_account_612,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6122,6122,Entretien et réparations,lu_2011_account_612,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61221,61221,Sur installations techniques et machines,lu_2011_account_6122,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61222,61222,"Sur autres installations, outillages et machines",lu_2011_account_6122,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61223,61223,Sur matériel roulant,lu_2011_account_6122,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6123,6123,Contrats de maintenance,lu_2011_account_612,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6124,6124,Etudes et recherches (non incorporées dans les produits),lu_2011_account_612,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_613,613,Rémunérations d'intermédiaires et honoraires,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6131,6131,Commissions et courtages,lu_2011_account_613,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61311,61311,Commissions et courtages sur achats,lu_2011_account_6131,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61312,61312,Commissions et courtages sur ventes,lu_2011_account_6131,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61313,61313,Rémunérations des transitaires,lu_2011_account_6131,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6132,6132,Traitement informatique,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6133,6133,Services bancaires et assimilés,lu_2011_account_613,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61331,61331,"Frais sur titres (achat, vente, garde)",lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61332,61332,Commissions et frais sur émission d'emprunts,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61333,61333,Frais de compte,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61334,61334,Frais sur cartes de crédit,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61335,61335,Frais sur effets,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61336,61336,Rémunérations d'affacturage,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61337,61337,Location de coffres,lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61338,61338,Autres frais et commissions bancaires (hors intérêts et frais assimilés),lu_2011_account_6133,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6134,6134,Honoraires,lu_2011_account_613,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61341,61341,Honoraires juridiques,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61342,61342,Honoraires comptables et d'audit,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61343,61343,Honoraires fiscaux,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61348,61348,Autres honoraires,lu_2011_account_6134,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6135,6135,Frais d'actes et de contentieux,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6136,6136,Frais de recrutement de personnel,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6138,6138,Autres rémunérations d'intermédiaires et honoraires,lu_2011_account_613,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_614,614,Primes d'assurance,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6141,6141,Assurances sur biens de l'actif,lu_2011_account_614,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61411,61411,Bâtiments,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61412,61412,Véhicules,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61413,61413,Installations,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61418,61418,Sur autres biens de l'actif,lu_2011_account_6141,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6142,6142,Assurances sur biens pris en location,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6143,6143,Assurance-transport,lu_2011_account_614,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61431,61431,sur achats,lu_2011_account_6143,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61432,61432,sur ventes,lu_2011_account_6143,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61438,61438,sur autres biens,lu_2011_account_6143,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6144,6144,Assurance risque d'exploitation,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6145,6145,Assurance insolvabilité clients,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6146,6146,Assurance responsabilité civile,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6148,6148,Autres assurances,lu_2011_account_614,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_615,615,Frais de marketing et de communication,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6151,6151,Frais de marketing et de publicité,lu_2011_account_615,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61511,61511,Annonces et insertions,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61512,61512,Echantillons,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61513,61513,Foires et expositions,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61514,61514,Cadeaux à la clientèle,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61515,61515,Catalogues et imprimés et publications,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61516,61516,Dons courants,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61517,61517,Sponsoring,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61518,61518,Autres achats de services publicitaires,lu_2011_account_6151,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6152,6152,Frais de déplacements et de représentation,lu_2011_account_615,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61521,61521,Voyages et déplacements,lu_2011_account_6152,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_615211,615211,Direction (respectivement exploitant et associés),lu_2011_account_61521,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_615212,615212,Personnel,lu_2011_account_61521,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61522,61522,Frais de déménagement de l'entreprise,lu_2011_account_6152,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61523,61523,Missions,lu_2011_account_6152,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61524,61524,Réceptions et frais de représentation,lu_2011_account_6152,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6153,6153,Frais postaux et frais de télécommunications,lu_2011_account_615,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61531,61531,Timbres,lu_2011_account_6153,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61532,61532,Téléphone et autres frais de télécommunication,lu_2011_account_6153,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61538,61538,"Autres frais postaux (location de boîtes postales, etc.)",lu_2011_account_6153,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_616,616,Transports de biens et transports collectifs du personnel,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6161,6161,Transports sur achats,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6162,6162,Transports sur ventes,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6163,6163,Transports entre établissements ou chantiers,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6164,6164,Transports administratifs,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6165,6165,Transports collectifs du personnel,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6168,6168,Autres transports,lu_2011_account_616,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_617,617,Personnel extérieur à l'entreprise,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6171,6171,Personnel intérimaire,lu_2011_account_617,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6172,6172,Personnel prêté à l'entreprise,lu_2011_account_617,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_618,618,Charges externes diverses,lu_2011_account_61,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6181,6181,Documentation,lu_2011_account_618,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61811,61811,Documentation générale,lu_2011_account_6181,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_61812,61812,Documentation technique,lu_2011_account_6181,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6182,6182,"Frais de colloques, séminaires, conférences",lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6183,6183,Elimination des déchets industriels,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6184,6184,Elimination de déchets non industriels,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6185,6185,Evacuation des eaux usées,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6186,6186,Frais de surveillance,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6187,6187,Cotisations aux associations professionnelles,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6188,6188,Autres charges externes diverses,lu_2011_account_618,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_619,619,"Rabais, remises et ristournes obtenus sur autres charges externes",lu_2011_account_61,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62,62,Frais de personnel,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_621,621,Rémunérations des salariés,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_123
+lu_2011_account_6211,6211,Salaires bruts,lu_2011_account_621,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62111,62111,Salaires de base,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62112,62112,Suppléments pour travail,lu_2011_account_6211,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_621121,621121,Dimanche,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_621122,621122,Jours fériés légaux,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_621123,621123,Heures supplémentaires,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_621128,621128,Autres suppléments,lu_2011_account_62112,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62113,62113,Primes de ménage,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62114,62114,"Gratifications, primes et commissions",lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62115,62115,Avantages en nature,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62116,62116,Indemnités de licenciement,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62117,62117,Trimestre de faveur,lu_2011_account_6211,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6218,6218,Autres avantages,lu_2011_account_621,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6219,6219,Remboursements sur salaires,lu_2011_account_621,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62191,62191,Remboursements mutualité,lu_2011_account_6219,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62192,62192,"Remboursements pour congé politique, sportif, culturel, éducatif et mandats sociaux",lu_2011_account_6219,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62193,62193,Remboursements trimestre de faveur,lu_2011_account_6219,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_622,622,Autre personnel,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_123
+lu_2011_account_6221,6221,Etudiants,lu_2011_account_622,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6222,6222,Salaires occasionnels,lu_2011_account_622,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6228,6228,Autre personnel temporaire,lu_2011_account_622,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_623,623,Charges sociales (part patronale),lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_124
+lu_2011_account_6231,6231,Charges sociales salariés,lu_2011_account_623,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62311,62311,Caisse Nationale de Santé,lu_2011_account_6231,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62312,62312,Caisse Nationale d'Assurance-Pension,lu_2011_account_6231,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_62318,62318,Cotisations patronales complémentaires,lu_2011_account_6231,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6232,6232,Assurance accidents du travail,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6233,6233,Service de santé au travail,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6238,6238,Autres charges sociales patronales,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6239,6239,Remboursements de charges sociales,lu_2011_account_623,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_624,624,Pensions complémentaires,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_125
+lu_2011_account_6241,6241,Primes à des fonds de pensions extérieurs,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6242,6242,Dotation aux provisions pour pensions complémentaires,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6243,6243,Retenue d'impôt sur pension complémentaire,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6244,6244,Prime d'assurance insolvabilité,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6245,6245,Pensions complémentaires versées par l'employeur,lu_2011_account_624,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_628,628,Autres charges sociales,lu_2011_account_62,view,account_type_2011_6_charge_exploitation,f,account_financial_report_126
+lu_2011_account_6281,6281,Médecine du travail,lu_2011_account_628,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6288,6288,Autres charges sociales diverses,lu_2011_account_628,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_63,63,Dotations aux corrections de valeur des éléments d'actif non financiers,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_631,631,Dotations aux corrections de valeur sur frais d'établissement et frais assimilés,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_128
+lu_2011_account_6311,6311,Frais de constitution,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6312,6312,Frais de premier établissement,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6313,6313,Frais d'augmentation de capital et d'opérations diverses,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6314,6314,Frais d'émission d'emprunts,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6318,6318,Autres frais assimilés,lu_2011_account_631,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_632,632,Dotations aux corrections de valeur sur immobilisations incorporelles,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_128
+lu_2011_account_6321,6321,Frais de recherche et de développement,lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6322,6322,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6323,6323,Fonds de commerce dans la mesure où il a été acquis à titre onéreux,lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6324,6324,Acomptes versés et immobilisations incorporelles en cours,lu_2011_account_632,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_633,633,Dotations aux corrections de valeur sur immobilisations corporelles,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_128
+lu_2011_account_6331,6331,Terrains et constructions,lu_2011_account_633,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_63311,63311,Terrains,lu_2011_account_6331,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_63312,63312,Agencements et aménagements de terrains,lu_2011_account_6331,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_63313,63313,Constructions,lu_2011_account_6331,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6332,6332,Installations techniques et machines,lu_2011_account_633,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6333,6333,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_633,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6334,6334,Acomptes versés et immobilisations corporelles en cours,lu_2011_account_633,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_634,634,Dotations aux corrections de valeur sur stocks,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_129
+lu_2011_account_6341,6341,Matières premières et consommables,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6342,6342,Produits en cours de fabrication et commandes en cours,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6343,6343,Produits finis et marchandises,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6344,6344,Terrains et immeubles destinés à la revente,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6345,6345,Acomptes versés,lu_2011_account_634,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_635,635,Dotations aux corrections de valeur sur créances de l'actif circulant,lu_2011_account_63,view,account_type_2011_6_charge_exploitation,f,account_financial_report_129
+lu_2011_account_6351,6351,Créances résultant de ventes et prestations de services,lu_2011_account_635,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6352,6352,Créances sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_635,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6353,6353,Autres créances,lu_2011_account_635,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64,64,Autres charges d'exploitation,lu_2011_account_6,view,account_type_2011_6_charge_exploitation,f,account_financial_report_130
+lu_2011_account_641,641,"Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires",lu_2011_account_64,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6411,6411,Concessions,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6412,6412,Brevets,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6413,6413,Licences informatiques,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6414,6414,Marques et franchises,lu_2011_account_641,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6415,6415,Droits et valeurs similaires,lu_2011_account_641,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64151,64151,Droits d'auteur et de reproduction,lu_2011_account_6415,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64158,64158,Autres droits et valeurs similaires,lu_2011_account_6415,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_642,642,Indemnités,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_643,643,Jetons de présence,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_644,644,Tantièmes,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_645,645,Pertes sur créances irrécouvrables,lu_2011_account_64,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6451,6451,Créances résultant de ventes et de prestations de services,lu_2011_account_645,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6452,6452,Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_645,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6453,6453,Autres créances,lu_2011_account_645,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_646,646,"Impôts, taxes et versements assimilés",lu_2011_account_64,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6461,6461,Impôt foncier,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6462,6462,TVA non déductible,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6463,6463,Droits sur les marchandises en provenance de l'étranger,lu_2011_account_646,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64631,64631,Droits d'accises et taxe de consommation sur marchandises en provenance de l'étranger,lu_2011_account_6463,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64632,64632,Droits de douane,lu_2011_account_6463,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64633,64633,Montants compensatoires,lu_2011_account_6463,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6464,6464,Droits d'accises à la production et taxe de consommation,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6465,6465,"Droits d'enregistrement et de timbre, droits d'hypothèques",lu_2011_account_646,view,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64651,64651,Droits d'enregistrement,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64652,64652,Taxe d'abonnement,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64653,64653,Droits d'hypothèques,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64654,64654,Droits de timbre,lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_64658,64658,"Autres droits d'enregistrement et de timbre, droits d'hypothèques",lu_2011_account_6465,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6466,6466,Taxes sur les véhicules,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6467,6467,Taxe de cabaretage,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6468,6468,Autres droits et impôts,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_6469,6469,Dotations aux provisions pour impôts,lu_2011_account_646,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_647,647,Dotations aux plus-values immunisées,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_648,648,Autres charges d'exploitation diverses,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_649,649,Dotations aux provisions d'exploitation,lu_2011_account_64,other,account_type_2011_6_charge_exploitation,f,
+lu_2011_account_65,65,Charges financières,lu_2011_account_6,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_651,651,Dotations aux corrections de valeur et ajustements pour juste valeur sur immobilisations financières,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_131
+lu_2011_account_6511,6511,Dotations aux corrections de valeur sur immobilisations financières,lu_2011_account_651,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_65111,65111,Parts dans des entreprises liées,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65112,65112,Créances sur des entreprises liées,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65113,65113,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65114,65114,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65115,65115,Titres ayant le caractère d'immobilisations,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65116,65116,Prêts et créances immobilisées,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65117,65117,Actions propres ou parts propres,lu_2011_account_6511,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6512,6512,Ajustements pour juste valeur sur immobilisations financières,lu_2011_account_651,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_653,653,Dotations aux corrections de valeur et ajustements pour juste valeur sur éléments financiers de l'actif circulant,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_132
+lu_2011_account_6531,6531,Dotations aux corrections de valeur sur valeurs mobilières,lu_2011_account_653,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_65311,65311,Parts dans des entreprises liées,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65312,65312,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65313,65313,Actions propres ou parts propres,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65318,65318,Autres valeurs mobilières,lu_2011_account_6531,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6532,6532,Dotations aux corrections de valeur sur créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_653,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6533,6533,Dotations aux corrections de valeur sur autres créances,lu_2011_account_653,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6534,6534,Ajustements pour juste valeur sur éléments financiers de l'actif circulant,lu_2011_account_653,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_654,654,Moins-values de cession de valeurs mobilières,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_6541,6541,Parts dans des entreprises liées,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6542,6542,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6543,6543,Actions propres ou parts propres,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6548,6548,Autres valeurs mobilières,lu_2011_account_654,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_655,655,Intérêts et escomptes,lu_2011_account_65,view,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_6551,6551,Intérêts des dettes financières,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_65511,65511,Intérêts des dettes subordonnées,lu_2011_account_6551,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65512,65512,Intérêts des emprunts obligataires,lu_2011_account_6551,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6552,6552,Intérêts bancaires et assimilés,lu_2011_account_655,view,account_type_2011_6_charge_finance,f,
+lu_2011_account_65521,65521,Intérêts bancaires sur comptes courants,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65522,65522,Intérêts bancaires sur opérations de financement,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_65523,65523,Intérêts sur leasings financiers,lu_2011_account_6552,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6553,6553,Intérêts sur dettes commerciales,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6554,6554,Intérêts sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,account_financial_report_134
+lu_2011_account_6555,6555,Escomptes et frais sur effets,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6556,6556,Escomptes accordés,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_6558,6558,Intérêts sur autres emprunts et dettes,lu_2011_account_655,other,account_type_2011_6_charge_finance,f,
+lu_2011_account_656,656,Pertes de change,lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_657,657,Quote-part de perte dans les entreprises collectives (autres que les sociétés de capitaux),lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_658,658,Autres charges financières,lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_659,659,Dotations aux provisions financières,lu_2011_account_65,other,account_type_2011_6_charge_finance,f,account_financial_report_135
+lu_2011_account_66,66,Charges exceptionnelles,lu_2011_account_6,view,account_type_2011_6_charge_exception,f,account_financial_report_136
+lu_2011_account_661,661,Dotations aux corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
+lu_2011_account_6611,6611,Sur immobilisations incorporelles,lu_2011_account_661,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6612,6612,Sur immobilisations corporelles,lu_2011_account_661,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_662,662,Dotations aux corrections de valeur exceptionnelles sur éléments de l'actif circulant,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
+lu_2011_account_6621,6621,Sur stocks,lu_2011_account_662,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6622,6622,Sur créances,lu_2011_account_662,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_663,663,Valeur comptable des immobilisations incorporelles et corporelles cédées,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
+lu_2011_account_6631,6631,Immobilisations incorporelles,lu_2011_account_663,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6632,6632,Immobilisations corporelles,lu_2011_account_663,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_664,664,Valeur comptable des immobilisations financières cédées,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
+lu_2011_account_6641,6641,Parts dans des entreprises liées,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6642,6642,Créances sur des entreprises liées,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6643,6643,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6644,6644,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6645,6645,Titres ayant le caractère d'immobilisations,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6646,6646,Prêts et créances immobilisées,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6647,6647,Actions propres ou parts propres,lu_2011_account_664,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_665,665,Valeur comptable des créances de l'actif circulant financier cédées,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
+lu_2011_account_6651,6651,Sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_665,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6652,6652,Sur autres créances,lu_2011_account_665,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_668,668,Autres charges exceptionnelles,lu_2011_account_66,view,account_type_2011_6_charge_exception,f,
+lu_2011_account_6681,6681,Pénalités sur marchés et dédits payés sur achats et ventes,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6682,6682,"Amendes et pénalités fiscales, sociales et pénales",lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6683,6683,Dommages et intérêts,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6684,6684,Malis provenant de clauses d'indexation,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_6688,6688,Autres charges exceptionnelles diverses,lu_2011_account_668,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_669,669,Dotations aux provisions exceptionnelles,lu_2011_account_66,other,account_type_2011_6_charge_exception,f,
+lu_2011_account_67,67,Impôts sur le résultat,lu_2011_account_6,view,account_type_2011_6_charge_impot,f,account_financial_report_137
+lu_2011_account_671,671,Impôt sur le revenu des collectivités,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
+lu_2011_account_6711,6711,Exercice courant,lu_2011_account_671,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_6712,6712,Exercices antérieurs,lu_2011_account_671,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_672,672,Impôt commercial,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
+lu_2011_account_6721,6721,Exercice courant,lu_2011_account_672,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_6722,6722,Exercices antérieurs,lu_2011_account_672,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_673,673,Impôts étrangers sur le résultat,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
+lu_2011_account_6731,6731,Retenues d'impôt à la source,lu_2011_account_673,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_6732,6732,Impôts supportés par les établissements stables,lu_2011_account_673,view,account_type_2011_6_charge_impot,f,
+lu_2011_account_67321,67321,Exercice courant,lu_2011_account_6732,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_67322,67322,Exercices antérieurs,lu_2011_account_6732,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_6733,6733,Impôts supportés par les entreprises non résidentes,lu_2011_account_673,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_6738,6738,Autres impôts étrangers,lu_2011_account_673,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_679,679,Dotations aux provisions pour impôts sur le résultat,lu_2011_account_67,view,account_type_2011_6_charge_impot,f,
+lu_2011_account_6791,6791,Dotations aux provisions pour impôts,lu_2011_account_679,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_6792,6792,Dotations aux provisions pour impôts différés,lu_2011_account_679,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_68,68,Autres impôts ne figurant pas sous le poste ci-dessus,lu_2011_account_6,view,account_type_2011_6_charge_impot,f,account_financial_report_138
+lu_2011_account_681,681,Impôt sur la fortune,lu_2011_account_68,view,account_type_2011_6_charge_impot,f,
+lu_2011_account_6811,6811,Exercice courant,lu_2011_account_681,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_6812,6812,Exercices antérieurs,lu_2011_account_681,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_682,682,Taxe d'abonnement,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_683,683,Impôts étrangers,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_688,688,Autres impôts et taxes,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_689,689,Dotations aux provisions pour autres impôts,lu_2011_account_68,other,account_type_2011_6_charge_impot,f,
+lu_2011_account_7,7,CLASSE 7 - COMPTES DE PRODUITS,lu_2011_account_resultat,view,account.data_account_type_view,f,
+lu_2011_account_70,70,Montant net du chiffre d'affaires,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_141
+lu_2011_account_701,701,Ventes sur commandes en cours,lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7011,7011,Produits,lu_2011_account_701,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7012,7012,Prestations de services,lu_2011_account_701,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7013,7013,Immeubles en construction,lu_2011_account_701,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_702,702,Ventes de produits finis,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_703,703,Ventes de produits intermédiaires,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_704,704,Ventes de produits résiduels,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_705,705,Ventes d'éléments destinés à la revente,lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7051,7051,Ventes de marchandises,lu_2011_account_705,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7052,7052,Ventes de terrains et d'immeubles existants (promotion immobilière),lu_2011_account_705,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7053,7053,Ventes d'autres éléments destinés à la revente,lu_2011_account_705,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_706,706,Prestations de services,lu_2011_account_70,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_708,708,Autres éléments du chiffre d'affaires,lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7081,7081,Commissions et courtages,lu_2011_account_708,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7082,7082,Locations,lu_2011_account_708,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_70821,70821,Loyer immobilier,lu_2011_account_7082,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_70822,70822,Loyer mobilier,lu_2011_account_7082,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7083,7083,Ventes d'emballages,lu_2011_account_708,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7088,7088,Autres éléments divers du chiffre d'affaires,lu_2011_account_708,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_709,709,"Rabais, remises et ristournes accordés par l'entreprise",lu_2011_account_70,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7091,7091,Sur ventes sur commandes en cours,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7092,7092,Sur ventes de produits finis,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7093,7093,Sur ventes de produits intermédiaires,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7094,7094,Sur ventes de produits résiduels,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7095,7095,Sur ventes d'éléments destinés à la revente,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7096,7096,Sur prestations de services,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7098,7098,Sur autres éléments du chiffre d'affaires,lu_2011_account_709,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_71,71,"Variation des stocks de produits finis, d'en cours de fabrication et des commandes en cours",lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_142
+lu_2011_account_711,711,Variation des stocks de produits en cours de fabrication et de commandes en cours,lu_2011_account_71,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7111,7111,Variation des stocks de produits en cours,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7112,7112,Variation des stocks de commandes en cours – produits,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7113,7113,Variation des stocks de commandes en cours – prestations de services,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7114,7114,Variation des stocks d'immeubles en construction,lu_2011_account_711,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_712,712,Variation des stocks de produits finis et marchandises,lu_2011_account_71,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7121,7121,Variation des stocks de produits finis,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7122,7122,Variation des stocks de produits intermédiaires,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7123,7123,Variation des stocks de produits résiduels,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7126,7126,Variation des stocks de marchandises,lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7127,7127,"Variation des stocks de marchandises en voie d'acheminement, mises en dépôt ou données en consignation",lu_2011_account_712,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_72,72,Production immobilisée,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_143
+lu_2011_account_721,721,Immobilisations incorporelles,lu_2011_account_72,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7211,7211,Frais de recherche et développement,lu_2011_account_721,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7212,7212,"Concessions, brevets, licences, marques, droits et valeurs similaires",lu_2011_account_721,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_72121,72121,Concessions,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_72122,72122,Brevets,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_72123,72123,Licences informatiques,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_72124,72124,Marques et franchises,lu_2011_account_7212,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_72125,72125,Droits et valeurs similaires,lu_2011_account_7212,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_721251,721251,Droits d'auteur et de reproduction,lu_2011_account_72125,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_721258,721258,Autres droits et valeurs similaires,lu_2011_account_72125,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_722,722,Immobilisations corporelles,lu_2011_account_72,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7221,7221,Terrains et constructions,lu_2011_account_722,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7222,7222,Installations techniques et machines,lu_2011_account_722,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7223,7223,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_722,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_73,73,Reprises de corrections de valeur des éléments d'actif non financiers,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_732,732,Reprises de corrections de valeur sur immobilisations incorporelles,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,account_financial_report_145
+lu_2011_account_7321,7321,Frais de recherche et de développement,lu_2011_account_732,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7322,7322,"Concessions, brevets, licences, marques ainsi que droits et valeurs similaires",lu_2011_account_732,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7323,7323,"Fonds de commerce, dans la mesure où il a été acquis à titre onéreux",lu_2011_account_732,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7324,7324,Acomptes versés et immobilisations incorporelles en cours,lu_2011_account_732,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_733,733,Reprises de corrections de valeur sur immobilisations corporelles,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,account_financial_report_145
+lu_2011_account_7331,7331,Terrains et constructions,lu_2011_account_733,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_73311,73311,Terrains,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_73312,73312,Agencements et aménagements de terrains,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_73313,73313,Constructions,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_73314,73314,Constructions sur sol d'autrui,lu_2011_account_7331,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7332,7332,Installations techniques et machines,lu_2011_account_733,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7333,7333,"Autres installations, outillage, mobilier et matériel roulant",lu_2011_account_733,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7334,7334,Acomptes versés et immobilisations corporelles en cours,lu_2011_account_733,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_734,734,Reprises de corrections de valeur sur stocks,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,account_financial_report_146
+lu_2011_account_7341,7341,Matières premières et consommables,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7342,7342,Produits en cours de fabrication et commandes en cours,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7343,7343,Produits finis et marchandises,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7344,7344,Terrains et immeubles destinés à la revente,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7345,7345,Acomptes versés,lu_2011_account_734,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_735,735,Reprises de corrections de valeur sur créances de l'actif circulant,lu_2011_account_73,view,account_type_2011_7_produit_exploitation,f,account_financial_report_146
+lu_2011_account_7351,7351,Créances résultant de ventes et prestations de services,lu_2011_account_735,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7352,7352,Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_735,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7353,7353,Autres créances,lu_2011_account_735,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_74,74,Autres produits d'exploitation,lu_2011_account_7,view,account_type_2011_7_produit_exploitation,f,account_financial_report_147
+lu_2011_account_741,741,"Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires",lu_2011_account_74,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7411,7411,Concessions,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7412,7412,Brevets,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7413,7413,Licences informatiques,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7414,7414,Marques et franchises,lu_2011_account_741,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7415,7415,Droits et valeurs similaires,lu_2011_account_741,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_74151,74151,Droits d'auteur et de reproduction,lu_2011_account_7415,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_74158,74158,Autres droits et valeurs similaires,lu_2011_account_7415,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_742,742,Revenus des immeubles non affectés aux activités professionnelles,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_743,743,"Jetons de présence, tantièmes et rémunérations assimilées",lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_744,744,Subventions d'exploitation,lu_2011_account_74,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7441,7441,Subventions sur produits,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7442,7442,Bonifications d'intérêt,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7443,7443,Montants compensatoires,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7444,7444,Subventions destinées à promouvoir l'emploi,lu_2011_account_744,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_74441,74441,Primes d'apprentissage reçues,lu_2011_account_7444,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_74442,74442,Autres subventions destinées à promouvoir l'emploi,lu_2011_account_7444,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7448,7448,Autres subventions d'exploitation,lu_2011_account_744,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_745,745,Ristournes perçues des coopératives (provenant des excédents),lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_746,746,Indemnités d'assurance touchées,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_747,747,Reprises de plus-values immunisées et de subventions d'investissement en capital,lu_2011_account_74,view,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7471,7471,Plus-values immunisées non réinvesties,lu_2011_account_747,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7472,7472,Plus-values immunisées réinvesties,lu_2011_account_747,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_7473,7473,Subventions d'investissement en capital,lu_2011_account_747,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_748,748,Autres produits d'exploitation divers,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_749,749,Reprises sur provisions d'exploitation,lu_2011_account_74,other,account_type_2011_7_produit_exploitation,f,
+lu_2011_account_75,75,Produits financiers,lu_2011_account_7,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_751,751,Reprises sur corrections de valeur et ajustements pour juste valeur sur immobilisations financières,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_7511,7511,Reprises sur corrections de valeur sur immobilisations financières,lu_2011_account_751,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_75111,75111,Parts dans des entreprises liées,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,account_financial_report_149
+lu_2011_account_75112,75112,Créances sur des entreprises liées,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,account_financial_report_149
+lu_2011_account_75113,75113,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_75114,75114,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_75115,75115,Titres ayant le caractère d'immobilisations,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_75116,75116,Prêts et créances immobilisées,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_75117,75117,Actions propres ou parts propres,lu_2011_account_7511,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_7512,7512,Ajustements pour juste valeur sur immobilisations financières,lu_2011_account_751,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_752,752,Revenus des immobilisations financières,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_7521,7521,Parts dans des entreprises liées,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_149
+lu_2011_account_7522,7522,Créances sur des entreprises liées,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_149
+lu_2011_account_7523,7523,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_7524,7524,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_7525,7525,Titres ayant le caractère d'immobilisations,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_7526,7526,Prêts et créances immobilisées,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_7527,7527,Actions propres ou parts propres,lu_2011_account_752,other,account_type_2011_7_produit_financier,f,account_financial_report_150
+lu_2011_account_753,753,Reprises sur corrections de valeur et ajustements pour juste valeur sur éléments financiers de l'actif circulant,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_7531,7531,Reprises sur corrections de valeur sur créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_753,other,account_type_2011_7_produit_financier,f,account_financial_report_152
+lu_2011_account_7532,7532,Reprises sur corrections de valeur sur autres créances,lu_2011_account_753,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_7533,7533,Reprises sur corrections de valeur sur valeurs mobilières,lu_2011_account_753,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_75331,75331,Parts dans des entreprises liées,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,account_financial_report_152
+lu_2011_account_75332,75332,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_75333,75333,Actions propres ou parts propres,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_75338,75338,Autres valeurs mobilières,lu_2011_account_7533,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_7534,7534,Ajustements pour juste valeur sur éléments financiers de l'actif circulant,lu_2011_account_753,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_754,754,Plus-value de cession et autres produits de valeurs mobilières,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_7541,7541,Plus-value de cession de valeurs mobilières,lu_2011_account_754,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_75411,75411,Parts dans des entreprises liées,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,account_financial_report_152
+lu_2011_account_75412,75412,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_75413,75413,Actions propres ou parts propres,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_75418,75418,Autres valeurs mobilières,lu_2011_account_7541,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_7548,7548,Autres produits de valeurs mobilières,lu_2011_account_754,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_75481,75481,Parts dans des entreprises liées,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,account_financial_report_152
+lu_2011_account_75482,75482,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_75483,75483,Actions propres ou parts propres,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_75488,75488,Autres valeurs mobilières,lu_2011_account_7548,other,account_type_2011_7_produit_financier,f,account_financial_report_153
+lu_2011_account_755,755,Autres intérêts et escomptes,lu_2011_account_75,view,account_type_2011_7_produit_financier,f,
+lu_2011_account_7552,7552,Intérêts bancaires et assimilés,lu_2011_account_755,view,account_type_2011_7_produit_financier,f,account_financial_report_156
+lu_2011_account_75521,75521,Intérêts sur comptes courants,lu_2011_account_7552,other,account_type_2011_7_produit_financier,f,
+lu_2011_account_75522,75522,Intérêts sur comptes à terme,lu_2011_account_7552,other,account_type_2011_7_produit_financier,f,
+lu_2011_account_75523,75523,Intérêts sur leasings financiers,lu_2011_account_7552,other,account_type_2011_7_produit_financier,f,
+lu_2011_account_7553,7553,Intérêts sur créances commerciales,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,account_financial_report_156
+lu_2011_account_7554,7554,Intérêts sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,account_financial_report_155
+lu_2011_account_7555,7555,Escomptes d'effets de commerce,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,account_financial_report_156
+lu_2011_account_7556,7556,Escomptes obtenus,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,account_financial_report_156
+lu_2011_account_7558,7558,Intérêts sur autres créances,lu_2011_account_755,other,account_type_2011_7_produit_financier,f,account_financial_report_156
+lu_2011_account_756,756,Gains de change,lu_2011_account_75,other,account_type_2011_7_produit_financier,f,
+lu_2011_account_757,757,Quote-part de bénéfice dans les entreprises collectives (autres que les sociétés de capitaux),lu_2011_account_75,other,account_type_2011_7_produit_financier,f,
+lu_2011_account_758,758,Autres produits financiers,lu_2011_account_75,other,account_type_2011_7_produit_financier,f,account_financial_report_156
+lu_2011_account_759,759,Reprises sur provisions financières,lu_2011_account_75,other,account_type_2011_7_produit_financier,f,
+lu_2011_account_76,76,Produits exceptionnels,lu_2011_account_7,view,account_type_2011_7_produit_exceptionnel,f,account_financial_report_157
+lu_2011_account_761,761,Reprises sur corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7611,7611,Immobilisations incorporelles,lu_2011_account_761,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7612,7612,Immobilisations corporelles,lu_2011_account_761,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_762,762,Reprises sur corrections de valeur exceptionnelles sur éléments de l'actif circulant,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7621,7621,Sur stocks,lu_2011_account_762,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7622,7622,Sur créances de l'actif circulant,lu_2011_account_762,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_763,763,Produits de cession d'immobilisations incorporelles et corporelles,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7631,7631,Immobilisations incorporelles,lu_2011_account_763,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7632,7632,Immobilisations corporelles,lu_2011_account_763,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_764,764,Produits de cession d'immobilisations financières,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7641,7641,Parts dans des entreprises liées,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7642,7642,Créances sur des entreprises liées,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7643,7643,Parts dans des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7644,7644,Créances sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7645,7645,Titres ayant le caractère d'immobilisations,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7646,7646,Prêts et créances immobilisés,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7647,7647,Actions propres ou parts propres,lu_2011_account_764,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_765,765,Produits de cession sur créances de l'actif circulant financier,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7651,7651,Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation,lu_2011_account_765,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7652,7652,Autres créances,lu_2011_account_765,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_768,768,Autres produits exceptionnels,lu_2011_account_76,view,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7681,7681,Pénalités sur marchés et dédits perçus sur achats et sur ventes,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7682,7682,Libéralités reçues,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7683,7683,Rentrées sur créances amorties,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7684,7684,Subventions exceptionnelles,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7685,7685,Bonis provenant de clauses d'indexation,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7686,7686,Bonis provenant du rachat par l'entreprise d'actions et d'obligations émises par elle-même,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7688,7688,Autres produits exceptionnels divers,lu_2011_account_768,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_769,769,Reprises sur provisions exceptionnelles,lu_2011_account_76,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_77,77,Régularisations d'impôts sur le résultat,lu_2011_account_7,view,account_type_2011_7_produit_exceptionnel,f,account_financial_report_137
+lu_2011_account_771,771,Régularisations d'impôt sur le revenu des collectivités,lu_2011_account_77,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_772,772,Régularisations d'impôt commercial,lu_2011_account_77,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_773,773,Régularisations d'impôts étrangers sur le résultat,lu_2011_account_77,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_779,779,Reprises sur provisions pour impôts sur le résultat,lu_2011_account_77,view,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7791,7791,Reprises sur provisions pour impôts,lu_2011_account_779,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_7792,7792,Reprises sur provisions pour impôts différés,lu_2011_account_779,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_78,78,Régularisations d'autres impôts ne figurant pas sous le poste ci-dessus,lu_2011_account_7,view,account_type_2011_7_produit_exceptionnel,f,account_financial_report_138
+lu_2011_account_781,781,Régularisations d'impôt sur la fortune,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_782,782,Régularisations de taxes d'abonnement,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_783,783,Régularisations d'impôts étrangers,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_788,788,Régularisations d'autres impôts et taxes,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
+lu_2011_account_789,789,Reprises sur provisions pour autres impôts,lu_2011_account_78,other,account_type_2011_7_produit_exceptionnel,f,
diff --git a/addons/l10n_lu/static/src/img/icon.png b/addons/l10n_lu/static/description/icon.png
similarity index 100%
rename from addons/l10n_lu/static/src/img/icon.png
rename to addons/l10n_lu/static/description/icon.png
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index bfa058720d3..04d4fe9a3b7 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -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')
 
diff --git a/addons/l10n_ma/static/src/img/icon.png b/addons/l10n_ma/static/description/icon.png
similarity index 100%
rename from addons/l10n_ma/static/src/img/icon.png
rename to addons/l10n_ma/static/description/icon.png
diff --git a/addons/l10n_multilang/i18n/zh_CN.po b/addons/l10n_multilang/i18n/zh_CN.po
new file mode 100644
index 00000000000..bb1f5830977
--- /dev/null
+++ b/addons/l10n_multilang/i18n/zh_CN.po
@@ -0,0 +1,169 @@
+# Chinese (Simplified) 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-02-08 01:06+0000\n"
+"PO-Revision-Date: 2013-07-24 12:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-25 05:13+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "财务结构模板"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "该科目的代码，每家公司必须是唯一的！"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"配置错误！ \n"
+"上级科目必须是“视图”类型的科目！ "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "辅助核算类型"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "错误！您不能创建递归的科目模板。"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "分录序时薄"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "科目一览表模板"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "此说明必须是每个公司唯一的"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "错误！您不能创建递归的税编码。"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "科目"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "设置错误！所选币种应与默认科目共享。"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "科目模板"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"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 ';'"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "错误!您不能创建递归的科目"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"配置错误！\n"
+"对于内部类型是‘应收/应付’的会计科目，你需要选择结转方式是‘未核销’的科目类型。 "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "每个公司的日记账名称必须唯一！"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "辅助核算项目"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "每个公司的日记账代码必须唯一！"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "财务结构"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"配置错误！ \n"
+"您不能给 非“视图”类型的科目定义一个子科目。 "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "错误! 你不能创建递归的辅助核算项目"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "税编码模板"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "交流语言"
diff --git a/addons/l10n_mx/static/src/img/icon.png b/addons/l10n_mx/static/description/icon.png
similarity index 100%
rename from addons/l10n_mx/static/src/img/icon.png
rename to addons/l10n_mx/static/description/icon.png
diff --git a/addons/l10n_nl/static/src/img/icon.png b/addons/l10n_nl/static/description/icon.png
similarity index 100%
rename from addons/l10n_nl/static/src/img/icon.png
rename to addons/l10n_nl/static/description/icon.png
diff --git a/addons/l10n_pa/static/src/img/icon.png b/addons/l10n_pa/static/description/icon.png
similarity index 100%
rename from addons/l10n_pa/static/src/img/icon.png
rename to addons/l10n_pa/static/description/icon.png
diff --git a/addons/l10n_pe/static/src/img/icon.png b/addons/l10n_pe/static/description/icon.png
similarity index 100%
rename from addons/l10n_pe/static/src/img/icon.png
rename to addons/l10n_pe/static/description/icon.png
diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml
index 19e59714fc7..57ab12beb5d 100644
--- a/addons/l10n_pl/account_chart.xml
+++ b/addons/l10n_pl/account_chart.xml
@@ -978,7 +978,7 @@
         <field name="parent_id" ref="chart222020000"/>
         <field name="type">other</field>
         <field name="user_type" ref="account_type_cash"/>
-        <field name="name">Rozliczenie naliczonego VAT-22%</field>
+        <field name="name">Rozliczenie naliczonego VAT-23%</field>
     </record>
 
     <record id="chart222020200" model="account.account.template">
@@ -987,7 +987,16 @@
         <field name="parent_id" ref="chart222020000"/>
         <field name="type">other</field>
         <field name="user_type" ref="account_type_cash"/>
-        <field name="name">Rozliczenie naliczonego VAT-7%</field>
+        <field name="name">Rozliczenie naliczonego VAT-8%</field>
+    </record>
+
+    <record id="chart222020400" model="account.account.template">
+        <field name="code">222020400</field>
+        <field name="reconcile" eval="False"/>
+        <field name="parent_id" ref="chart222020000"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account_type_cash"/>
+        <field name="name">Rozliczenie naliczonego VAT-5%</field>
     </record>
 
     <record id="chart222020300" model="account.account.template">
@@ -1014,7 +1023,7 @@
         <field name="parent_id" ref="chart222030000"/>
         <field name="type">other</field>
         <field name="user_type" ref="account_type_cash"/>
-        <field name="name">Rozliczenie należnego VAT-22%</field>
+        <field name="name">Rozliczenie należnego VAT-23%</field>
     </record>
 
     <record id="chart222030200" model="account.account.template">
@@ -1023,7 +1032,16 @@
         <field name="parent_id" ref="chart222030000"/>
         <field name="type">other</field>
         <field name="user_type" ref="account_type_cash"/>
-        <field name="name">Rozliczenie należnego VAT-7%</field>
+        <field name="name">Rozliczenie należnego VAT-8%</field>
+    </record>
+
+    <record id="chart222030400" model="account.account.template">
+        <field name="code">222030400</field>
+        <field name="reconcile" eval="False"/>
+        <field name="parent_id" ref="chart222030000"/>
+        <field name="type">other</field>
+        <field name="user_type" ref="account_type_cash"/>
+        <field name="name">Rozliczenie należnego VAT-5%</field>
     </record>
 
     <record id="chart222030300" model="account.account.template">
@@ -3176,15 +3194,15 @@
 
     <!-- Chart template -->
     <record id="pl_chart_template" model="account.chart.template">
-    <field name="name">Polska - Plan kont</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="chart113010000"/>
-    <field name="property_account_receivable" ref="chart220000000"/>
+        <field name="name">Polska - Plan kont</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="chart113010000"/>
+        <field name="property_account_receivable" ref="chart220000000"/>
         <field name="property_account_payable" ref="chart221000000"/>
         <field name="property_account_expense_categ" ref="chart330020000"/>
         <field name="property_account_income_categ" ref="chart773010000"/>
     </record>
     
 </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_pl/account_tax.xml b/addons/l10n_pl/account_tax.xml
index d3ba9b221bf..de4123708d9 100644
--- a/addons/l10n_pl/account_tax.xml
+++ b/addons/l10n_pl/account_tax.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data noupdate="1">
-    <record id="tax1" model="account.tax.template">
+    <record id="tax_vat_23_due" model="account.tax.template">
         <field name="chart_template_id" ref="pl_chart_template"/>
-        <field name="name">VAT-22%(22.0%)</field>
-        <field name="amount">0.220000</field>
+        <field name="name">VAT-23%(23.0%)</field>
+        <field name="amount">0.230000</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="chart222030100"/>
@@ -16,10 +16,10 @@
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_sign" eval="-1"/>
     </record>
-    <record id="tax2" model="account.tax.template">
+    <record id="tax_vat_8_due" model="account.tax.template">
         <field name="chart_template_id" ref="pl_chart_template"/>
-        <field name="name">VAT-7%(7.0%)</field>
-        <field name="amount">0.070000</field>
+        <field name="name">VAT-8%(8.0%)</field>
+        <field name="amount">0.080000</field>
         <field name="type">percent</field>
         <field name="type_tax_use">sale</field>
         <field name="account_collected_id" ref="chart222030200"/>
@@ -31,7 +31,22 @@
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_sign" eval="-1"/>
     </record>
-    <record id="tax3" model="account.tax.template">
+    <record id="tax_vat_5_due" model="account.tax.template">
+        <field name="chart_template_id" ref="pl_chart_template"/>
+        <field name="name">VAT-5%(5.0%)</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_collected_id" ref="chart222030400"/>
+        <field name="account_paid_id" ref="chart222030400"/>
+        <field name="base_code_id" ref="vat_code_base_due"/>
+        <field name="tax_code_id" ref="vat_code_due_tva"/>
+        <field name="ref_base_code_id" ref="vat_code_base_due"/>
+        <field name="ref_tax_code_id" ref="vat_code_due_tva"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+    </record>
+    <record id="tax_vat_0_due" model="account.tax.template">
         <field name="chart_template_id" ref="pl_chart_template"/>
         <field name="name">VAT-0%(0.0%)</field>
         <field name="amount">0.000000</field>
@@ -46,10 +61,11 @@
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_sign" eval="-1"/>
     </record>
-    <record id="tax4" model="account.tax.template">
+
+    <record id="tax_vat_23_recivable" model="account.tax.template">
         <field name="chart_template_id" ref="pl_chart_template"/>
-        <field name="name">VAT naliczony-22%(22.0%)</field>
-        <field name="amount">0.220000</field>
+        <field name="name">VAT naliczony-23%(23.0%)</field>
+        <field name="amount">0.230000</field>
         <field name="type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="account_collected_id" ref="chart222020100"/>
@@ -61,10 +77,10 @@
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_sign" eval="-1"/>
     </record>
-    <record id="tax5" model="account.tax.template">
+    <record id="tax_vat_8_recivable" model="account.tax.template">
         <field name="chart_template_id" ref="pl_chart_template"/>
-        <field name="name">VAT naliczony-7%(7.0%)</field>
-        <field name="amount">0.070000</field>
+        <field name="name">VAT naliczony-8%(8.0%)</field>
+        <field name="amount">0.080000</field>
         <field name="type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="account_collected_id" ref="chart222020200"/>
@@ -76,7 +92,22 @@
         <field name="ref_base_sign" eval="-1"/>
         <field name="ref_tax_sign" eval="-1"/>
     </record>
-    <record id="tax6" model="account.tax.template">
+    <record id="tax_vat_5_recivable" model="account.tax.template">
+        <field name="chart_template_id" ref="pl_chart_template"/>
+        <field name="name">VAT naliczony-5%(5.0%)</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="account_collected_id" ref="chart222020400"/>
+        <field name="account_paid_id" ref="chart222020200"/>
+        <field name="base_code_id" ref="vat_code_receivable_net"/>
+        <field name="tax_code_id" ref="vat_code_payable"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable"/>
+        <field name="ref_base_sign" eval="-1"/>
+        <field name="ref_tax_sign" eval="-1"/>
+    </record>
+    <record id="tax_vat_0_recivable" model="account.tax.template">
         <field name="chart_template_id" ref="pl_chart_template"/>
         <field name="name">VAT naliczony-0%(0.0%)</field>
         <field name="amount">0.000000</field>
@@ -92,4 +123,4 @@
         <field name="ref_tax_sign" eval="-1"/>
     </record>
 </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_pl/static/src/img/icon.png b/addons/l10n_pl/static/description/icon.png
similarity index 100%
rename from addons/l10n_pl/static/src/img/icon.png
rename to addons/l10n_pl/static/description/icon.png
diff --git a/addons/l10n_ro/static/src/img/icon.png b/addons/l10n_ro/static/description/icon.png
similarity index 100%
rename from addons/l10n_ro/static/src/img/icon.png
rename to addons/l10n_ro/static/description/icon.png
diff --git a/addons/l10n_si/static/src/img/icon.png b/addons/l10n_si/static/description/icon.png
similarity index 100%
rename from addons/l10n_si/static/src/img/icon.png
rename to addons/l10n_si/static/description/icon.png
diff --git a/addons/l10n_th/static/src/img/icon.png b/addons/l10n_th/static/description/icon.png
similarity index 100%
rename from addons/l10n_th/static/src/img/icon.png
rename to addons/l10n_th/static/description/icon.png
diff --git a/addons/l10n_tr/static/src/img/icon.png b/addons/l10n_tr/static/description/icon.png
similarity index 100%
rename from addons/l10n_tr/static/src/img/icon.png
rename to addons/l10n_tr/static/description/icon.png
diff --git a/addons/l10n_uk/static/src/img/icon.png b/addons/l10n_uk/static/description/icon.png
similarity index 100%
rename from addons/l10n_uk/static/src/img/icon.png
rename to addons/l10n_uk/static/description/icon.png
diff --git a/addons/l10n_us/static/src/img/icon.png b/addons/l10n_us/static/description/icon.png
similarity index 100%
rename from addons/l10n_us/static/src/img/icon.png
rename to addons/l10n_us/static/description/icon.png
diff --git a/addons/l10n_uy/static/src/img/icon.png b/addons/l10n_uy/static/description/icon.png
similarity index 100%
rename from addons/l10n_uy/static/src/img/icon.png
rename to addons/l10n_uy/static/description/icon.png
diff --git a/addons/l10n_ve/static/src/img/icon.png b/addons/l10n_ve/static/description/icon.png
similarity index 100%
rename from addons/l10n_ve/static/src/img/icon.png
rename to addons/l10n_ve/static/description/icon.png
diff --git a/addons/l10n_vn/static/src/img/icon.png b/addons/l10n_vn/static/description/icon.png
similarity index 100%
rename from addons/l10n_vn/static/src/img/icon.png
rename to addons/l10n_vn/static/description/icon.png
diff --git a/addons/lunch/static/src/img/icon.png b/addons/lunch/static/description/icon.png
similarity index 100%
rename from addons/lunch/static/src/img/icon.png
rename to addons/lunch/static/description/icon.png
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 63cd0888986..1b9111d3040 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -83,14 +83,15 @@ Main Features
         'static/src/css/mail_group.css',
     ],
     'js': [
-        'static/lib/jquery.expander/jquery.expander.js',
         'static/src/js/mail.js',
         'static/src/js/mail_followers.js',
         'static/src/js/many2many_tags_email.js',
+        'static/src/js/suggestions.js',
     ],
     'qweb': [
         'static/src/xml/mail.xml',
         'static/src/xml/mail_followers.xml',
+        'static/src/xml/suggestions.xml',
     ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py
index 4c6f6e56064..ef3a60987d6 100644
--- a/addons/mail/controllers/main.py
+++ b/addons/mail/controllers/main.py
@@ -1,4 +1,7 @@
 import base64
+
+import openerp
+from openerp import SUPERUSER_ID
 import openerp.addons.web.http as oeweb
 from openerp.addons.web.controllers.main import content_disposition
 
@@ -20,3 +23,18 @@ class MailController(oeweb.Controller):
                     headers=[('Content-Type', 'application/octet-stream'),
                             ('Content-Disposition', content_disposition(filename, req))])
         return req.not_found()
+
+    @oeweb.jsonrequest
+    def receive(self, req):
+        """ End-point to receive mail from an external SMTP server. """
+        dbs = req.jsonrequest.get('databases')
+        for db in dbs:
+            message = dbs[db].decode('base64')
+            try:
+                registry = openerp.registry(db)
+                with registry.cursor() as cr:
+                    mail_thread = registry['mail.thread']
+                    mail_thread.message_process(cr, SUPERUSER_ID, None, message)
+            except psycopg2.Error:
+                pass
+        return True
diff --git a/addons/mail/doc/changelog.rst b/addons/mail/doc/changelog.rst
new file mode 100644
index 00000000000..a7a2cfcf2b5
--- /dev/null
+++ b/addons/mail/doc/changelog.rst
@@ -0,0 +1,17 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+ - added support of ``active_domain`` form context, coming from the list view.
+   When checking the header hook, the mass mailing will be done on all records
+   matching the ``active_domain``.
+ - added ``mail_server_id`` to mail_message, removing it from mail_mail. This allows
+   to set the preferred mail server to use for notifications emails, when using
+   templates.
+ - added ``_mail_post_access`` attribute that specifies the access right that
+   should have the user in order to post a new message on a given model. Values
+   are ``read`` (portal documents), ``write`` (default value), ``unlink`` or ``create``.
diff --git a/addons/mail/doc/index.rst.inc b/addons/mail/doc/index.rst.inc
index 4b01d3ec7bd..7f56666336b 100644
--- a/addons/mail/doc/index.rst.inc
+++ b/addons/mail/doc/index.rst.inc
@@ -12,3 +12,12 @@ Mail Module documentation topics
    mail_partner
    mail_state
    mail_subtype
+
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/mail/i18n/bs.po b/addons/mail/i18n/bs.po
new file mode 100644
index 00000000000..b50a043e2a7
--- /dev/null
+++ b/addons/mail/i18n/bs.po
@@ -0,0 +1,1687 @@
+# Bosnian 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-08-06 10:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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-08-07 04:46+0000\n"
+"X-Generator: Launchpad (build 16721)\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
+#: view:mail.mail: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:313
+#, 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:1029
+#, 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:157
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:737
+#, 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:738
+#, 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:96
+#: code:addons/mail/static/src/xml/mail.xml:108
+#, 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:312
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:75
+#: 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
+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:153
+#, 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:95
+#: code:addons/mail/static/src/xml/mail.xml:107
+#, 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:155
+#, 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:140
+#, 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:193
+#, 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:337
+#, 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:926
+#, 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:75
+#, 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:54
+#: 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:654
+#, 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:120
+#, 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:311
+#, 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:313
+#, 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:123
+#: 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:129
+#: code:addons/mail/static/src/xml/mail.xml:292
+#: 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:323
+#, 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:930
+#, 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:126
+#, 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:139
+#, 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:338
+#, 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/i18n/th.po b/addons/mail/i18n/th.po
new file mode 100644
index 00000000000..a80d1aad14f
--- /dev/null
+++ b/addons/mail/i18n/th.po
@@ -0,0 +1,1702 @@
+# 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-06-28 17:26+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-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\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
+#: view:mail.mail: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:313
+#, 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:1029
+#, 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:157
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:737
+#, 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:738
+#, 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:96
+#: code:addons/mail/static/src/xml/mail.xml:108
+#, 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:312
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:75
+#: 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
+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 "base.config.settings"
+
+#. 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:153
+#, 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:95
+#: code:addons/mail/static/src/xml/mail.xml:107
+#, 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:155
+#, 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:140
+#, 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:193
+#, 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:337
+#, 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 "ir.ui.menu"
+
+#. 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:926
+#, 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 ""
+"<p>\n"
+"                    <b>เยี่ยมยอด!</b> คุณอ่านข้อความหมดแล้ว\n"
+"                </p><p>\n"
+"                   <b>ขอความร่วมมือ</b> ภาษาไทยสำหรับ OpenERP นั้น "
+"ยังไม่สมบรูณ์และถูกต้อง \n"
+"                   <p> เลือกหมวด Translations เพื่อแนะนำการแปลได้ที่ </p>\n"
+"\n"
+"                   https://launchpad.net/openobject-addons : business "
+"application modules\n"
+"                   https://launchpad.net/openobject-server   : the "
+"framework\n"
+"                   https://launchpad.net/openerp-web             : web "
+"modules and frontend\n"
+"                </p>\n"
+"            "
+
+#. 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:75
+#, 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:54
+#: 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:654
+#, 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:120
+#, 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:311
+#, 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:313
+#, 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:123
+#: 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:129
+#: code:addons/mail/static/src/xml/mail.xml:292
+#: 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:323
+#, 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:930
+#, 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:126
+#, 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:139
+#, 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:338
+#, 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/i18n/vi.po b/addons/mail/i18n/vi.po
new file mode 100644
index 00000000000..9f7569bddf7
--- /dev/null
+++ b/addons/mail/i18n/vi.po
@@ -0,0 +1,1687 @@
+# Vietnamese 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-27 06:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\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
+#: view:mail.mail:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr "Tác giả"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr "Chi tiết tin nhắn"
+
+#. 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 "Bình luận"
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr "Nhóm theo..."
+
+#. 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 "Soạn thư mới"
+
+#. 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 "Tên nhóm"
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr "Nội dung"
+
+#. 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 "Thêm"
+
+#. 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 "Tin chưa đọc"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:313
+#, python-format
+msgid "show"
+msgstr "hiển thị"
+
+#. 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:1029
+#, python-format
+msgid "Do you really want to delete this message?"
+msgstr "Bạn có chắc muốn xóa tin nhắn này?"
+
+#. 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:157
+#, python-format
+msgid "followers"
+msgstr "theo dõi"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:737
+#, python-format
+msgid "Access Denied"
+msgstr "Từ chối truy cập"
+
+#. 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 "Lỗi tải lên"
+
+#. module: mail
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr "Hỗ trợ"
+
+#. module: mail
+#: code:addons/mail/mail_message.py:738
+#, 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 "Đã nhận"
+
+#. 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:96
+#: code:addons/mail/static/src/xml/mail.xml:108
+#, python-format
+msgid "uploading"
+msgstr "đang tải lên"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "more."
+msgstr "thêm nữa."
+
+#. 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 "Đã hủy"
+
+#. 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 "Ảnh cỡ trung"
+
+#. 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 "Tự động xóa"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr "Hủy theo dõi"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:312
+#, python-format
+msgid "show one more message"
+msgstr "hiện theo một tin nữa"
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:75
+#: code:addons/mail/res_users.py:69
+#, python-format
+msgid "Invalid Action!"
+msgstr "Hành động không hợp lệ!"
+
+#. 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 "Đối tác liên quan"
+
+#. 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
+msgid "Partner"
+msgstr "Đối tác"
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr "Tổ chức"
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr "Chủ đề"
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr "Các đối tác"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr "Thử lại"
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr "Từ"
+
+#. 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 "base.config.settings"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:36
+#: view:mail.compose.message:0
+#, python-format
+msgid "Send"
+msgstr "Gửi"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:153
+#, python-format
+msgid "No followers"
+msgstr "Không có theo dõi"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr "Thất bại"
+
+#. 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 "Người theo dõi"
+
+#. 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:95
+#: code:addons/mail/static/src/xml/mail.xml:107
+#, 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:155
+#, 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:140
+#, 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 "ID tài liệu liên quan"
+
+#. 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:193
+#, 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:337
+#, 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:926
+#, 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:75
+#, 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:54
+#: 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:654
+#, python-format
+msgid "Please complete partner's informations"
+msgstr ""
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr "Thêm theo dõi"
+
+#. 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:120
+#, 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:311
+#, 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:313
+#, 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:123
+#: 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:129
+#: code:addons/mail/static/src/xml/mail.xml:292
+#: 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:323
+#, python-format
+msgid "Compose new Message"
+msgstr "Soạn tin nhắn mới"
+
+#. 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:930
+#, 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:126
+#, python-format
+msgid "this document"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr "Các bộ lọc"
+
+#. 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:139
+#, 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:338
+#, 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 "Hộp thư đến"
+
+#. 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 "Ảnh cỡ nhỏ"
+
+#. 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 870695e074e..97d2842d15c 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -39,6 +39,7 @@ def remove_accents(input_str):
     nkfd_form = unicodedata.normalize('NFKD', input_str)
     return u''.join([c for c in nkfd_form if not unicodedata.combining(c)])
 
+
 class mail_alias(osv.Model):
     """A Mail Alias is a mapping of an email address with a given OpenERP Document
        model. It is used by OpenERP's mail gateway when processing incoming emails
@@ -47,7 +48,7 @@ class mail_alias(osv.Model):
        of that alias. If the message is a reply it will be attached to the
        existing discussion on the corresponding record, otherwise a new
        record of the corresponding model will be created.
-       
+
        This is meant to be used in combination with a catch-all email configuration
        on the company's mail server, so that as soon as a new mail.alias is
        created, it becomes immediately usable and OpenERP will accept email for it.
@@ -63,9 +64,8 @@ class mail_alias(osv.Model):
         return dict.fromkeys(ids, domain or "")
 
     _columns = {
-        'alias_name': fields.char('Alias', required=True,
-                            help="The name of the email alias, e.g. 'jobs' "
-                                 "if you want to catch emails for <jobs@example.my.openerp.com>",),
+        'alias_name': fields.char('Alias',
+            help="The name of the email alias, e.g. 'jobs' if you want to catch emails for <jobs@example.my.openerp.com>",),
         'alias_model_id': fields.many2one('ir.model', 'Aliased Model', required=True, ondelete="cascade",
                                           help="The model (OpenERP Document Kind) to which this alias "
                                                "corresponds. Any incoming email that does not reply to an "
@@ -87,13 +87,29 @@ class mail_alias(osv.Model):
                                            "messages will be attached, even if they did not reply to it. "
                                            "If set, this will disable the creation of new records completely."),
         'alias_domain': fields.function(_get_alias_domain, string="Alias domain", type='char', size=None),
+        'alias_parent_model_id': fields.many2one('ir.model', 'Parent Model',
+            help="Parent model holding the alias. The model holding the alias reference\n"
+                    "is not necessarily the model given by alias_model_id\n"
+                    "(example: project (parent_model) and task (model))"),
+        'alias_parent_thread_id': fields.integer('Parent Record Thread ID',
+            help="ID of the parent record holding the alias (example: project holding the task creation alias)"),
+        'alias_contact': fields.selection([
+                ('everyone', 'Everyone'),
+                ('partners', 'Authenticated Partners'),
+                ('followers', 'Followers only'),
+            ], string='Alias Contact Security', required=True,
+            help="Policy to post a message on the document using the mailgateway.\n"
+                    "- everyone: everyone can post\n"
+                    "- partners: only authenticated partners\n"
+                    "- followers: only followers of the related document\n"),
     }
 
     _defaults = {
         'alias_defaults': '{}',
-        'alias_user_id': lambda self,cr,uid,context: uid,
+        'alias_user_id': lambda self, cr, uid, context: uid,
         # looks better when creating new aliases - even if the field is informative only
-        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr, SUPERUSER_ID,[1],None,None)[1]
+        'alias_domain': lambda self, cr, uid, context: self._get_alias_domain(cr, SUPERUSER_ID, [1], None, None)[1],
+        'alias_contact': 'everyone',
     }
 
     _sql_constraints = [
@@ -139,13 +155,15 @@ 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_model_name, alias_id_column, alias_key, alias_prefix='', alias_force_key='', alias_defaults={},
+        alias_generate_name=False, 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)
             :param child_table_name: table name of the child class (i.e. res_users)
             :param child_model_auto_init_fct: pointer to the _auto_init function
                 (i.e. super(res_users,self)._auto_init(cr, context=context))
+            :param alias_model_name: name of the aliased model
             :param alias_id_column: alias_id column (i.e. self._columns['alias_id'])
             :param alias_key: name of the column used for the unique name (i.e. 'login')
             :param alias_prefix: prefix for the unique name (i.e. 'jobs' + ...)
@@ -153,6 +171,8 @@ class mail_alias(osv.Model):
                 if empty string, not taken into account
             :param alias_defaults: dict, keys = mail.alias columns, values = child
                 model column name used for default values (i.e. {'job_id': 'id'})
+            :param alias_generate_name: automatically generate alias name using prefix / alias key;
+                default alias_name value is False because since 8.0 it is not required anymore
         """
         if context is None:
             context = {}
@@ -170,13 +190,17 @@ class mail_alias(osv.Model):
         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': False}
+            if alias_generate_name:
+                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=context.get('alias_model_name', child_model_name))
+            alias_vals['alias_parent_thread_id'] = obj_data['id']
+            alias_create_ctx = dict(context, alias_model_name=alias_model_name, alias_parent_model_name=child_model_name)
+            alias_id = mail_alias.create(cr, SUPERUSER_ID, alias_vals, context=alias_create_ctx)
             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'])
+            _logger.info('Mail alias created for %s %s (id %s)', child_model_name, obj_data[alias_key], obj_data['id'])
 
         # Finally attempt to reinstate the missing constraint
         try:
@@ -189,22 +213,53 @@ 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
-        make it unique (and certain unsafe characters replaced), and 
-        he ``alias_model_id`` value will set to the model ID of the ``model_name``
-        value, if provided, 
+    def create(self, cr, uid, vals, 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
+            make it unique (and certain unsafe characters replaced), and
+            he ``alias_model_id`` value will set to the model ID of the ``model_name``
+            context value, if provided.
         """
-        # when an alias name appears to already be an email, we keep the local part only
-        alias_name = remove_accents(vals['alias_name']).lower().split('@')[0]
-        alias_name = re.sub(r'[^\w+.]+', '-', alias_name)
-        alias_name = self._find_unique(cr, uid, alias_name, context=context)
-        vals['alias_name'] = alias_name
+        if context is None:
+            context = {}
+        model_name = context.get('alias_model_name')
+        parent_model_name = context.get('alias_parent_model_name')
+        if vals.get('alias_name'):
+            # when an alias name appears to already be an email, we keep the local part only
+            alias_name = remove_accents(vals['alias_name']).lower().split('@')[0]
+            alias_name = re.sub(r'[^\w+.]+', '-', alias_name)
+            alias_name = self._find_unique(cr, uid, alias_name, context=context)
+            vals['alias_name'] = alias_name
         if model_name:
             model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', model_name)], context=context)[0]
             vals['alias_model_id'] = model_id
-        return self.create(cr, uid, vals, context=context)
+        if parent_model_name:
+            model_id = self.pool.get('ir.model').search(cr, uid, [('model', '=', parent_model_name)], context=context)[0]
+            vals['alias_parent_model_id'] = model_id
+        return super(mail_alias, self).create(cr, uid, vals, context=context)
+
+    def open_document(self, cr, uid, ids, context=None):
+        alias = self.browse(cr, uid, ids, context=context)[0]
+        if not alias.alias_model_id or not alias.alias_force_thread_id:
+            return False
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': alias.alias_model_id.model,
+            'res_id': alias.alias_force_thread_id,
+            'type': 'ir.actions.act_window',
+        }
+
+    def open_parent_document(self, cr, uid, ids, context=None):
+        alias = self.browse(cr, uid, ids, context=context)[0]
+        if not alias.alias_parent_model_id or not alias.alias_parent_thread_id:
+            return False
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': alias.alias_parent_model_id.model,
+            'res_id': alias.alias_parent_thread_id,
+            'type': 'ir.actions.act_window',
+        }
diff --git a/addons/mail/mail_alias_view.xml b/addons/mail/mail_alias_view.xml
index e0d8e173ebc..248bf7e8f3a 100644
--- a/addons/mail/mail_alias_view.xml
+++ b/addons/mail/mail_alias_view.xml
@@ -9,13 +9,23 @@
             <field name="arch" type="xml">
                 <form string="Alias" version="7.0">
                     <sheet>
-                        <label for="alias_name" class="oe_edit_only"/>
                         <h2><field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline"/></h2>
+                        <div class="oe_right oe_button_box">
+                            <button name="open_document" string="Open Document"
+                                    type="object" class="oe_link"
+                                    attrs="{'invisible': ['|', ('alias_model_id', '=', False), ('alias_force_thread_id', '=', 0)]}"/>
+                            <button name="open_parent_document" string="Open Parent Document"
+                                    type="object" class="oe_link"
+                                    attrs="{'invisible': ['|', ('alias_parent_model_id', '=', False), ('alias_parent_thread_id', '=', 0)]}"/>
+                        </div>
                         <group>
                             <field name="alias_model_id"/>
-                            <field name="alias_user_id"/>
                             <field name="alias_force_thread_id"/>
                             <field name="alias_defaults"/>
+                            <field name="alias_contact"/>
+                            <field name="alias_user_id"/>
+                            <field name="alias_parent_model_id"/>
+                            <field name="alias_parent_thread_id"/>
                         </group>
                     </sheet>
                 </form>
@@ -32,6 +42,7 @@
                     <field name="alias_model_id"/>
                     <field name="alias_user_id"/>
                     <field name="alias_defaults"/>
+                    <field name="alias_contact"/>
                 </tree>
             </field>
         </record>
@@ -44,8 +55,13 @@
                 <search string="Search Alias">
                     <field name="alias_name"/>
                     <field name="alias_model_id"/>
+                    <field name="alias_force_thread_id"/>
+                    <field name="alias_parent_model_id"/>
+                    <field name="alias_parent_thread_id"/>
+                    <separator/>
+                    <filter string="Active" name="active" domain="[('alias_name', '!=', False)]"/>
                     <group expand="0" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'alias_user_id'}"/>
+                        <filter string="User" name="User" context="{'group_by':'alias_user_id'}"/>
                         <filter string="Model" name="Model" context="{'group_by':'alias_model_id'}"/>
                     </group>
                 </search>
@@ -55,6 +71,10 @@
         <record id="action_view_mail_alias" model="ir.actions.act_window">
             <field name="name">Aliases</field>
             <field name="res_model">mail.alias</field>
+            <field name="context">{
+                    'search_default_active': True,
+                }
+            </field>
         </record>
 
         <menuitem id="mail_alias_menu"
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 98e88b664e6..ac350810aa6 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -150,11 +150,17 @@ class mail_notification(osv.Model):
 
         return footer
 
-    def _notify(self, cr, uid, msg_id, partners_to_notify=None, context=None):
+    def _notify(self, cr, uid, msg_id, partners_to_notify=None, context=None,
+                force_send=False, user_signature=True):
         """ Send by email the notification depending on the user preferences
 
             :param list partners_to_notify: optional list of partner ids restricting
                 the notifications to process
+            :param bool force_send: if True, the generated mail.mail is
+                immediately sent after being created, as if the scheduler
+                was executed for this message only.
+            :param bool user_signature: if True, the generated mail.mail body is
+                the body of the related mail.message with the author's signature
         """
         if context is None:
             context = {}
@@ -189,8 +195,9 @@ class mail_notification(osv.Model):
         # add signature
         body_html = msg.body
         user_id = msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0] and msg.author_id.user_ids[0].id or None
-        signature_company = self.get_signature_footer(cr, uid, user_id, res_model=msg.model, res_id=msg.res_id, context=context)
-        body_html = tools.append_content_to_html(body_html, signature_company, plaintext=False, container_tag='div')
+        if user_signature:
+            signature_company = self.get_signature_footer(cr, uid, user_id, res_model=msg.model, res_id=msg.res_id, context=context)
+            body_html = tools.append_content_to_html(body_html, signature_company, plaintext=False, container_tag='div')
 
         references = False
         if msg.parent_id:
@@ -203,13 +210,9 @@ class mail_notification(osv.Model):
             'recipient_ids': [(4, id) for id in notify_partner_ids],
             'references': references,
         }
-        if msg.email_from:
-            mail_values['email_from'] = msg.email_from
-        if msg.reply_to:
-            mail_values['reply_to'] = msg.reply_to
         mail_mail = self.pool.get('mail.mail')
         email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
-        try:
-            return mail_mail.send(cr, uid, [email_notif_id], context=context)
-        except Exception:
-            return False
+
+        if force_send:
+            mail_mail.send(cr, uid, [email_notif_id], context=context)
+        return True
diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index a9d1d80240b..515be85132a 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -66,11 +66,11 @@
 
         <!-- Add followers related menu entries in Settings/Email -->
         <menuitem name="Followers" id="menu_email_followers" parent="base.menu_email"
-                    action="action_view_followers" sequence="30" groups="base.group_no_one"/> -->
+                    action="action_view_followers" sequence="30" groups="base.group_no_one"/>
         
         <!-- Add notifications related menu entry in Settings/Email -->
         <menuitem name="Notifications" id="menu_email_notifications" parent="base.menu_email"
-                    action="action_view_notifications" sequence="35" groups="base.group_no_one"/>
+                    action="action_view_notifications" sequence="13" groups="base.group_no_one"/>
 
     </data>
 </openerp>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 977608f487e..9e363065481 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -93,17 +93,16 @@ class mail_group(osv.Model):
         'public': 'groups',
         'group_public_id': _get_default_employee_group,
         'image': _get_default_image,
-        'alias_domain': False,  # always hide alias during creation
     }
 
     def _generate_header_description(self, cr, uid, group, context=None):
         header = ''
         if group.description:
             header = '%s' % group.description
-        if group.alias_id and group.alias_id.alias_name and group.alias_id.alias_domain:
+        if group.alias_id and group.alias_name and group.alias_domain:
             if header:
                 header = '%s<br/>' % header
-            return '%sGroup email gateway: %s@%s' % (header, group.alias_id.alias_name, group.alias_id.alias_domain)
+            return '%sGroup email gateway: %s@%s' % (header, group.alias_name, group.alias_domain)
         return header
 
     def _subscribe_users(self, cr, uid, ids, context=None):
@@ -114,15 +113,8 @@ class mail_group(osv.Model):
             self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     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_id = mail_alias.create_unique_alias(cr, uid,
-                          # Using '+' allows using subaddressing for those who don't
-                          # have a catchall domain setup.
-                          {'alias_name': "group+" + vals['name']},
-                          model_name=self._name, context=context)
-            vals['alias_id'] = alias_id
+        if context is None:
+            context = {}
 
         # get parent menu
         menu_parent = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'mail_group_root')
@@ -134,8 +126,10 @@ class mail_group(osv.Model):
         vals['menu_id'] = menu_id
 
         # Create group and alias
-        mail_group_id = super(mail_group, self).create(cr, uid, vals, context=context)
-        mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
+        create_context = dict(context, alias_model_name=self._name, alias_parent_model_name=self._name)
+        mail_group_id = super(mail_group, self).create(cr, uid, vals, context=create_context)
+        group = self.browse(cr, uid, mail_group_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [group.alias_id.id], {"alias_force_thread_id": mail_group_id, 'alias_parent_thread_id': mail_group_id}, context)
         group = self.browse(cr, uid, mail_group_id, context=context)
 
         # Create client action for this group and link the menu to it
@@ -208,3 +202,12 @@ class mail_group(osv.Model):
         """ Wrapper because message_unsubscribe_users take a user_ids=None
             that receive the context without the wrapper. """
         return self.message_unsubscribe_users(cr, uid, ids, context=context)
+
+    def get_suggested_thread(self, cr, uid, removed_suggested_threads=None, context=None):
+        """Show the suggestion of groups if display_groups_suggestions if the
+        user perference allows it."""
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        if not user.display_groups_suggestions:
+            return []
+        else:
+            return super(mail_group, self).get_suggested_thread(cr, uid, removed_suggested_threads, context)
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 04212b2f58a..8bf61dbdb1e 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -44,7 +44,7 @@
                                 <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>
+                                        <span class="oe_e oe_e_alias">%%</span><small><field name="alias_id"/></small>
                                     </div>
                                     <div class="oe_grey">
                                         <field name="description"/>
@@ -78,17 +78,19 @@
                                 <label for="name" string="Group Name"/>
                             </div>
                             <h1><field name="name" readonly="0"/></h1>
-                            <div name="group_alias"
+                            <group colspan="2" 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>
+                                <label for="alias_id" string="%%" class="oe_e oe_e_alias" style="min-width: 20px;"/>
+                                <div name="alias_def">
+                                    <field name="alias_id" class="oe_read_only oe_inline"
+                                            string="Email Alias" required="0"/>
+                                    <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                        <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                    </div>
+                                </div>
+                                <label for="alias_contact" string="V" class="oe_e oe_e_alias" style="min-width: 20px;"/>
+                                <field name="alias_contact" class="oe_inline" nolabel="1"/>
+                            </group>
                         </div>
                         <field name="description" placeholder="Topics discussed in this group..."/>
                         <div class="oe_clear"/>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index bd2b9c3f18a..9fa80b9be46 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -44,7 +44,6 @@ class mail_mail(osv.Model):
 
     _columns = {
         'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
-        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
         'state': fields.selection([
             ('outgoing', 'Outgoing'),
             ('sent', 'Sent'),
@@ -55,7 +54,6 @@ class mail_mail(osv.Model):
         'auto_delete': fields.boolean('Auto Delete',
             help="Permanently delete this email after sending it, to save space"),
         'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
-        'email_from': fields.char('From', help='Message sender, taken from user preferences.'),
         'email_to': fields.text('To', help='Message recipients (emails)'),
         'recipient_ids': fields.many2many('res.partner', string='To (Partners)'),
         'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
@@ -67,16 +65,13 @@ class mail_mail(osv.Model):
     }
 
     def _get_default_from(self, cr, uid, context=None):
-        this = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
-        if this.alias_domain:
-            return '%s <%s@%s>' % (this.name, this.alias_name, this.alias_domain)
-        elif this.email:
-            return '%s <%s>' % (this.name, this.email)
-        raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
+        """ Kept for compatibility
+            TDE TODO: remove me in 8.0
+        """
+        return self.pool['mail.message']._get_default_from(cr, uid, context=context)
 
     _defaults = {
         'state': 'outgoing',
-        'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -93,19 +88,25 @@ class mail_mail(osv.Model):
         # if value specified: directly return it
         if values.get('reply_to'):
             return values.get('reply_to')
+        format_name = True  # whether to use a 'Followers of Pigs <pigs@openerp.com' format
+        email_reply_to = None
 
-        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
+        # model, res_id, email_from: comes from values OR related message
+        model, res_id, email_from = values.get('model'), values.get('res_id'), values.get('email_from')
         if values.get('mail_message_id'):
             message = self.pool.get('mail.message').browse(cr, uid, values.get('mail_message_id'), context=context)
-        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 message.reply_to:
+                email_reply_to = message.reply_to
+                format_name = False
+            if not model:
+                model = message.model
+            if not res_id:
+                res_id = message.res_id
+            if not email_from:
+                email_from = message.email_from
 
         # if model and res_id: try to use ``message_get_reply_to`` that returns the document alias
         if not email_reply_to and model and res_id and hasattr(self.pool[model], 'message_get_reply_to'):
@@ -115,16 +116,16 @@ class mail_mail(osv.Model):
             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
+
+        # still no reply_to -> reply_to will be the 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
+            email_reply_to = email_from
 
         # format 'Document name <email_address>'
-        if email_reply_to and model and res_id and mailgateway:
+        if email_reply_to and model and res_id and format_name:
+            emails = tools.email_split(email_reply_to)
+            if emails:
+                email_reply_to = emails[0]
             document_name = self.pool[model].name_get(cr, SUPERUSER_ID, [res_id], context=context)[0]
             if document_name:
                 # sanitize document name
@@ -138,10 +139,16 @@ class mail_mail(osv.Model):
         # notification field: if not set, set if mail comes from an existing mail.message
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
+        mail_id = super(mail_mail, self).create(cr, uid, values, context=context)
+
         # reply_to: if not set, set with default values that require creation values
+        # but delegate after creation because of mail_message.message_id automatic
+        # creation using existence of reply_to
         if not values.get('reply_to'):
-            values['reply_to'] = self._get_reply_to(cr, uid, values, context=context)
-        return super(mail_mail, self).create(cr, uid, values, context=context)
+            reply_to = self._get_reply_to(cr, uid, values, context=context)
+            if reply_to:
+                self.write(cr, uid, [mail_id], {'reply_to': reply_to}, context=context)
+        return mail_id
 
     def unlink(self, cr, uid, ids, context=None):
         # cascade-delete the parent message for all mails that are not created for a notification
@@ -174,7 +181,7 @@ class mail_mail(osv.Model):
         if context is None:
             context = {}
         if not ids:
-            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
+            filters = [('state', '=', 'outgoing')]
             if 'filters' in context:
                 filters.extend(context['filters'])
             ids = self.search(cr, uid, filters, context=context)
@@ -320,6 +327,7 @@ class mail_mail(osv.Model):
                     email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
 
                 # build an RFC2822 email.message.Message object and send it without queuing
+                res = None
                 for email in email_list:
                     msg = ir_mail_server.build_email(
                         email_from = mail.email_from,
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index 7384cc24a75..f3728d4653a 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -115,7 +115,7 @@
             <field name="res_model">mail.mail</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_outgoing': 1, 'search_default_type_email': 1}</field>
+            <field name="context">{'search_default_outgoing': 1}</field>
             <field name="search_view_id" ref="view_mail_search"/>
         </record>
 
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 252179614c6..f90baa5a320 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -191,11 +191,20 @@ class mail_message(osv.Model):
         'vote_user_ids': fields.many2many('res.users', 'mail_vote',
             'message_id', 'user_id', string='Votes',
             help='Users that voted for this message'),
+        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
     }
 
     def _needaction_domain_get(self, cr, uid, context=None):
         return [('to_read', '=', True)]
 
+    def _get_default_from(self, cr, uid, context=None):
+        this = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+        if this.alias_domain:
+            return '%s <%s@%s>' % (this.name, this.alias_name, this.alias_domain)
+        elif this.email:
+            return '%s <%s>' % (this.name, this.email)
+        raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
+
     def _get_default_author(self, cr, uid, context=None):
         return self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
 
@@ -204,7 +213,7 @@ class mail_message(osv.Model):
         'date': lambda *a: fields.datetime.now(),
         'author_id': lambda self, cr, uid, ctx=None: self._get_default_author(cr, uid, ctx),
         'body': '',
-        'email_from': lambda self, cr, uid, ctx=None: self.pool.get('mail.mail')._get_default_from(cr, uid, ctx),
+        'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
     }
 
     #------------------------------------------------------
@@ -329,8 +338,10 @@ class mail_message(osv.Model):
         for key, message in message_tree.iteritems():
             if message.author_id:
                 partner_ids |= set([message.author_id.id])
-            if message.notified_partner_ids:
+            if message.subtype_id and message.notified_partner_ids:  # take notified people of message with a subtype
                 partner_ids |= set([partner.id for partner in message.notified_partner_ids])
+            elif not message.subtype_id and message.partner_ids:  # take specified people of message without a subtype (log)
+                partner_ids |= set([partner.id for partner in message.partner_ids])
             if message.attachment_ids:
                 attachment_ids |= set([attachment.id for attachment in message.attachment_ids])
         # Read partners as SUPERUSER -> display the names like classic m2o even if no access
@@ -350,9 +361,12 @@ class mail_message(osv.Model):
             else:
                 author = (0, message.email_from)
             partner_ids = []
-            for partner in message.notified_partner_ids:
-                if partner.id in partner_tree:
-                    partner_ids.append(partner_tree[partner.id])
+            if message.subtype_id:
+                partner_ids = [partner_tree[partner.id] for partner in message.notified_partner_ids
+                                if partner.id in partner_tree]
+            else:
+                partner_ids = [partner_tree[partner.id] for partner in message.partner_ids
+                                if partner.id in partner_tree]
             attachment_ids = []
             for attachment in message.attachment_ids:
                 if attachment.id in attachments_tree:
@@ -381,15 +395,21 @@ class mail_message(osv.Model):
         has_voted = uid in [user.id for user in message.vote_user_ids]
 
         try:
-            body_html = html_email_clean(message.body)
+            if parent_id:
+                max_length = 300
+            else:
+                max_length = 100
+            body_short = html_email_clean(message.body, remove=False, shorten=True, max_length=max_length)
+
         except Exception:
-            body_html = '<p><b>Encoding Error : </b><br/>Unable to convert this message (id: %s).</p>' % message.id
+            body_short = '<p><b>Encoding Error : </b><br/>Unable to convert this message (id: %s).</p>' % message.id
             _logger.exception(Exception)
 
         return {'id': message.id,
                 'type': message.type,
                 'subtype': message.subtype_id.name if message.subtype_id else False,
-                'body': body_html,
+                'body': message.body,
+                'body_short': body_short,
                 'model': message.model,
                 'res_id': message.res_id,
                 'record_name': message.record_name,
@@ -766,7 +786,9 @@ class mail_message(osv.Model):
         elif not values.get('message_id'):
             values['message_id'] = tools.generate_tracking_message_id('private')
         newid = super(mail_message, self).create(cr, uid, values, context)
-        self._notify(cr, uid, newid, context=context)
+        self._notify(cr, uid, newid, context=context,
+                     force_send=context.get('mail_notify_force_send', True),
+                     user_signature=context.get('mail_notify_user_signature', True))
         # TDE FIXME: handle default_starred. Why not setting an inv on starred ?
         # Because starred will call set_message_starred, that looks for notifications.
         # When creating a new mail_message, it will create a notification to a message
@@ -880,20 +902,16 @@ class mail_message(osv.Model):
             return ''
         return result
 
-    def _notify(self, cr, uid, newid, context=None):
+    def _notify(self, cr, uid, newid, context=None, force_send=False, user_signature=True):
         """ Add the related record followers to the destination partner_ids if is not a private message.
             Call mail_notification.notify to manage the email sending
         """
         notification_obj = self.pool.get('mail.notification')
         message = self.browse(cr, uid, newid, context=context)
-
         partners_to_notify = set([])
-        # message has no subtype_id: pure log message -> no partners, no one notified
-        if not message.subtype_id:
-            return True
 
-        # all followers of the mail.message document have to be added as partners and notified
-        if message.model and message.res_id:
+        # all followers of the mail.message document have to be added as partners and notified if a subtype is defined (otherwise: log message)
+        if message.subtype_id and message.model and message.res_id:
             fol_obj = self.pool.get("mail.followers")
             # browse as SUPERUSER because rules could restrict the search results
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
@@ -903,7 +921,7 @@ class mail_message(osv.Model):
                 ], context=context)
             partners_to_notify |= set(fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
         # remove me from notified partners, unless the message is written on my own wall
-        if message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
+        if message.subtype_id and message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
             partners_to_notify |= set([message.author_id])
         elif message.author_id:
             partners_to_notify -= set([message.author_id])
@@ -914,7 +932,8 @@ class mail_message(osv.Model):
 
         # notify
         if partners_to_notify:
-            notification_obj._notify(cr, uid, newid, partners_to_notify=[p.id for p in partners_to_notify], context=context)
+            notification_obj._notify(cr, uid, newid, partners_to_notify=[p.id for p in partners_to_notify], context=context,
+                                            force_send=force_send, user_signature=user_signature)
         message.refresh()
 
         # An error appear when a user receive a notification without notifying
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 02f4ef7fdbe..e4442e366e3 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -30,9 +30,9 @@
                                 <field name="subject"/>
                                 <field name="author_id"/>
                                 <field name="email_from"/>
+                                <field name="reply_to"/>
                                 <field name="date"/>
                                 <field name="type"/>
-                                <field name="subtype_id"/>
                             </group>
                             <group>
                                 <field name="model"/>
@@ -40,6 +40,7 @@
                                 <field name="parent_id"/>
                                 <field name="partner_ids" widget="many2many_tags"/>
                                 <field name="notified_partner_ids" widget="many2many_tags"/>
+                                <field name="subtype_id"/>
                             </group>
                         </group>
                         <field name="body"/>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a46f416f44b..94e9126f020 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -25,7 +25,6 @@ import dateutil
 import email
 import logging
 import pytz
-import re
 import time
 import xmlrpclib
 from email.message import Message
@@ -71,6 +70,7 @@ class mail_thread(osv.AbstractModel):
     _name = 'mail.thread'
     _description = 'Email Thread'
     _mail_flat_thread = True
+    _mail_post_access = 'write'
 
     # Automatic logging system if mail installed
     # _track = {
@@ -102,21 +102,22 @@ class mail_thread(osv.AbstractModel):
         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 \
+            if object_id.alias_id and object_id.alias_id.alias_name 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')
+            alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ("alias_name", "!=", False), ('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>
+                            Click here to add new %(document)s or send an email to: <a href='mailto:%(email)s'>%(email)s</a>
                         </p>
                         %(static_help)s"""
                     ) % {
@@ -126,7 +127,7 @@ class mail_thread(osv.AbstractModel):
                     }
 
         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") % {
+            return _("<p class='oe_view_nocontent_create'>Click here to add new %(document)s</p>%(static_help)s") % {
                         'document': document_name,
                         'static_help': help or '',
                     }
@@ -156,12 +157,26 @@ class mail_thread(osv.AbstractModel):
                 res[id]['message_summary'] = "<span class='oe_kanban_mail_new' title='%s'><span class='oe_e'>9</span> %d %s</span>" % (title, res[id].pop('message_unread_count'), _("New"))
         return res
 
-    def _get_subscription_data(self, cr, uid, ids, name, args, context=None):
+    def read_followers_data(self, cr, uid, follower_ids, context=None):
+        result = []
+        technical_group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_no_one')
+        for follower in self.pool.get('res.partner').browse(cr, uid, follower_ids, context=context):
+            is_editable = uid in map(lambda x: x.id, technical_group.users)
+            is_uid = uid in map(lambda x: x.id, follower.user_ids)
+            data = (follower.id,
+                    follower.name,
+                    {'is_editable': is_editable, 'is_uid': is_uid},
+                    )
+            result.append(data)
+        return result
+
+    def _get_subscription_data(self, cr, uid, ids, name, args, user_pid=None, context=None):
         """ Computes:
             - message_subtype_data: data about document subtypes: which are
                 available, which are followed if any """
         res = dict((id, dict(message_subtype_data='')) for id in ids)
-        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        if user_pid is None:
+            user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
 
         # find current model subtypes, add them to a dictionary
         subtype_obj = self.pool.get('mail.message.subtype')
@@ -240,21 +255,41 @@ class mail_thread(osv.AbstractModel):
             fol_obj.create(cr, SUPERUSER_ID, {'res_model': self._name, 'res_id': id, 'partner_id': partner_id})
 
     def _search_followers(self, cr, uid, obj, name, args, context):
+        """Search function for message_follower_ids
+
+        Do not use with operator 'not in'. Use instead message_is_followers
+        """
         fol_obj = self.pool.get('mail.followers')
         res = []
         for field, operator, value in args:
             assert field == name
+            # TOFIX make it work with not in
+            assert operator != "not in", "Do not search message_follower_ids with 'not in'"
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('partner_id', operator, value)])
             res_ids = [fol.res_id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids)]
             res.append(('id', 'in', res_ids))
         return res
 
+    def _search_is_follower(self, cr, uid, obj, name, args, context):
+        """Search function for message_is_follower"""
+        res = []
+        for field, operator, value in args:
+            assert field == name
+            partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+            if (operator == '=' and value) or (operator == '!=' and not value):  # is a follower
+                res_ids = self.search(cr, uid, [('message_follower_ids', 'in', [partner_id])], context=context)
+            else:  # is not a follower or unknown domain
+                mail_ids = self.search(cr, uid, [('message_follower_ids', 'in', [partner_id])], context=context)
+                res_ids = self.search(cr, uid, [('id', 'not in', mail_ids)], context=context)
+            res.append(('id', 'in', res_ids))
+        return res
+
     _columns = {
-        'message_is_follower': fields.function(_get_followers,
-            type='boolean', string='Is a Follower', multi='_get_followers,'),
+        'message_is_follower': fields.function(_get_followers, type='boolean',
+            fnct_search=_search_is_follower, string='Is a Follower', multi='_get_followers,'),
         'message_follower_ids': fields.function(_get_followers, fnct_inv=_set_followers,
-                fnct_search=_search_followers, type='many2many',
-                obj='res.partner', string='Followers', multi='_get_followers'),
+            fnct_search=_search_followers, type='many2many',
+            obj='res.partner', string='Followers', multi='_get_followers'),
         'message_ids': fields.one2many('mail.message', 'res_id',
             domain=lambda self: [('model', '=', self._name)],
             auto_join=True,
@@ -292,7 +327,12 @@ class mail_thread(osv.AbstractModel):
         # 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)
+        # auto_subscribe: take values and defaults into account
+        create_values = set(values.keys())
+        for key, val in context.iteritems():
+            if key.startswith('default_'):
+                create_values.add(key[8:])
+        self.message_auto_subscribe(cr, uid, [thread_id], list(create_values), context=context)
 
         # track values
         tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
@@ -308,8 +348,8 @@ class mail_thread(osv.AbstractModel):
         # Track initial values of tracked fields
         tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
         if tracked_fields:
-            initial = self.read(cr, uid, ids, tracked_fields.keys(), context=context)
-            initial_values = dict((item['id'], item) for item in initial)
+            records = self.browse(cr, uid, ids, context=context)
+            initial_values = dict((this.id, dict((key, getattr(this, key)) for key in tracked_fields.keys())) for this in records)
 
         # Perform write, update followers
         result = super(mail_thread, self).write(cr, uid, ids, values, context=context)
@@ -368,7 +408,7 @@ class mail_thread(osv.AbstractModel):
             if not value:
                 return ''
             if col_info['type'] == 'many2one':
-                return value[1]
+                return value.name_get()[0][1]
             if col_info['type'] == 'selection':
                 return dict(col_info['selection'])[value]
             return value
@@ -387,23 +427,26 @@ class mail_thread(osv.AbstractModel):
         if not tracked_fields:
             return True
 
-        for record in self.read(cr, uid, ids, tracked_fields.keys(), context=context):
-            initial = initial_values[record['id']]
-            changes = []
+        for browse_record in self.browse(cr, uid, ids, context=context):
+            initial = initial_values[browse_record.id]
+            changes = set()
             tracked_values = {}
 
             # generate tracked_values data structure: {'col_name': {col_info, new_value, old_value}}
             for col_name, col_info in tracked_fields.items():
-                if record[col_name] == initial[col_name] and getattr(self._all_columns[col_name].column, 'track_visibility', None) == 'always':
+                initial_value = initial[col_name]
+                record_value = getattr(browse_record, col_name)
+
+                if record_value == initial_value and getattr(self._all_columns[col_name].column, 'track_visibility', None) == 'always':
                     tracked_values[col_name] = dict(col_info=col_info['string'],
-                                                        new_value=convert_for_display(record[col_name], col_info))
-                elif record[col_name] != initial[col_name]:
+                                                        new_value=convert_for_display(record_value, col_info))
+                elif record_value != initial_value and (record_value or initial_value):  # because browse null != False
                     if getattr(self._all_columns[col_name].column, 'track_visibility', None) in ['always', 'onchange']:
                         tracked_values[col_name] = dict(col_info=col_info['string'],
-                                                            old_value=convert_for_display(initial[col_name], col_info),
-                                                            new_value=convert_for_display(record[col_name], col_info))
+                                                            old_value=convert_for_display(initial_value, col_info),
+                                                            new_value=convert_for_display(record_value, col_info))
                     if col_name in tracked_fields:
-                        changes.append(col_name)
+                        changes.add(col_name)
             if not changes:
                 continue
 
@@ -413,7 +456,7 @@ class mail_thread(osv.AbstractModel):
                 if field not in changes:
                     continue
                 for subtype, method in track_info.items():
-                    if method(self, cr, uid, record, context):
+                    if method(self, cr, uid, browse_record, context):
                         subtypes.append(subtype)
 
             posted = False
@@ -424,11 +467,11 @@ class mail_thread(osv.AbstractModel):
                     _logger.debug('subtype %s not found, giving error "%s"' % (subtype, e))
                     continue
                 message = format_message(subtype_rec.description if subtype_rec.description else subtype_rec.name, tracked_values)
-                self.message_post(cr, uid, record['id'], body=message, subtype=subtype, context=context)
+                self.message_post(cr, uid, browse_record.id, body=message, subtype=subtype, context=context)
                 posted = True
             if not posted:
                 message = format_message('', tracked_values)
-                self.message_post(cr, uid, record['id'], body=message, context=context)
+                self.message_post(cr, uid, browse_record.id, body=message, context=context)
         return True
 
     #------------------------------------------------------
@@ -467,12 +510,22 @@ class mail_thread(osv.AbstractModel):
             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)
+        if hasattr(self, '_mail_post_access'):
+            create_allow = self._mail_post_access
         else:
-            model_obj.check_access_rights(cr, uid, operation)
-            model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+            create_allow = 'write'
+
+        if operation in ['write', 'unlink']:
+            check_operation = 'write'
+        elif operation == 'create' and create_allow in ['create', 'read', 'write', 'unlink']:
+            check_operation = create_allow
+        elif operation == 'create':
+            check_operation = 'write'
+        else:
+            check_operation = operation
+
+        model_obj.check_access_rights(cr, uid, check_operation)
+        model_obj.check_access_rule(cr, uid, mids, check_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
@@ -543,6 +596,8 @@ class mail_thread(osv.AbstractModel):
     #------------------------------------------------------
 
     def message_get_reply_to(self, cr, uid, ids, context=None):
+        """ Returns the preferred reply-to email address that is basically
+            the alias of the document, if it exists. """
         if not self._inherits.get('mail.alias'):
             return [False for id in ids]
         return ["%s@%s" % (record['alias_name'], record['alias_domain'])
@@ -559,34 +614,136 @@ class mail_thread(osv.AbstractModel):
         ret_dict = {}
         for model_name in self.pool.obj_list():
             model = self.pool[model_name]
-            if 'mail.thread' in getattr(model, '_inherit', []):
+            if hasattr(model, "message_process") and hasattr(model, "message_post"):
                 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.
 
-            TDE TODO: merge me with other partner finding methods in 8.0 """
-        partner_obj = self.pool.get('res.partner')
-        partner_ids = []
+            :param string message: an email.message instance """
         s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
-        for email_address in tools.email_split(s):
-            related_partners = partner_obj.search(cr, uid, [('email', 'ilike', email_address), ('user_ids', '!=', False)], limit=1, context=context)
-            if not related_partners:
-                related_partners = partner_obj.search(cr, uid, [('email', 'ilike', email_address)], limit=1, context=context)
-            partner_ids += related_partners
-        return partner_ids
+        return filter(lambda x: x, self._find_partner_from_emails(cr, uid, None, tools.email_split(s), context=context))
 
-    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, ['|',
-            ('login', '=', from_local_part),
-            ('email', '=', from_local_part)], context=context)
-        return user_ids[0] if user_ids else uid
+    def message_route_verify(self, cr, uid, message, message_dict, route, update_author=True, assert_model=True, create_fallback=True, context=None):
+        """ Verify route validity. Check and rules:
+            1 - if thread_id -> check that document effectively exists; otherwise
+                fallback on a message_new by resetting thread_id
+            2 - check that message_update exists if thread_id is set; or at least
+                that message_new exist
+            [ - find author_id if udpate_author is set]
+            3 - if there is an alias, check alias_contact:
+                'followers' and thread_id:
+                    check on target document that the author is in the followers
+                'followers' and alias_parent_thread_id:
+                    check on alias parent document that the author is in the
+                    followers
+                'partners': check that author_id id set
+        """
 
-    def message_route(self, cr, uid, message, model=None, thread_id=None,
+        assert isinstance(route, (list, tuple)), 'A route should be a list or a tuple'
+        assert len(route) == 5, 'A route should contain 5 elements: model, thread_id, custom_values, uid, alias record'
+
+        message_id = message.get('Message-Id')
+        email_from = decode_header(message, 'From')
+        author_id = message_dict.get('author_id')
+        model, thread_id, alias = route[0], route[1], route[4]
+        model_pool = None
+
+        def _create_bounce_email():
+            mail_mail = self.pool.get('mail.mail')
+            mail_id = mail_mail.create(cr, uid, {
+                            'body_html': '<div><p>Hello,</p>'
+                                '<p>The following email sent to %s cannot be accepted because this is '
+                                'a private email address. Only allowed people can contact us at this address.</p></div>'
+                                '<blockquote>%s</blockquote>' % (message.get('to'), message_dict.get('body')),
+                            'subject': 'Re: %s' % message.get('subject'),
+                            'email_to': message.get('from'),
+                            'auto_delete': True,
+                        }, context=context)
+            mail_mail.send(cr, uid, [mail_id], context=context)
+
+        def _warn(message):
+            _logger.warning('Routing mail with Message-Id %s: route %s: %s',
+                                message_id, route, message)
+
+        # Wrong model
+        if model and not model in self.pool:
+            if assert_model:
+                assert model in self.pool, 'Routing: unknown target model %s' % model
+            _warn('unknown target model %s' % model)
+            return ()
+        elif model:
+            model_pool = self.pool[model]
+
+        # Private message: should not contain any thread_id
+        if not model and thread_id:
+            if assert_model:
+                assert thread_id == 0, 'Routing: posting a message without model should be with a null res_id (private message).'
+            _warn('posting a message without model should be with a null res_id (private message), resetting thread_id')
+            thread_id = 0
+        # Private message: should have a parent_id (only answers)
+        if not model and not message_dict.get('parent_id'):
+            if assert_model:
+                assert message_dict.get('parent_id'), 'Routing: posting a message without model should be with a parent_id (private mesage).'
+            _warn('posting a message without model should be with a parent_id (private mesage), skipping')
+            return ()
+
+        # Existing Document: check if exists; if not, fallback on create if allowed
+        if thread_id and not model_pool.exists(cr, uid, thread_id):
+            if create_fallback:
+                _warn('reply to missing document (%s,%s), fall back on new document creation' % (model, thread_id))
+                thread_id = None
+            elif assert_model:
+                assert model_pool.exists(cr, uid, thread_id), 'Routing: reply to missing document (%s,%s)' % (model, thread_id)
+            else:
+                _warn('reply to missing document (%s,%s), skipping' % (model, thread_id))
+                return ()
+
+        # Existing Document: check model accepts the mailgateway
+        if thread_id and model and not hasattr(model_pool, 'message_update'):
+            if create_fallback:
+                _warn('model %s does not accept document update, fall back on document creation' % model)
+                thread_id = None
+            elif assert_model:
+                assert hasattr(model_pool, 'message_update'), 'Routing: model %s does not accept document update, crashing' % model
+            else:
+                _warn('model %s does not accept document update, skipping' % model)
+                return ()
+
+        # New Document: check model accepts the mailgateway
+        if not thread_id and model and not hasattr(model_pool, 'message_new'):
+            if assert_model:
+                assert hasattr(model_pool, 'message_new'), 'Model %s does not accept document creation, crashing' % model
+            _warn('model %s does not accept document creation, skipping' % model)
+            return ()
+
+        # Update message author if asked
+        # We do it now because we need it for aliases (contact settings)
+        if not author_id and update_author:
+            author_ids = self._find_partner_from_emails(cr, uid, thread_id, [email_from], model=model, context=context)
+            if author_ids:
+                author_id = author_ids[0]
+                message_dict['author_id'] = author_id
+
+        # Alias: check alias_contact settings
+        if alias and alias.alias_contact == 'followers' and (thread_id or alias.alias_parent_thread_id):
+            if thread_id:
+                obj = self.pool[model].browse(cr, uid, thread_id, context=context)
+            else:
+                obj = self.pool[alias.alias_parent_model_id.model].browse(cr, uid, alias.alias_parent_thread_id, context=context)
+            if not author_id or not author_id in [fol.id for fol in obj.message_follower_ids]:
+                _warn('alias %s restricted to internal followers, skipping' % alias.alias_name)
+                _create_bounce_email()
+                return ()
+        elif alias and alias.alias_contact == 'partners' and not author_id:
+            _warn('alias %s does not accept unknown author, skipping' % alias.alias_name)
+            _create_bounce_email()
+            return ()
+
+        return (model, thread_id, route[2], route[3], route[4])
+
+    def message_route(self, cr, uid, message, message_dict, model=None, thread_id=None,
                       custom_values=None, context=None):
         """Attempt to figure out the correct target model, thread_id,
         custom_values and user_id to use for an incoming message.
@@ -606,6 +763,7 @@ class mail_thread(osv.AbstractModel):
              4. If all the above fails, raise an exception.
 
            :param string message: an email.message instance
+           :param dict message_dict: dictionary holding message variables
            :param string model: the fallback model to use if the message
                does not match any of the currently configured mail aliases
                (may be None if a matching alias is supposed to be present)
@@ -616,9 +774,12 @@ class mail_thread(osv.AbstractModel):
            :param int thread_id: optional ID of the record/thread from ``model``
                to which this mail should be attached. Only used if the message
                does not reply to an existing thread and does not match any mail alias.
-           :return: list of [model, thread_id, custom_values, user_id]
+           :return: list of [model, thread_id, custom_values, user_id, alias]
         """
         assert isinstance(message, Message), 'message must be an email.message.Message at this point'
+        fallback_model = model
+
+        # Get email.message.Message variables for future processing
         message_id = message.get('Message-Id')
         email_from = decode_header(message, 'From')
         email_to = decode_header(message, 'To')
@@ -628,30 +789,35 @@ class mail_thread(osv.AbstractModel):
         # 1. Verify if this is a reply to an existing thread
         thread_references = references or in_reply_to
         ref_match = thread_references and tools.reference_re.search(thread_references)
-
         if ref_match:
             thread_id = int(ref_match.group(1))
-            model = ref_match.group(2) or model
+            model = ref_match.group(2) or fallback_model
             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)]
+                    route = self.message_route_verify(cr, uid, message, message_dict,
+                                    (model, thread_id, custom_values, uid, None),
+                                    update_author=True, assert_model=True, create_fallback=True, context=context)
+                    return route and [route] or []
 
-        # Verify whether this is a reply to a private message
+        # 2. Reply to a private message
         if in_reply_to:
-            message_ids = self.pool.get('mail.message').search(cr, uid, [
+            mail_message_ids = self.pool.get('mail.message').search(cr, uid, [
                                 ('message_id', '=', in_reply_to),
                                 '!', ('message_id', 'ilike', 'reply_to')
                             ], limit=1, context=context)
-            if message_ids:
-                message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
+            if mail_message_ids:
+                mail_message = self.pool.get('mail.message').browse(cr, uid, mail_message_ids[0], context=context)
                 _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
-                                email_from, email_to, message_id, message.id, custom_values, uid)
-                return [(message.model, message.res_id, custom_values, uid)]
+                                email_from, email_to, message_id, mail_message.id, custom_values, uid)
+                route = self.message_route_verify(cr, uid, message, message_dict,
+                                (mail_message.model, mail_message.res_id, custom_values, uid, None),
+                                update_author=True, assert_model=True, create_fallback=True, context=context)
+                return route and [route] or []
 
-        # 2. Look for a matching mail.alias entry
+        # 3. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
         # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
         rcpt_tos = \
@@ -676,14 +842,16 @@ class mail_thread(osv.AbstractModel):
                         # user_id = self._message_find_user_id(cr, uid, message, context=context)
                         user_id = uid
                         _logger.info('No matching user_id for the alias %s', alias.alias_name)
-                    routes.append((alias.alias_model_id.model, alias.alias_force_thread_id, \
-                                   eval(alias.alias_defaults), user_id))
-                _logger.info('Routing mail from %s to %s with Message-Id %s: direct alias match: %r',
-                                email_from, email_to, message_id, routes)
+                    route = (alias.alias_model_id.model, alias.alias_force_thread_id, eval(alias.alias_defaults), user_id, alias)
+                    _logger.info('Routing mail from %s to %s with Message-Id %s: direct alias match: %r',
+                                email_from, email_to, message_id, route)
+                    route = self.message_route_verify(cr, uid, message, message_dict, route,
+                                update_author=True, assert_model=True, create_fallback=True, context=context)
+                    if route:
+                        routes.append(route)
                 return routes
 
-        # 3. Fallback to the provided parameters, if they work
-        model_pool = self.pool.get(model)
+        # 4. Fallback to the provided parameters, if they work
         if not thread_id:
             # Legacy: fallback to matching [ID] in the Subject
             match = tools.res_re.search(decode_header(message, 'Subject'))
@@ -693,16 +861,18 @@ class mail_thread(osv.AbstractModel):
                 thread_id = int(thread_id)
             except:
                 thread_id = False
-        assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
+        _logger.info('Routing mail from %s to %s with Message-Id %s: fallback to model:%s, thread_id:%s, custom_values:%s, uid:%s',
+                    email_from, email_to, message_id, fallback_model, thread_id, custom_values, uid)
+        route = self.message_route_verify(cr, uid, message, message_dict,
+                        (fallback_model, thread_id, custom_values, uid, None),
+                        update_author=True, assert_model=True, context=context)
+        if route:
+            return [route]
+
+        # AssertionError if no routes found and if no bounce occured
+        assert False, \
             "No possible route found for incoming message from %s to %s (Message-Id %s:)." \
             "Create an appropriate mail.alias or force the destination model." % (email_from, email_to, message_id)
-        if thread_id and not model_pool.exists(cr, uid, thread_id):
-            _logger.warning('Received mail reply to missing document %s! Ignoring and creating new document instead for Message-Id %s',
-                                thread_id, message_id)
-            thread_id = None
-        _logger.info('Routing mail from %s to %s with Message-Id %s: fallback 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)]
 
     def message_process(self, cr, uid, model, message, custom_values=None,
                         save_original=False, strip_attachments=False,
@@ -756,25 +926,21 @@ class mail_thread(osv.AbstractModel):
         msg = self.message_parse(cr, uid, msg_txt, save_original=save_original, context=context)
         if strip_attachments:
             msg.pop('attachments', None)
+        # postpone setting msg.partner_ids after message_post, to avoid double notifications
+        partner_ids = msg.pop('partner_ids', [])
         if msg.get('message_id'):   # should always be True as message_parse generate one if missing
             existing_msg_ids = self.pool.get('mail.message').search(cr, SUPERUSER_ID, [
                                                                 ('message_id', '=', msg.get('message_id')),
                                                                 ], context=context)
             if existing_msg_ids:
-                _logger.info('Ignored mail from %s to %s with Message-Id %s:: found duplicated Message-Id during processing',
+                _logger.info('Ignored mail from %s to %s with Message-Id %s: found duplicated Message-Id during processing',
                                 msg.get('from'), msg.get('to'), msg.get('message_id'))
                 return False
 
         # find possible routes for the message
-        routes = self.message_route(cr, uid, msg_txt, model,
-                                    thread_id, custom_values,
-                                    context=context)
-
-        # postpone setting msg.partner_ids after message_post, to avoid double notifications
-        partner_ids = msg.pop('partner_ids', [])
-
+        routes = self.message_route(cr, uid, msg_txt, msg, model, thread_id, custom_values, context=context)
         thread_id = False
-        for model, thread_id, custom_values, user_id in routes:
+        for model, thread_id, custom_values, user_id, alias in routes:
             if self._name == 'mail.thread':
                 context.update({'thread_model': model})
             if model:
@@ -785,15 +951,17 @@ class mail_thread(osv.AbstractModel):
 
                 # disabled subscriptions during message_new/update to avoid having the system user running the
                 # email gateway become a follower of all inbound messages
-                nosub_ctx = dict(context, mail_create_nosubscribe=True)
+                nosub_ctx = dict(context, mail_create_nosubscribe=True, mail_create_nolog=True)
                 if thread_id and hasattr(model_pool, 'message_update'):
                     model_pool.message_update(cr, user_id, [thread_id], msg, context=nosub_ctx)
                 else:
-                    nosub_ctx = dict(nosub_ctx, mail_create_nolog=True)
                     thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=nosub_ctx)
             else:
                 assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
                 model_pool = self.pool.get('mail.thread')
+            if not hasattr(model_pool, 'message_post'):
+                context['thread_model'] = model
+                model_pool = self.pool['mail.thread']
             new_msg_id = model_pool.message_post(cr, uid, [thread_id], context=context, subtype='mail.mt_comment', **msg)
 
             if partner_ids:
@@ -923,7 +1091,6 @@ class mail_thread(osv.AbstractModel):
         """
         msg_dict = {
             'type': 'email',
-            'author_id': False,
         }
         if not isinstance(message, Message):
             if isinstance(message, unicode):
@@ -946,12 +1113,7 @@ class mail_thread(osv.AbstractModel):
         msg_dict['from'] = decode(message.get('from'))
         msg_dict['to'] = decode(message.get('to'))
         msg_dict['cc'] = decode(message.get('cc'))
-
-        if message.get('From'):
-            author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context)
-            if author_ids:
-                msg_dict['author_id'] = author_ids[0]
-            msg_dict['email_from'] = decode(message.get('from'))
+        msg_dict['email_from'] = decode(message.get('from'))
         partner_ids = self._message_find_partners(cr, uid, message, ['To', 'Cc'], context=context)
         msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids]
 
@@ -1005,7 +1167,7 @@ class mail_thread(osv.AbstractModel):
                 partner_id, partner_name<partner_email> or partner_name, reason """
         if email and not partner:
             # get partner info from email
-            partner_info = self.message_get_partner_info_from_emails(cr, uid, [email], context=context, res_id=obj.id)[0]
+            partner_info = self.message_partner_info_from_emails(cr, uid, obj.id, [email], context=context)[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
@@ -1033,53 +1195,76 @@ 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, res_id=None):
-        """ Wrapper with weird order parameter because of 7.0 fix.
+    def _find_partner_from_emails(self, cr, uid, id, emails, model=None, context=None, check_followers=True):
+        """ Utility method to find partners from email addresses. The rules are :
+            1 - check in document (model | self, id) followers
+            2 - try to find a matching partner that is also an user
+            3 - try to find a matching partner
 
-            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:
+            :param list emails: list of email addresses
+            :param string model: model to fetch related record; by default self
+                is used.
+            :param boolean check_followers: check in document followers
+        """
+        partner_obj = self.pool['res.partner']
+        partner_ids = []
+        obj = None
+        if id and (model or self._name != 'mail.thread') and check_followers:
+            if model:
+                obj = self.pool[model].browse(cr, uid, id, context=context)
+            else:
+                obj = self.browse(cr, uid, id, context=context)
+        for contact in emails:
+            partner_id = False
+            email_address = tools.email_split(contact)
+            if not email_address:
+                partner_ids.append(partner_id)
                 continue
-            email_address = m.group(3)
+            email_address = email_address[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)
+                        partner_id = follower.id
+            # second try: check in partners that are also users
+            if not partner_id:
+                ids = partner_obj.search(cr, SUPERUSER_ID, [
+                                                ('email', 'ilike', email_address),
+                                                ('user_ids', '!=', False)
+                                            ], limit=1, context=context)
                 if ids:
-                    partner_info['partner_id'] = ids[0]
+                    partner_id = ids[0]
+            # third try: check in partners
+            if not partner_id:
+                ids = partner_obj.search(cr, SUPERUSER_ID, [
+                                                ('email', 'ilike', email_address)
+                                            ], limit=1, context=context)
+                if ids:
+                    partner_id = ids[0]
+            partner_ids.append(partner_id)
+        return partner_ids
+
+    def message_partner_info_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 """
+        mail_message_obj = self.pool.get('mail.message')
+        partner_ids = self._find_partner_from_emails(cr, uid, id, emails, context=context)
+        result = list()
+        for idx in range(len(emails)):
+            email_address = emails[idx]
+            partner_id = partner_ids[idx]
+            partner_info = {'full_name': email_address, 'partner_id': partner_id}
             result.append(partner_info)
 
             # link mail with this from mail to the new partner id
             if link_mail and partner_info['partner_id']:
                 message_ids = mail_message_obj.search(cr, SUPERUSER_ID, [
                                     '|',
-                                    ('email_from', '=', email),
-                                    ('email_from', 'ilike', '<%s>' % email),
+                                    ('email_from', '=', email_address),
+                                    ('email_from', 'ilike', '<%s>' % email_address),
                                     ('author_id', '=', False)
                                 ], context=context)
                 if message_ids:
@@ -1128,22 +1313,11 @@ class mail_thread(osv.AbstractModel):
         model = False
         if thread_id:
             model = context.get('thread_model', self._name) if self._name == 'mail.thread' else self._name
-            if model != self._name:
+            if model != self._name and hasattr(self.pool[model], 'message_post'):
                 del context['thread_model']
                 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')
-        if email_from and thread_id and type == 'email' and kwargs.get('author_id'):
-            email_list = tools.email_split(email_from)
-            doc = self.browse(cr, uid, thread_id, context=context)
-            if email_list and doc:
-                author_ids = self.pool.get('res.partner').search(cr, uid, [
-                                        ('email', 'ilike', email_list[0]),
-                                        ('id', 'in', [f.id for f in doc.message_follower_ids])
-                                    ], limit=1, context=context)
-                if author_ids:
-                    kwargs['author_id'] = author_ids[0]
+        #0: Find the message's author, because we need it for private discussion
         author_id = kwargs.get('author_id')
         if author_id is None:  # keep False values
             author_id = self.pool.get('mail.message')._get_default_author(cr, uid, context=context)
@@ -1254,28 +1428,13 @@ class mail_thread(osv.AbstractModel):
             self.message_subscribe(cr, uid, [thread_id], [message.author_id.id], context=context)
         return msg_id
 
-    #------------------------------------------------------
-    # Compatibility methods: do not use
-    # TDE TODO: remove me in 8.0
-    #------------------------------------------------------
-
-    def message_create_partners_from_emails(self, cr, uid, emails, context=None):
-        return {'partner_ids': [], 'new_partner_ids': []}
-
-    def message_post_user_api(self, cr, uid, thread_id, body='', parent_id=False,
-                                attachment_ids=None, content_subtype='plaintext',
-                                context=None, **kwargs):
-        return self.message_post(cr, uid, thread_id, body=body, parent_id=parent_id,
-                                    attachment_ids=attachment_ids, content_subtype=content_subtype,
-                                    context=context, **kwargs)
-
     #------------------------------------------------------
     # Followers API
     #------------------------------------------------------
 
-    def message_get_subscription_data(self, cr, uid, ids, context=None):
+    def message_get_subscription_data(self, cr, uid, ids, user_pid=None, context=None):
         """ Wrapper to get subtypes data. """
-        return self._get_subscription_data(cr, uid, ids, None, None, context=context)
+        return self._get_subscription_data(cr, uid, ids, None, None, user_pid=user_pid, context=context)
 
     def message_subscribe_users(self, cr, uid, ids, user_ids=None, subtype_ids=None, context=None):
         """ Wrapper on message_subscribe, using users. If user_ids is not
@@ -1287,7 +1446,10 @@ class mail_thread(osv.AbstractModel):
 
     def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
         """ Add partners to the records followers. """
-        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        mail_followers_obj = self.pool.get('mail.followers')
+        subtype_obj = self.pool.get('mail.message.subtype')
+
+        user_pid = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
         if set(partner_ids) == set([user_pid]):
             try:
                 self.check_access_rights(cr, uid, 'read')
@@ -1296,27 +1458,35 @@ class mail_thread(osv.AbstractModel):
         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)
+        for record in self.browse(cr, SUPERUSER_ID, ids, context=context):
+            existing_pids = set([f.id for f in record.message_follower_ids
+                                            if f.id in partner_ids])
+            new_pids = set(partner_ids) - existing_pids
 
-        # subtype specified: update the subscriptions
-        fol_obj = self.pool.get('mail.followers')
-        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)
+            # subtype_ids specified: update already subscribed partners
+            if subtype_ids and existing_pids:
+                fol_ids = mail_followers_obj.search(cr, SUPERUSER_ID, [
+                                                        ('res_model', '=', self._name),
+                                                        ('res_id', '=', record.id),
+                                                        ('partner_id', 'in', list(existing_pids)),
+                                                    ], context=context)
+                mail_followers_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+            # subtype_ids not specified: do not update already subscribed partner, fetch default subtypes for new partners
+            elif subtype_ids is None:
+                subtype_ids = subtype_obj.search(cr, uid, [
+                                                        ('default', '=', True),
+                                                        '|',
+                                                        ('res_model', '=', self._name),
+                                                        ('res_model', '=', False)
+                                                    ], context=context)
+            # subscribe new followers
+            for new_pid in new_pids:
+                mail_followers_obj.create(cr, SUPERUSER_ID, {
+                                                'res_model': self._name,
+                                                'res_id': record.id,
+                                                'partner_id': new_pid,
+                                                'subtype_ids': [(6, 0, subtype_ids)],
+                                            }, context=context)
 
         return True
 
@@ -1454,4 +1624,33 @@ class mail_thread(osv.AbstractModel):
         ''', (ids, self._name, partner_id))
         return True
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    #------------------------------------------------------
+    # Thread suggestion
+    #------------------------------------------------------
+
+    def get_suggested_thread(self, cr, uid, removed_suggested_threads=None, context=None):
+        """Return a list of suggested threads, sorted by the numbers of followers"""
+        if context is None:
+            context = {}
+
+        # TDE HACK: originally by MAT from portal/mail_mail.py but not working until the inheritance graph bug is not solved in trunk
+        # TDE FIXME: relocate in portal when it won't be necessary to reload the hr.employee model in an additional bridge module
+        if self.pool['res.groups']._all_columns.get('is_portal'):
+            user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
+            if any(group.is_portal for group in user.groups_id):
+                return []
+
+        threads = []
+        if removed_suggested_threads is None:
+            removed_suggested_threads = []
+
+        thread_ids = self.search(cr, uid, [('id', 'not in', removed_suggested_threads), ('message_is_follower', '=', False)], context=context)
+        for thread in self.browse(cr, uid, thread_ids, context=context):
+            data = {
+                'id': thread.id,
+                'popularity': len(thread.message_follower_ids),
+                'name': thread.name,
+                'image_small': thread.image_small
+            }
+            threads.append(data)
+        return sorted(threads, key=lambda x: (x['popularity'], x['id']), reverse=True)[:3]
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index c9c5141d303..7b5e7f299f6 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -17,7 +17,8 @@
                 ],
                 'view_mailbox': True,
                 'view_inbox': True,
-                'read_action': 'read'
+                'read_action': 'read',
+                'show_compose_message': False
             }&quot;"/>
             <field name="help" type="html">
                 <p>
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 8527e60aba0..8da2441f3bc 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from openerp.tools.translate import _
 from openerp.osv import fields, osv
 
@@ -52,21 +53,4 @@ class res_partner_mail(osv.Model):
             self._message_add_suggested_recipient(cr, uid, recipients, partner, partner=partner, reason=_('Partner Profile'))
         return recipients
 
-    def message_post(self, cr, uid, thread_id, **kwargs):
-        """ Override related to res.partner. In case of email message, set it as
-            private:
-            - add the target partner in the message partner_ids
-            - set thread_id as None, because this will trigger the 'private'
-                aspect of the message (model=False, res_id=False)
-        """
-        if isinstance(thread_id, (list, tuple)):
-            thread_id = thread_id[0]
-        if kwargs.get('type') == 'email':
-            partner_ids = kwargs.get('partner_ids', [])
-            if thread_id not in [command[1] for command in partner_ids]:
-                partner_ids.append((4, thread_id))
-            kwargs['partner_ids'] = partner_ids
-            thread_id = False
-        return super(res_partner_mail, self).message_post(cr, uid, thread_id, **kwargs)
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 5545745b235..7bc39c438d1 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -23,11 +23,13 @@ from openerp.osv import fields, osv
 from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
 
+
 class res_users(osv.Model):
     """ Update of res.users class
         - add a preference about sending emails about notifications
         - make a new user follow itself
         - add a welcome message
+        - add suggestion preference
     """
     _name = 'res.users'
     _inherit = ['res.users']
@@ -37,10 +39,11 @@ class res_users(osv.Model):
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
             help="Email address internally associated with this user. Incoming "\
                  "emails will appear in the user's notifications."),
+        'display_groups_suggestions': fields.boolean("Display Groups Suggestions"),
     }
 
     _defaults = {
-        'alias_domain': False,  # always hide alias during creation
+        'display_groups_suggestions': True,
     }
 
     def __init__(self, pool, cr):
@@ -51,34 +54,29 @@ class res_users(osv.Model):
         init_res = super(res_users, self).__init__(pool, cr)
         # duplicate list to avoid modifying the original reference
         self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
-        self.SELF_WRITEABLE_FIELDS.append('notification_email_send')
+        self.SELF_WRITEABLE_FIELDS.extend(['notification_email_send', 'display_groups_suggestions'])
         # duplicate list to avoid modifying the original reference
         self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS)
-        self.SELF_READABLE_FIELDS.extend(['notification_email_send', 'alias_domain', 'alias_name'])
+        self.SELF_READABLE_FIELDS.extend(['notification_email_send', 'alias_domain', 'alias_name', 'display_groups_suggestions'])
         return init_res
 
     def _auto_init(self, cr, context=None):
         """ Installation hook: aliases, partner following themselves """
         # create aliases for all users and avoid constraint errors
-        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
+        return self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
+            self._name, self._columns['alias_id'], 'login', alias_force_key='id', context=context)
 
     def create(self, cr, uid, data, context=None):
-        # create default alias same as the login
         if not data.get('login', False):
             raise osv.except_osv(_('Invalid Action!'), _('You may not create a user. To create new users, you should use the "Settings > Users" menu.'))
+        if context is None:
+            context = {}
 
-        mail_alias = self.pool.get('mail.alias')
-        alias_id = mail_alias.create_unique_alias(cr, uid, {'alias_name': data['login']}, model_name=self._name, context=context)
-        data['alias_id'] = alias_id
-        data.pop('alias_name', None)  # prevent errors during copy()
-
-        # create user
-        user_id = super(res_users, self).create(cr, uid, data, context=context)
+        create_context = dict(context, alias_model_name=self._name, alias_parent_model_name=self._name)
+        user_id = super(res_users, self).create(cr, uid, data, context=create_context)
         user = self.browse(cr, uid, user_id, context=context)
-        # alias
-        mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
+        self.pool.get('mail.alias').write(cr, SUPERUSER_ID, [user.alias_id.id], {"alias_force_thread_id": user_id, "alias_parent_thread_id": user_id}, context)
+
         # create a welcome message
         self._create_welcome_message(cr, uid, user, context=context)
         return user_id
@@ -92,12 +90,6 @@ class res_users(osv.Model):
         return self.pool.get('res.partner').message_post(cr, SUPERUSER_ID, [user.partner_id.id],
             body=body, context=context)
 
-    def write(self, cr, uid, ids, vals, context=None):
-        # User alias is sync'ed with login
-        if vals.get('login'):
-            vals['alias_name'] = vals['login']
-        return super(res_users, self).write(cr, uid, ids, vals, context=context)
-
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the user.
         alias_pool = self.pool.get('mail.alias')
@@ -109,7 +101,7 @@ class res_users(osv.Model):
     def _message_post_get_pid(self, cr, uid, thread_id, context=None):
         assert thread_id, "res.users does not support posting global messages"
         if context and 'thread_model' in context:
-            context['thread_model'] = 'res.partner'
+            context['thread_model'] = 'res.users'
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id[0]
         return self.browse(cr, SUPERUSER_ID, thread_id).partner_id.id
@@ -118,44 +110,32 @@ class res_users(osv.Model):
         """ Redirect the posting of message on res.users to the related partner.
             This is done because when giving the context of Chatter on the
             various mailboxes, we do not have access to the current partner_id. """
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        partner_ids = kwargs.get('partner_ids', [])
         partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
-        return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs)
+        if partner_id not in [command[1] for command in partner_ids]:
+            partner_ids.append(partner_id)
+        kwargs['partner_ids'] = partner_ids
+        return self.pool.get('mail.thread').message_post(cr, uid, False, **kwargs)
 
     def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
-        for id in ids:
-            partner_id = self.browse(cr, SUPERUSER_ID, id).partner_id.id
-            self.pool.get('res.partner').message_update(cr, uid, [partner_id], msg_dict, update_vals=update_vals, context=context)
         return True
 
     def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
-        for id in ids:
-            partner_id = self.browse(cr, SUPERUSER_ID, id).partner_id.id
-            self.pool.get('res.partner').message_subscribe(cr, uid, [partner_id], partner_ids, subtype_ids=subtype_ids, context=context)
         return True
 
     def message_get_partner_info_from_emails(self, cr, uid, emails, link_mail=False, context=None):
-        return self.pool.get('res.partner').message_get_partner_info_from_emails(cr, uid, emails, link_mail=link_mail, context=context)
+        return self.pool.get('mail.thread').message_get_partner_info_from_emails(cr, uid, emails, link_mail=link_mail, context=context)
 
     def message_get_suggested_recipients(self, cr, uid, ids, context=None):
-        partner_ids = []
-        for id in ids:
-            partner_ids.append(self.browse(cr, SUPERUSER_ID, id).partner_id.id)
-        return self.pool.get('res.partner').message_get_suggested_recipients(cr, uid, partner_ids, context=context)
+        return dict.fromkeys(ids, list())
 
-    #------------------------------------------------------
-    # Compatibility methods: do not use
-    # TDE TODO: remove me in 8.0
-    #------------------------------------------------------
-
-    def message_post_user_api(self, cr, uid, thread_id, context=None, **kwargs):
-        """ Redirect the posting of message on res.users to the related partner.
-            This is done because when giving the context of Chatter on the
-            various mailboxes, we do not have access to the current partner_id. """
-        partner_id = self._message_post_get_pid(cr, uid, thread_id, context=context)
-        return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, context=context, **kwargs)
-
-    def message_create_partners_from_emails(self, cr, uid, emails, context=None):
-        return self.pool.get('res.partner').message_create_partners_from_emails(cr, uid, emails, context=context)
+    def stop_showing_groups_suggestions(self, cr, uid, user_id, context=None):
+        """Update display_groups_suggestions value to False"""
+        if context is None:
+            context = {}
+        self.write(cr, uid, user_id, {"display_groups_suggestions": False}, context)
 
 
 class res_users_mail_group(osv.Model):
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 1cacadfc898..2bf54b4bafd 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -22,15 +22,25 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
-            <data>
-                <field name="signature" position="before">
-                    <field name="notification_email_send"/>
-                </field>
-                <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>
-            </data>
+                <data>
+                    <field name="signature" position="before">
+                        <field name="notification_email_send"/>
+                    </field>
+                    <field name="signature" position="before">
+                        <label for="alias_id" string="Messaging Alias" class="oe_read_only"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <field name="alias_id" class="oe_read_only" required="0" nolabel="1"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <label for="alias_name" string="Messaging Alias" class="oe_edit_only"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <div class="oe_edit_only" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                        </div>
+                        <field name="alias_contact" string="Alias Accepts Emails From"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                        <field name="display_groups_suggestions" groups="base.group_no_one"/>
+                    </field>
+                </data>
             </field>
         </record>
 
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index c369e96102b..5384e2aba95 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -14,11 +14,22 @@
         <record id="mail_followers_read_write_own" model="ir.rule">
             <field name="name">mail.followers: read and write its own entries</field>
             <field name="model_id" ref="model_mail_followers"/>
+            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
             <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
             <field name="perm_create" eval="False"/>
             <field name="perm_unlink" eval="False"/>
         </record>
 
+        <!-- If technical rights then read and write others subscriptions -->
+        <record id="mail_followers_read_write_others" model="ir.rule">
+            <field name="name">mail.followers: read and write others entries</field>
+            <field name="model_id" ref="model_mail_followers"/>
+            <field name="groups" eval="[(4, ref('base.group_no_one'))]"/>
+            <field name="domain_force">[]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+
         <record id="mail_notification_read_write_own" model="ir.rule">
             <field name="name">mail.notification: read and write its own entries</field>
             <field name="model_id" ref="model_mail_notification"/>
diff --git a/addons/mail/static/src/img/icon.png b/addons/mail/static/description/icon.png
similarity index 100%
rename from addons/mail/static/src/img/icon.png
rename to addons/mail/static/description/icon.png
diff --git a/addons/mail/html/index.html b/addons/mail/static/description/index.html
similarity index 97%
rename from addons/mail/html/index.html
rename to addons/mail/static/description/index.html
index b564cf3ab1e..aa55e63008d 100644
--- a/addons/mail/html/index.html
+++ b/addons/mail/static/description/index.html
@@ -21,7 +21,7 @@ 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>
+                <a href="http://www.openerp.com/start?app=mail" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/mail/html/mail_illustration.png b/addons/mail/static/description/mail_illustration.png
similarity index 100%
rename from addons/mail/html/mail_illustration.png
rename to addons/mail/static/description/mail_illustration.png
diff --git a/addons/mail/html/mail_sc_00.png b/addons/mail/static/description/mail_sc_00.png
similarity index 100%
rename from addons/mail/html/mail_sc_00.png
rename to addons/mail/static/description/mail_sc_00.png
diff --git a/addons/mail/html/mail_sc_01.png b/addons/mail/static/description/mail_sc_01.png
similarity index 100%
rename from addons/mail/html/mail_sc_01.png
rename to addons/mail/static/description/mail_sc_01.png
diff --git a/addons/mail/html/mail_sc_02.png b/addons/mail/static/description/mail_sc_02.png
similarity index 100%
rename from addons/mail/html/mail_sc_02.png
rename to addons/mail/static/description/mail_sc_02.png
diff --git a/addons/mail/html/mail_sc_03.png b/addons/mail/static/description/mail_sc_03.png
similarity index 100%
rename from addons/mail/html/mail_sc_03.png
rename to addons/mail/static/description/mail_sc_03.png
diff --git a/addons/mail/html/mail_sc_04.png b/addons/mail/static/description/mail_sc_04.png
similarity index 100%
rename from addons/mail/html/mail_sc_04.png
rename to addons/mail/static/description/mail_sc_04.png
diff --git a/addons/mail/html/mail_sc_05.png b/addons/mail/static/description/mail_sc_05.png
similarity index 100%
rename from addons/mail/html/mail_sc_05.png
rename to addons/mail/static/description/mail_sc_05.png
diff --git a/addons/mail/html/mail_sc_06.png b/addons/mail/static/description/mail_sc_06.png
similarity index 100%
rename from addons/mail/html/mail_sc_06.png
rename to addons/mail/static/description/mail_sc_06.png
diff --git a/addons/mail/html/mail_sc_07.png b/addons/mail/static/description/mail_sc_07.png
similarity index 100%
rename from addons/mail/html/mail_sc_07.png
rename to addons/mail/static/description/mail_sc_07.png
diff --git a/addons/mail/html/photo.png b/addons/mail/static/description/photo.png
similarity index 100%
rename from addons/mail/html/photo.png
rename to addons/mail/static/description/photo.png
diff --git a/addons/mail/static/lib/jquery.expander/jquery.expander.js b/addons/mail/static/lib/jquery.expander/jquery.expander.js
deleted file mode 100644
index 91cc03db918..00000000000
--- a/addons/mail/static/lib/jquery.expander/jquery.expander.js
+++ /dev/null
@@ -1,385 +0,0 @@
-/*!
- * jQuery Expander Plugin v1.4.2
- *
- * Date: Fri Mar 16 14:29:56 2012 EDT
- * Requires: jQuery v1.3+
- *
- * Copyright 2011, Karl Swedberg
- * Dual licensed under the MIT and GPL licenses (just like jQuery):
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- *
- *
- *
-*/
-
-(function($) {
-  $.expander = {
-    version: '1.4.2',
-    defaults: {
-      // the number of characters at which the contents will be sliced into two parts.
-      slicePoint: 100,
-
-      // whether to keep the last word of the summary whole (true) or let it slice in the middle of a word (false)
-      preserveWords: true,
-
-      // a threshold of sorts for whether to initially hide/collapse part of the element's contents.
-      // If after slicing the contents in two there are fewer words in the second part than
-      // the value set by widow, we won't bother hiding/collapsing anything.
-      widow: 4,
-
-      // text displayed in a link instead of the hidden part of the element.
-      // clicking this will expand/show the hidden/collapsed text
-      expandText: 'read more',
-      expandPrefix: '&hellip; ',
-
-      expandAfterSummary: false,
-
-      // class names for summary element and detail element
-      summaryClass: 'summary',
-      detailClass: 'details',
-
-      // class names for <span> around "read-more" link and "read-less" link
-      moreClass: 'read-more',
-      lessClass: 'read-less',
-
-      // number of milliseconds after text has been expanded at which to collapse the text again.
-      // when 0, no auto-collapsing
-      collapseTimer: 0,
-
-      // effects for expanding and collapsing
-      expandEffect: 'fadeIn',
-      expandSpeed: 250,
-      collapseEffect: 'fadeOut',
-      collapseSpeed: 200,
-
-      // allow the user to re-collapse the expanded text.
-      userCollapse: true,
-
-      // text to use for the link to re-collapse the text
-      userCollapseText: 'read less',
-      userCollapsePrefix: ' ',
-
-
-      // all callback functions have the this keyword mapped to the element in the jQuery set when .expander() is called
-
-      onSlice: null, // function() {}
-      beforeExpand: null, // function() {},
-      afterExpand: null, // function() {},
-      onCollapse: null // function(byUser) {}
-    }
-  };
-
-  $.fn.expander = function(options) {
-    var meth = 'init';
-
-    if (typeof options == 'string') {
-      meth = options;
-      options = {};
-    }
-
-    var opts = $.extend({}, $.expander.defaults, options),
-        rSelfClose = /^<(?:area|br|col|embed|hr|img|input|link|meta|param).*>$/i,
-        rAmpWordEnd = opts.wordEnd || /(&(?:[^;]+;)?|[a-zA-Z\u00C0-\u0100]+)$/,
-        rOpenCloseTag = /<\/?(\w+)[^>]*>/g,
-        rOpenTag = /<(\w+)[^>]*>/g,
-        rCloseTag = /<\/(\w+)>/g,
-        rLastCloseTag = /(<\/[^>]+>)\s*$/,
-        rTagPlus = /^<[^>]+>.?/,
-        delayedCollapse;
-
-    var methods = {
-      init: function() {
-        this.each(function() {
-          var i, l, tmp, newChar, summTagless, summOpens, summCloses,
-              lastCloseTag, detailText, detailTagless,
-              $thisDetails, $readMore,
-              openTagsForDetails = [],
-              closeTagsForsummaryText = [],
-              defined = {},
-              thisEl = this,
-              $this = $(this),
-              $summEl = $([]),
-              o = $.meta ? $.extend({}, opts, $this.data()) : opts,
-              hasDetails = !!$this.find('.' + o.detailClass).length,
-              hasBlocks = !!$this.find('*').filter(function() {
-                var display = $(this).css('display');
-                return (/^block|table|list/).test(display);
-              }).length,
-              el = hasBlocks ? 'div' : 'span',
-              detailSelector = el + '.' + o.detailClass,
-              moreSelector = 'span.' + o.moreClass,
-              expandSpeed = o.expandSpeed || 0,
-              allHtml = $.trim( $this.html() ),
-              allText = $.trim( $this.text() ),
-              summaryText = allHtml.slice(0, o.slicePoint);
-
-          // bail out if we've already set up the expander on this element
-          if ( $.data(this, 'expander') ) {
-            return;
-          }
-
-          $.data(this, 'expander', true);
-
-          // determine which callback functions are defined
-          $.each(['onSlice','beforeExpand', 'afterExpand', 'onCollapse'], function(index, val) {
-            defined[val] = $.isFunction(o[val]);
-          });
-
-          // back up if we're in the middle of a tag or word
-          summaryText = backup(summaryText);
-
-          // summary text sans tags length
-          summTagless = summaryText.replace(rOpenCloseTag, '').length;
-
-          // add more characters to the summary, one for each character in the tags
-          while (summTagless < o.slicePoint) {
-            newChar = allHtml.charAt(summaryText.length);
-            if (newChar == '<') {
-              newChar = allHtml.slice(summaryText.length).match(rTagPlus)[0];
-            }
-            summaryText += newChar;
-            summTagless++;
-          }
-
-          summaryText = backup(summaryText, o.preserveWords);
-
-          // separate open tags from close tags and clean up the lists
-          summOpens = summaryText.match(rOpenTag) || [];
-          summCloses = summaryText.match(rCloseTag) || [];
-
-          // filter out self-closing tags
-          tmp = [];
-          $.each(summOpens, function(index, val) {
-            if ( !rSelfClose.test(val) ) {
-              tmp.push(val);
-            }
-          });
-          summOpens = tmp;
-
-          // strip close tags to just the tag name
-          l = summCloses.length;
-          for (i = 0; i < l; i++) {
-            summCloses[i] = summCloses[i].replace(rCloseTag, '$1');
-          }
-
-          // tags that start in summary and end in detail need:
-          // a). close tag at end of summary
-          // b). open tag at beginning of detail
-          $.each(summOpens, function(index, val) {
-            var thisTagName = val.replace(rOpenTag, '$1');
-            var closePosition = $.inArray(thisTagName, summCloses);
-            if (closePosition === -1) {
-              openTagsForDetails.push(val);
-              closeTagsForsummaryText.push('</' + thisTagName + '>');
-
-            } else {
-              summCloses.splice(closePosition, 1);
-            }
-          });
-
-          // reverse the order of the close tags for the summary so they line up right
-          closeTagsForsummaryText.reverse();
-
-          // create necessary summary and detail elements if they don't already exist
-          if ( !hasDetails ) {
-
-            // end script if there is no detail text or if detail has fewer words than widow option
-            detailText = allHtml.slice(summaryText.length);
-            detailTagless = $.trim( detailText.replace(rOpenCloseTag, '') );
-
-            if ( detailTagless === '' || detailTagless.split(/\s+/).length < o.widow ) {
-              return;
-            }
-            // otherwise, continue...
-            lastCloseTag = closeTagsForsummaryText.pop() || '';
-            summaryText += closeTagsForsummaryText.join('');
-            detailText = openTagsForDetails.join('') + detailText;
-
-          } else {
-            // assume that even if there are details, we still need readMore/readLess/summary elements
-            // (we already bailed out earlier when readMore el was found)
-            // but we need to create els differently
-
-            // remove the detail from the rest of the content
-            detailText = $this.find(detailSelector).remove().html();
-
-            // The summary is what's left
-            summaryText = $this.html();
-
-            // allHtml is the summary and detail combined (this is needed when content has block-level elements)
-            allHtml = summaryText + detailText;
-
-            lastCloseTag = '';
-          }
-          o.moreLabel = $this.find(moreSelector).length ? '' : buildMoreLabel(o);
-
-          if (hasBlocks) {
-            detailText = allHtml;
-          }
-          summaryText += lastCloseTag;
-
-          // onSlice callback
-          o.summary = summaryText;
-          o.details = detailText;
-          o.lastCloseTag = lastCloseTag;
-
-          if (defined.onSlice) {
-            // user can choose to return a modified options object
-            // one last chance for user to change the options. sneaky, huh?
-            // but could be tricky so use at your own risk.
-            tmp = o.onSlice.call(thisEl, o);
-
-          // so, if the returned value from the onSlice function is an object with a details property, we'll use that!
-            o = tmp && tmp.details ? tmp : o;
-          }
-
-          // build the html with summary and detail and use it to replace old contents
-          var html = buildHTML(o, hasBlocks);
-
-          $this.html( html );
-
-          // set up details and summary for expanding/collapsing
-          $thisDetails = $this.find(detailSelector);
-          $readMore = $this.find(moreSelector);
-          $thisDetails.hide();
-          $readMore.find('a').unbind('click.expander').bind('click.expander', expand);
-
-          $summEl = $this.find('div.' + o.summaryClass);
-
-          if ( o.userCollapse && !$this.find('span.' + o.lessClass).length ) {
-            $this
-            .find(detailSelector)
-            .append('<span class="' + o.lessClass + '">' + o.userCollapsePrefix + '<a href="#">' + o.userCollapseText + '</a></span>');
-          }
-
-          $this
-          .find('span.' + o.lessClass + ' a')
-          .unbind('click.expander')
-          .bind('click.expander', function(event) {
-            event.preventDefault();
-            clearTimeout(delayedCollapse);
-            var $detailsCollapsed = $(this).closest(detailSelector);
-            reCollapse(o, $detailsCollapsed);
-            if (defined.onCollapse) {
-              o.onCollapse.call(thisEl, true);
-            }
-          });
-
-          function expand(event) {
-            event.preventDefault();
-            $readMore.hide();
-            $summEl.hide();
-            if (defined.beforeExpand) {
-              o.beforeExpand.call(thisEl);
-            }
-
-            $thisDetails.stop(false, true)[o.expandEffect](expandSpeed, function() {
-              $thisDetails.css({zoom: ''});
-              if (defined.afterExpand) {o.afterExpand.call(thisEl);}
-              delayCollapse(o, $thisDetails, thisEl);
-            });
-          }
-
-        }); // this.each
-      },
-      destroy: function() {
-        if ( !this.data('expander') ) {
-          return;
-        }
-        this.removeData('expander');
-        this.each(function() {
-          var $this = $(this),
-              o = $.meta ? $.extend({}, opts, $this.data()) : opts,
-              details = $this.find('.' + o.detailClass).contents();
-
-          $this.find('.' + o.moreClass).remove();
-          $this.find('.' + o.summaryClass).remove();
-          $this.find('.' + o.detailClass).after(details).remove();
-          $this.find('.' + o.lessClass).remove();
-
-        });
-      }
-    };
-
-    // run the methods (almost always "init")
-    if ( methods[meth] ) {
-      methods[ meth ].call(this);
-    }
-
-    // utility functions
-    function buildHTML(o, blocks) {
-      var el = 'span',
-          summary = o.summary;
-      if ( blocks ) {
-        el = 'div';
-        // if summary ends with a close tag, tuck the moreLabel inside it
-        if ( rLastCloseTag.test(summary) && !o.expandAfterSummary) {
-          summary = summary.replace(rLastCloseTag, o.moreLabel + '$1');
-        } else {
-        // otherwise (e.g. if ends with self-closing tag) just add moreLabel after summary
-        // fixes #19
-          summary += o.moreLabel;
-        }
-
-        // and wrap it in a div
-        summary = '<div class="' + o.summaryClass + '">' + summary + '</div>';
-      } else {
-        summary += o.moreLabel;
-      }
-
-      return [
-        summary,
-        '<',
-          el + ' class="' + o.detailClass + '"',
-        '>',
-          o.details,
-        '</' + el + '>'
-        ].join('');
-    }
-
-    function buildMoreLabel(o) {
-      var ret = '<span class="' + o.moreClass + '">' + o.expandPrefix;
-      ret += '<a href="#">' + o.expandText + '</a></span>';
-      return ret;
-    }
-
-    function backup(txt, preserveWords) {
-      if ( txt.lastIndexOf('<') > txt.lastIndexOf('>') ) {
-        txt = txt.slice( 0, txt.lastIndexOf('<') );
-      }
-      if (preserveWords) {
-        txt = txt.replace(rAmpWordEnd,'');
-      }
-
-      return $.trim(txt);
-    }
-
-    function reCollapse(o, el) {
-      el.stop(true, true)[o.collapseEffect](o.collapseSpeed, function() {
-        var prevMore = el.prev('span.' + o.moreClass).show();
-        if (!prevMore.length) {
-          el.parent().children('div.' + o.summaryClass).show()
-            .find('span.' + o.moreClass).show();
-        }
-      });
-    }
-
-    function delayCollapse(option, $collapseEl, thisEl) {
-      if (option.collapseTimer) {
-        delayedCollapse = setTimeout(function() {
-          reCollapse(option, $collapseEl);
-          if ( $.isFunction(option.onCollapse) ) {
-            option.onCollapse.call(thisEl, false);
-          }
-        }, option.collapseTimer);
-      }
-    }
-
-    return this;
-  };
-
-  // plugin defaults
-  $.fn.expander.defaults = $.expander.defaults;
-})(jQuery);
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 958c2bccd5f..a4beca607ba 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -22,10 +22,20 @@
     width: 32px;
     height: 32px;
     padding: 0px;
-    margin: 0px
+    margin: 0px;
     border-radius: 0px;
 }
 
+/* ---- GENERIC FOR MAIL-RELATED STUFF ---- */
+.openerp .oe_e.oe_e_alias {
+  font-size: 30px;
+  line-height: 15px;
+  vertical-align: top;
+  margin-right: 3px;
+  color: white;
+  text-shadow: 0px 0px 2px black;
+}
+
 /* ------------ MAIL WIDGET --------------- */
 .openerp .oe_mail, .openerp .oe_mail *{
     -webkit-box-sizing: border-box;
@@ -108,6 +118,9 @@
     text-overflow:ellipsis;
     word-wrap: break-word;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body .oe_mail_cleaned {
+    display: none;
+}
 
 /* a) Indented Messages */
 
@@ -622,11 +635,10 @@
 }
 .openerp .oe_followers .oe_partner {
     height: 32px;
-    margin-right: 8px;
+    margin-right: 24px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    margin-right: 10px;
 }
 .openerp .oe_followers .oe_partner img{
     width: 32px;
@@ -639,7 +651,18 @@
     right: 0px;
     line-height: 20px;
 }
-
+.openerp .oe_followers .oe_edit_subtype{
+    cursor: pointer;
+    position: absolute;
+    right: 12px;
+    line-height: 20px;
+}
+.openerp .oe_followers .oe_partner .oe_hidden{
+    display: none;
+}
+.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title{
+    padding-right: 20px;
+}
 .openerp .oe_followers .oe_show_more{
     cursor: pointer;
 }
@@ -665,8 +688,72 @@
 .openerp .oe_mail_wall .oe_mail{
     margin: 16px;
     width: 600px;
+    display: inline-block;
 }
 
 .openerp .oe_mail .oe_view_nocontent > p {
     padding-left: 15px;
 }
+
+
+/* ------------- WALL SIDEBAR ------------- */
+
+.openerp .oe_mail_wall .oe_mail_wall_aside {
+    margin: 16px;
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+    width: 260px;
+}
+.openerp .oe_mail_wall_aside .oe_sidebar_suggestion {
+    background-color: #EDEDF6;
+    border-radius: 2px;
+    padding-top: 1px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_title h2 {
+    font-size: 14px;
+    font-weight: bold;
+    margin-left: 10px;
+    padding: 0px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item {
+    border-radius: 2px;
+    width: 100%;
+    margin-left: 10px;
+    min-height: 67px;  /* image_small 66x66px */
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image {
+    float: left;
+    padding-right: 10px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_image img {
+    border-radius: 2px;
+    border: solid 1px rgba(0,0,0,0.03);
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content button {
+    margin-top: 10px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_item_name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    width: 90%;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_title a.oe_suggestion_remove {
+    line-height: 15px;
+    margin-top: -2px;
+    float: right;
+    visibility: hidden;
+    margin-right: 7px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_items .oe_suggested_item_content a.oe_suggestion_remove_item {
+    line-height: 15px;
+    margin-top: -2px;
+    float: right;
+    visibility: hidden;
+    margin-right: 16px;
+}
+.openerp .oe_sidebar_suggestion .oe_suggest_title:hover a.oe_suggestion_remove,
+.openerp .oe_sidebar_suggestion .oe_suggest_items:hover a.oe_suggestion_remove_item {
+    visibility: visible;
+}
+
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 5ba817aa1a5..39cdf5c0b4c 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -48,7 +48,6 @@
   text-align: center;
   overflow: hidden;
   -moz-border-radius: 3px;
-  border-collapse: separate;
   -webkit-border-radius: 3px;
   -o-border-radius: 3px;
   -ms-border-radius: 3px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7df6cdbef0d..62e9241cf4f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -2,10 +2,10 @@ openerp.mail = function (session) {
     var _t = session.web._t,
        _lt = session.web._lt;
 
-    var mail = session.mail = {};
+    var mail = session.mail;
 
-    openerp_mail_followers(session, mail);        // import mail_followers.js
-    openerp_FieldMany2ManyTagsEmail(session);      // import manyy2many_tags_email.js
+    openerp_mail_followers(session, mail);          // import mail_followers.js
+    openerp_FieldMany2ManyTagsEmail(session);       // import manyy2many_tags_email.js
 
     /**
      * ------------------------------------------------------------
@@ -225,6 +225,7 @@ openerp.mail = function (session) {
             this.name = datasets.name ||  false,
             this.record_name = datasets.record_name ||  false,
             this.body = datasets.body || '',
+            this.body_short = datasets.body_short || '',
             this.vote_nb = datasets.vote_nb || 0,
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,
@@ -237,8 +238,15 @@ openerp.mail = function (session) {
 
             this.format_data();
 
+            // update record_name: Partner profile
+            if (this.model == 'res.partner') {
+                this.record_name = 'Partner Profile of ' + this.record_name;
+            }
+            else if (this.model == 'hr.employee') {
+                this.record_name = 'News from ' + this.record_name;
+            }
             // record options and data
-            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level && this.model != 'res.partner';
+            this.show_record_name = this.options.show_record_name && this.record_name && !this.thread_level;
             this.options.show_read = false;
             this.options.show_unread = false;
             if (this.options.show_read_unread_button) {
@@ -257,8 +265,10 @@ openerp.mail = function (session) {
 
         /* Convert date, timerelative and avatar in displayable data. */
         format_data: function () {
+
             //formating and add some fields for render
             this.date = this.date ? session.web.str_to_datetime(this.date) : false;
+            this.display_date = this.date.toString('ddd MMM dd yyyy HH:mm');
             if (this.date && new Date().getTime()-this.date.getTime() < 7*24*60*60*1000) {
                 this.timerelative = $.timeago(this.date);
             }
@@ -623,10 +633,7 @@ 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) {
-                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);
+                find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [this.context.default_res_id, names_to_find]);
             }
             else {
                 find_done.resolve([]);
@@ -672,11 +679,7 @@ 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) {
-                        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);
+                        find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [self.context.default_res_id, new_names_to_find, true]);
                     }
                     else {
                         find_done.resolve([]);
@@ -745,7 +748,7 @@ openerp.mail = function (session) {
                 }
                 // create object and attach to the thread object
                 thread.message_fetch([["id", "=", message_id]], false, [message_id], function (arg, data) {
-                    var message = thread.create_message_object( data[0] );
+                    var message = thread.create_message_object( data.slice(-1)[0] );
                     // insert the message on dom
                     thread.insert_message( message, root ? undefined : self.$el, root );
                 });
@@ -942,7 +945,6 @@ openerp.mail = function (session) {
         
         start: function () {
             this._super.apply(this, arguments);
-            this.expender();
             this.bind_events();
             if(this.thread_level < this.options.display_indented_thread) {
                 this.create_thread();
@@ -965,6 +967,26 @@ openerp.mail = function (session) {
             this.$('.oe_reply').on('click', this.on_message_reply);
             this.$('.oe_star').on('click', this.on_star);
             this.$('.oe_msg_vote').on('click', this.on_vote);
+            this.$('.oe_mail_expand').on('click', this.on_expand);
+            this.$('.oe_mail_reduce').on('click', this.on_expand);
+            this.$('.oe_mail_action_model').on('click', this.on_record_clicked);
+        },
+
+        on_record_clicked: function  (event) {
+            event.stopPropagation();
+            var state = {
+                'model': this.model,
+                'id': this.res_id,
+                'title': this.record_name
+            };
+            session.webclient.action_manager.do_push_state(state);
+            this.do_action({
+                res_model: state.model,
+                res_id: state.id,
+                type: 'ir.actions.act_window',
+                views: [[false, 'form']]
+            });
+            return false;
         },
 
         /* Call the on_compose_message on the thread of this message. */
@@ -975,15 +997,11 @@ openerp.mail = function (session) {
             return false;
         },
 
-        expender: function () {
-            this.$('.oe_msg_body:first').expander({
-                slicePoint: this.options.truncate_limit,
-                expandText: 'read more',
-                userCollapseText: 'read less',
-                detailClass: 'oe_msg_tail',
-                moreClass: 'oe_mail_expand',
-                lessClass: 'oe_mail_reduce',
-                });
+        on_expand: function (event) {
+            event.stopPropagation();
+            this.$('.oe_msg_body_short:first').toggle();
+            this.$('.oe_msg_body_long:first').toggle();
+            return false;
         },
 
         /**
@@ -1840,6 +1858,19 @@ openerp.mail = function (session) {
     });
 
 
+    /**
+     * ------------------------------------------------------------
+     * Aside Widget
+     * ------------------------------------------------------------
+     * 
+     * This widget handles the display of a sidebar on the Wall. Its main use
+     * is to display group and employees suggestion (if hr is installed).
+     */
+    mail.WallSidebar = session.web.Widget.extend({
+        template: 'mail.wall.sidebar',
+    });
+
+
     /**
      * ------------------------------------------------------------
      * Wall Widget
@@ -1901,6 +1932,9 @@ openerp.mail = function (session) {
             if (! this.searchview.has_defaults) {
                 this.message_render();
             }
+            // render sidebar
+            var wall_sidebar = new mail.WallSidebar(this);
+            wall_sidebar.appendTo(this.$el.find('.oe_mail_wall_aside'));
         },
 
         /**
@@ -2018,4 +2052,16 @@ openerp.mail = function (session) {
             });
         },
     });
+
+
+    /**
+     * ------------------------------------------------------------
+     * Sub-widgets loading
+     * ------------------------------------------------------------
+     * 
+     * Load here widgets that could depend on widgets defined in mail.js
+     */
+
+    openerp.mail.suggestions(session, mail);        // import suggestion.js (suggestion widget)
+
 };
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index f812844194b..a0dad1fcdbc 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -29,7 +29,6 @@ openerp_mail_followers = function(session, mail) {
             this.displayed_limit = this.node.attrs.displayed_nb || 10;
             this.displayed_nb = this.displayed_limit;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
-            this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
             this.ds_users = new session.web.DataSetSearch(this, 'res.users');
 
             this.value = [];
@@ -74,10 +73,33 @@ openerp_mail_followers = function(session, mail) {
             this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription);
             // event: click on 'invite' button, that opens the invite wizard
             this.$('.oe_invite').on('click', self.on_invite_follower);
+            // event: click on 'edit_subtype(pencil)' button to edit subscription
+            this.$el.on('click', '.oe_edit_subtype', self.on_edit_subtype);
             this.$el.on('click', '.oe_remove_follower', self.on_remove_follower);
             this.$el.on('click', '.oe_show_more', self.on_show_more_followers)
         },
 
+        on_edit_subtype: function(event) {
+            var self = this;
+            var $currentTarget = $(event.currentTarget);
+            var user_pid = $currentTarget.data('id');
+            $('div.oe_edit_actions').remove();
+            self.$dialog = new session.web.dialog($('<div class="oe_edit_actions">'), {
+                            modal: true,
+                            width: 'auto',
+                            height: 'auto',
+                            title: _t('Edit Subscription of ') + $currentTarget.siblings('a').text(),
+                            buttons: [
+                                    { text: _t("Apply"), click: function() { 
+                                        self.do_update_subscription(event, user_pid);
+                                        $(this).dialog("close");
+                                    }},
+                                    { text: _t("Cancel"), click: function() { $(this).dialog("close"); }}
+                                ],
+                    });
+            return self.fetch_subtypes(user_pid);
+        },
+
         on_invite_follower: function (event) {
             var self = this;
             var action = {
@@ -130,7 +152,7 @@ openerp_mail_followers = function(session, mail) {
 
         fetch_followers: function (value_) {
             this.value = value_ || {};
-            return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
+            return this.ds_model.call('read_followers_data', [this.value])
                 .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
                 .then(this.proxy('display_buttons'))
                 .then(this.proxy('fetch_subtypes'));
@@ -147,6 +169,7 @@ openerp_mail_followers = function(session, mail) {
                 self.message_is_follower = (_.indexOf(self.value, pid) != -1);
             }).then(self.proxy('display_generic'));
         },
+
         _format_followers: function(count){
             var str = '';
             if(count <= 0){
@@ -158,6 +181,7 @@ openerp_mail_followers = function(session, mail) {
             }
             return str;
         },
+
         /* Display generic info about follower, for people not having access to res_partner */
         display_generic: function () {
             var self = this;
@@ -168,16 +192,32 @@ openerp_mail_followers = function(session, mail) {
         /** Display the followers */
         display_followers: function (records) {
             var self = this;
+            this.message_is_follower = false;
             this.followers = records || this.followers;
-            this.message_is_follower = this.set_is_follower(this.followers);
             // clean and display title
             var node_user_list = this.$('.oe_follower_list').empty();
             this.$('.oe_follower_title').html(this._format_followers(this.followers.length));
             // truncate number of displayed followers
             var truncated = this.followers.slice(0, this.displayed_nb);
             _(truncated).each(function (record) {
-                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record, 'widget': self})).appendTo(node_user_list);
+                partner = {
+                    'id': record[0],
+                    'name': record[1],
+                    'is_uid': record[2]['is_uid'],
+                    'is_editable': record[2]['is_editable'],
+                    'avatar_url': mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record[0]),
+                }
+                if (partner.is_uid) {
+                    self.message_is_follower = partner.is_uid;
+                }
+                $(session.web.qweb.render('mail.followers.partner', {'record': partner, 'widget': self})).appendTo(node_user_list);
+                // On mouse-enter it will show the edit_subtype pencil.
+                if (partner.is_editable) {
+                    self.$('.oe_follower_list').on('mouseenter mouseleave', function(e) {
+                        self.$('.oe_edit_subtype').toggleClass('oe_hidden', e.type == 'mouseleave');
+                        self.$('.oe_follower_list').find('.oe_partner').toggleClass('oe_partner_name', e.type == 'mouseenter');
+                    });
+                }
             });
             // FVA note: be sure it is correctly translated
             if (truncated.length < this.followers.length) {
@@ -185,12 +225,6 @@ openerp_mail_followers = function(session, mail) {
             }
         },
 
-        /** Computes whether the current user is in the followers */
-        set_is_follower: function (records) {
-            var user_ids = _.pluck(_.pluck(records, 'user_ids'), 0);
-            return _.indexOf(user_ids, this.session.uid) != -1;
-        },
-
         display_buttons: function () {
             if (this.message_is_follower) {
                 this.$('button.oe_follower').removeClass('oe_notfollow').addClass('oe_following');
@@ -206,25 +240,37 @@ openerp_mail_followers = function(session, mail) {
         },
 
         /** Fetch subtypes, only if current user is follower */
-        fetch_subtypes: function () {
+        fetch_subtypes: function (user_pid) {
             var self = this;
-            var subtype_list_ul = this.$('.oe_subtype_list').empty();
-            if (! this.message_is_follower) return;
+            var dialog = false;
+            if (user_pid) {
+                dialog = true;
+            } else {
+                var subtype_list_ul = this.$('.oe_subtype_list').empty();
+                if (! this.message_is_follower) return;
+            }
             var id = this.view.datarecord.id;
-            this.ds_model.call('message_get_subscription_data', [[id], new session.web.CompoundContext(this.build_context(), {})])
-                .then(function (data) {self.display_subtypes(data, id);});
+            this.ds_model.call('message_get_subscription_data', [[id], user_pid, new session.web.CompoundContext(this.build_context(), {})])
+                .then(function (data) {self.display_subtypes(data, id, dialog);});
         },
 
         /** Display subtypes: {'name': default, followed} */
-        display_subtypes:function (data, id) {
+        display_subtypes:function (data, id, dialog) {
             var self = this;
-            var $list = this.$('.oe_subtype_list');
+            if (dialog) {
+                var $list = self.$dialog;
+            }
+            else {
+                var $list = this.$('.oe_subtype_list');
+            }
             $list.empty().hide();
             var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
+            this.records_length = $.map(records, function(value, index) { return index; }).length;
+            if (this.records_length > 1) { self.display_followers(); }
             _(records).each(function (record, record_name) {
                 record.name = record_name;
                 record.followed = record.followed || undefined;
-                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo($list);
             });
             if (_.size(records) > 1) {
                 $list.show();
@@ -241,35 +287,49 @@ openerp_mail_followers = function(session, mail) {
             });
         },
         
-        do_unfollow: function () {
+        do_unfollow: function (user_pid) {
             if (confirm(_t("Warning! \nYou won't be notified of any email or discussion on this document. Do you really want to unfollow this document ?"))) {
                 _(this.$('.oe_msg_subtype_check')).each(function (record) {
                     $(record).attr('checked',false);
                 });
+            var action_unsubscribe = 'message_unsubscribe_users';
+            var follower_ids = [this.session.uid];
+            if (user_pid) {
+                action_unsubscribe = 'message_unsubscribe';
+                follower_ids = [user_pid];
+            }
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context])
-                    .then(this.proxy('read_value'));
+                return this.ds_model.call(action_unsubscribe, [[this.view.datarecord.id], follower_ids, context])
+                     .then(this.proxy('read_value'));
             }
             return false;
         },
 
-        do_update_subscription: function (event) {
+        do_update_subscription: function (event, user_pid) {
             var self = this;
 
+            var action_subscribe = 'message_subscribe_users';
+            var follower_ids = [this.session.uid];
+            var oe_action = this.$('.oe_actions input[type="checkbox"]');
+            if (user_pid) {
+                action_subscribe = 'message_subscribe';
+                follower_ids = [user_pid];
+                oe_action = $('.oe_edit_actions input[type="checkbox"]');
+            }
             var checklist = new Array();
-            _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
+            _(oe_action).each(function (record) {
                 if ($(record).is(':checked')) {
                     checklist.push(parseInt($(record).data('id')));
                 }
             });
 
             if (!checklist.length) {
-                if (!this.do_unfollow()) {
+                if (!this.do_unfollow(user_pid)) {
                     $(event.target).attr("checked", "checked");
                 }
             } else {
                 var context = new session.web.CompoundContext(this.build_context(), {});
-                return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], checklist, context])
+                return this.ds_model.call(action_subscribe, [[this.view.datarecord.id], follower_ids, checklist, context])
                     .then(this.proxy('read_value'));
             }
         },
diff --git a/addons/mail/static/src/js/suggestions.js b/addons/mail/static/src/js/suggestions.js
new file mode 100644
index 00000000000..4d0fcec32bf
--- /dev/null
+++ b/addons/mail/static/src/js/suggestions.js
@@ -0,0 +1,77 @@
+openerp.mail.suggestions = function(session, mail) {
+    var _t = session.web._t;
+    var QWeb = session.web.qweb;
+
+    var suggestions = session.suggestions = {};
+    var removed_suggested_group = session.suggestions.removed_suggested_group = [];
+
+    suggestions.Groups = session.web.Widget.extend({
+        events: {
+            'click .oe_suggestion_remove.oe_suggestion_group': 'stop_group_suggestion',
+            'click .oe_suggestion_remove_item.oe_suggestion_group': 'remove_group_suggestion',
+            'click .oe_suggestion_join': 'join_group',
+        },
+
+        init: function () {
+            this._super.apply(this, arguments);
+            this.mail_group = new session.web.DataSetSearch(this, 'mail.group');
+            this.res_users = new session.web.DataSetSearch(this, 'res.users');
+            this.groups = [];
+        },
+
+        start: function () {
+            this._super.apply(this, arguments);
+            return this.fetch_suggested_groups();
+        },
+
+        fetch_suggested_groups: function () {
+            var self = this;
+            var group = self.mail_group.call('get_suggested_thread', {'removed_suggested_threads': removed_suggested_group}).then(function (res) {
+                _(res).each(function (result) {
+                    result['image']=self.session.url('/web/binary/image', {model: 'mail.group', field: 'image_small', id: result.id});
+                });
+                self.groups = res;
+            });
+            return $.when(group).then(this.proxy('display_suggested_groups'));
+        },
+
+        display_suggested_groups: function () {
+            var suggested_groups = this.$('.oe_sidebar_suggestion.oe_suggestion_group');
+            if (suggested_groups) {
+                suggested_groups.empty();
+            }
+            if (this.groups.length === 0) {
+                return this.$el.empty();
+            }
+            return this.$el.empty().html(QWeb.render('mail.suggestions.groups', {'widget': this}));
+        },
+
+        join_group: function (event) {
+            var self = this;
+            return this.mail_group.call('message_subscribe_users', [[$(event.currentTarget).attr('id')],[this.session.uid]]).then(function(res) {
+                self.fetch_suggested_groups();
+            });
+        },
+
+        remove_group_suggestion: function (event) {
+            removed_suggested_group.push($(event.currentTarget).attr('id'));
+            return this.fetch_suggested_groups();
+        },
+
+        stop_group_suggestion: function (event) {
+            var self = this;
+            return this.res_users.call('stop_showing_groups_suggestions', [this.session.uid]).then(function(res) {
+                self.$(".oe_sidebar_suggestion.oe_suggestion_group").hide();
+            });
+        }
+    });
+
+    session.mail.WallSidebar.include({
+        start: function () {
+            this._super.apply(this, arguments);
+            var sug_groups = new suggestions.Groups(this);
+            return sug_groups.appendTo(this.$('.oe_suggestions_groups'));
+        },
+    });
+
+};
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f5004941a8d..1be9754e1c7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -121,9 +121,11 @@
             To:
             <t t-if="!widget.is_private">
                 <span class="oe_all_follower">
-                    Followers of
-                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
-                    <t t-if="!widget.parent_thread.parent_message.record_name">this document</t>
+                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'">
+                        Followers of <t t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
+                    </t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and widget.options.view_inbox">My Followers</t>
+                    <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
             <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
@@ -197,8 +199,16 @@
           </tbody>
         </table>
         <div class="oe_mail-placeholder"></div>
+        <aside class="oe_mail_wall_aside"></aside>
     </div>
 
+    <!--
+        Empty template that holds the sidebar of the Wall
+        -->
+    <t t-name="mail.wall.sidebar">
+        <div class="oe_mail_wall_sidebar"></div>
+    </t>
+
     <!--
         display message on the wall when there are no message
         -->
@@ -256,7 +266,13 @@
                         <t t-if="widget.subject" t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-raw="widget.body"/>
+                        <t t-if="widget.body_short">
+                            <div class="oe_msg_body_short"><t t-raw="widget.body_short"/></div>
+                            <div class="oe_msg_body_long" style="display: none;"><t t-raw="widget.body"/><span class="oe_mail_reduce"><a href="#">read less</a></span></div>
+                        </t>
+                        <t t-if="! widget.body_short">
+                            <t t-raw="widget.body"/>
+                        </t>
                     </div>
                 </div>
                 <div class="oe_msg_footer">
@@ -271,16 +287,16 @@
                             <span class='oe_subtle'>•</span>
                         </t>
                     </t>
-                    <t t-if="widget.type == 'comment' and ! widget.subtype">
+                    <t t-if="widget.type == 'comment' and ! widget.subtype and widget.partner_ids.length == 0">
                         logged a note
                     </t>
-                    <t t-if="(widget.type == 'comment' or widget.type == 'email') and widget.subtype">
+                    <t t-if="(widget.type == 'comment' or widget.type == 'email') and (widget.subtype or widget.partner_ids.length > 0)">
                         to
                         <t t-if="widget.partner_ids.length == 0">
                             nobody
                         </t>
                     </t>
-                    <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and widget.subtype)"
+                    <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and (widget.subtype or widget.partner_ids.length > 0))"
                             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>
@@ -295,7 +311,10 @@
                         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-att-title="widget.date">
+                        <t t-if="widget.timerelative" t-raw="widget.timerelative"/>
+                        <t t-if="!widget.timerelative" t-raw="widget.display_date"/>
+                    </span>
                     <span t-if="!widget.options.readonly" class='oe_subtle'>•</span>
                     <t t-if="!widget.options.readonly" t-call="mail.thread.message.vote"/>
                 </div>
@@ -339,7 +358,4 @@
         </a>
     </span>
 
-    <!-- mail.thread.message.star
-        Template used to display stared/unstared message in a mail.message
-    -->
 </template>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 5ad3ff09bb3..a936b8237d6 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -31,6 +31,7 @@
     <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
         <a t-attf-href="#model=res.partner&amp;id=#{record.id}" t-att-title="record.name"><t t-esc="record.name"/></a>
+        <span t-if="record.is_editable and (widget.records_length &gt; 1)" class="oe_edit_subtype oe_e oe_hidden" title="Edit subscription" t-att-data-id="record.id">&amp;</span>
         <span t-if="widget.view_is_editable" class="oe_remove_follower oe_e" title="Remove this follower" t-att-data-id="record.id">X</span>
     </div>
     
diff --git a/addons/mail/static/src/xml/suggestions.xml b/addons/mail/static/src/xml/suggestions.xml
new file mode 100644
index 00000000000..9157dcbe32e
--- /dev/null
+++ b/addons/mail/static/src/xml/suggestions.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+
+    <!-- Groups placeholder in sidebar -->
+    <t t-extend="mail.wall.sidebar">
+        <t t-jquery=".oe_mail_wall_sidebar" t-operation="append">
+            <div class="oe_suggestions_groups"></div>
+        </t>
+    </t>
+
+
+    <!-- Suggested groups -->
+    <div t-name="mail.suggestions.groups" class="oe_sidebar_suggestion oe_suggestion_group">
+        <div class="oe_suggest_title">
+            <a class="oe_suggestion_remove oe_suggestion_group oe_e">X</a>
+            <h2>Suggested Groups</h2>
+        </div>
+        <div class="oe_suggest_items">
+            <t t-foreach="widget.groups" t-as="result">
+                <div class="oe_suggested_item">
+                    <div class="oe_suggested_item_image">
+                        <a t-attf-href="#model=mail.group&amp;id=#{result.id}">
+                            <img t-attf-src="{result.image}" t-attf-alt="{result.name}"/>
+                        </a>
+                    </div>
+                    <div class="oe_suggested_item_content">
+                        <a class="oe_suggestion_item_name" t-attf-href="#model=mail.group&amp;id=#{result.id}"><t t-esc="result.name"/></a>
+                        <a class="oe_suggestion_remove_item oe_suggestion_group oe_e" t-attf-id="{result.id}">X</a>
+                        <br/>
+                        <button t-att-id="result.id" class="oe_suggestion_join">Join Group</button>
+                    </div>
+                </div>
+            </t>
+        </div>
+    </div>
+
+
+</template>
diff --git a/addons/mail/tests/test_mail_base.py b/addons/mail/tests/test_mail_base.py
index a3b90288f0b..b0f9f72b6f7 100644
--- a/addons/mail/tests/test_mail_base.py
+++ b/addons/mail/tests/test_mail_base.py
@@ -69,10 +69,11 @@ class TestMailBase(common.TransactionCase):
         self.group_employee_id = group_employee_ref and group_employee_ref[1] or False
 
         # Test users to use through the various tests
+        self.res_users.write(cr, uid, uid, {'name': 'Administrator'})
         self.user_raoul_id = self.res_users.create(cr, uid,
-            {'name': 'Raoul Grosbedon', 'signature': 'SignRaoul', 'email': 'raoul@raoul.fr', 'login': 'raoul', 'groups_id': [(6, 0, [self.group_employee_id])]})
+            {'name': 'Raoul Grosbedon', 'signature': 'SignRaoul', 'email': 'raoul@raoul.fr', 'login': 'raoul', 'alias_name': 'raoul', 'groups_id': [(6, 0, [self.group_employee_id])]})
         self.user_bert_id = self.res_users.create(cr, uid,
-            {'name': 'Bert Tartignole', 'signature': 'SignBert', 'email': 'bert@bert.fr', 'login': 'bert', 'groups_id': [(6, 0, [])]})
+            {'name': 'Bert Tartignole', 'signature': 'SignBert', 'email': 'bert@bert.fr', 'login': 'bert', 'alias_name': 'bert', 'groups_id': [(6, 0, [])]})
         self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
         self.user_bert = self.res_users.browse(cr, uid, self.user_bert_id)
         self.user_admin = self.res_users.browse(cr, uid, uid)
@@ -82,7 +83,7 @@ class TestMailBase(common.TransactionCase):
 
         # Test 'pigs' group to use through the various tests
         self.group_pigs_id = self.mail_group.create(cr, uid,
-            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'},
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !', 'alias_name': 'group+pigs'},
             {'mail_create_nolog': True})
         self.group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
 
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index 46f4555349d..ae5555c01ca 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -22,7 +22,7 @@
 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 import mute_logger, email_split
 from openerp.tools.mail import html_sanitize
 
 
@@ -32,17 +32,17 @@ class test_mail(TestMailBase):
         """ Test basic mail.alias setup works, before trying to use them for routing """
         cr, uid = self.cr, self.uid
         self.user_valentin_id = self.res_users.create(cr, uid,
-            {'name': 'Valentin Cognito', 'email': 'valentin.cognito@gmail.com', 'login': 'valentin.cognito'})
+            {'name': 'Valentin Cognito', 'email': 'valentin.cognito@gmail.com', 'login': 'valentin.cognito', 'alias_name': 'valentin.cognito'})
         self.user_valentin = self.res_users.browse(cr, uid, self.user_valentin_id)
         self.assertEquals(self.user_valentin.alias_name, self.user_valentin.login, "Login should be used as alias")
 
         self.user_pagan_id = self.res_users.create(cr, uid,
-            {'name': 'Pagan Le Marchant', 'email': 'plmarchant@gmail.com', 'login': 'plmarchant@gmail.com'})
+            {'name': 'Pagan Le Marchant', 'email': 'plmarchant@gmail.com', 'login': 'plmarchant@gmail.com', 'alias_name': 'plmarchant@gmail.com'})
         self.user_pagan = self.res_users.browse(cr, uid, self.user_pagan_id)
         self.assertEquals(self.user_pagan.alias_name, 'plmarchant', "If login is an email, the alias should keep only the local part")
 
         self.user_barty_id = self.res_users.create(cr, uid,
-            {'name': 'Bartholomew Ironside', 'email': 'barty@gmail.com', 'login': 'b4r+_#_R3wl$$'})
+            {'name': 'Bartholomew Ironside', 'email': 'barty@gmail.com', 'login': 'b4r+_#_R3wl$$', 'alias_name': 'b4r+_#_R3wl$$'})
         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')
 
@@ -479,7 +479,7 @@ 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'], 'r@r',  # was '"Followers of Pigs" <r@r>', but makes no sense
+            self.assertEqual(email_split(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')
@@ -640,7 +640,7 @@ class test_mail(TestMailBase):
             })
         compose = mail_compose.browse(cr, uid, compose_id)
 
-        # D: Post the comment, get created message for each group
+        # Do: Post the comment, get created message for each group
         mail_compose.send_mail(cr, user_raoul.id, [compose_id], context={
                         'default_res_id': -1,
                         'active_ids': [self.group_pigs_id, group_bird_id]
@@ -679,6 +679,37 @@ class test_mail(TestMailBase):
         self.assertEqual(set(bird_pids), set(test_pids),
                         'compose wizard: mail_post_autofollow and mail_create_nosubscribe context keys not correctly taken into account')
 
+        # Do: Compose in mass_mail, coming from list_view, we have an active_domain that should be supported
+        compose_id = mail_compose.create(cr, user_raoul.id,
+            {
+                'subject': _subject,
+                'body': '${object.description}',
+                'partner_ids': [(4, p_c_id), (4, p_d_id)],
+            }, context={
+                'default_composition_mode': 'mass_mail',
+                'default_model': 'mail.group',
+                'default_res_id': False,
+                'active_ids': [self.group_pigs_id],
+                'active_domain': [('name', 'in', ['Pigs', 'Bird'])],
+            })
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # Do: Post the comment, get created message for each group
+        mail_compose.send_mail(
+            cr, user_raoul.id, [compose_id], context={
+                'default_res_id': -1,
+                'active_ids': [self.group_pigs_id, group_bird_id]
+            })
+        group_pigs.refresh()
+        group_bird.refresh()
+        message1 = group_pigs.message_ids[0]
+        message2 = group_bird.message_ids[0]
+
+        # Test: Pigs and Bird did receive their message
+        test_msg_ids = self.mail_message.search(cr, uid, [], limit=2)
+        self.assertIn(message1.id, test_msg_ids, 'compose wizard: Pigs did not receive its mass mailing message')
+        self.assertIn(message2.id, test_msg_ids, 'compose wizard: Bird did not receive its mass mailing message')
+
     def test_30_needaction(self):
         """ Tests for mail.message needaction. """
         cr, uid, user_admin, user_raoul, group_pigs = self.cr, self.uid, self.user_admin, self.user_raoul, self.group_pigs
@@ -739,18 +770,21 @@ class test_mail(TestMailBase):
         self.ir_model_data.create(cr, uid, {'name': 'mt_private', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_private_id})
         mt_name_supername_id = self.mail_message_subtype.create(cr, uid, {'name': 'name_supername', 'description': 'Supername name'})
         self.ir_model_data.create(cr, uid, {'name': 'mt_name_supername', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_name_supername_id})
+        mt_group_public_set_id = self.mail_message_subtype.create(cr, uid, {'name': 'group_public_set', 'description': 'Group set'})
+        self.ir_model_data.create(cr, uid, {'name': 'mt_group_public_set', 'model': 'mail.message.subtype', 'module': 'mail', 'res_id': mt_group_public_set_id})
         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: alter mail_group model for testing purposes (test on classic, selection and many2one fields)
         self.mail_group._track = {
             'public': {
-                'mail.mt_private': lambda self, cr, uid, obj, ctx=None: obj['public'] == 'private',
+                'mail.mt_private': lambda self, cr, uid, obj, ctx=None: obj.public == 'private',
             },
             'name': {
-                'mail.mt_name_supername': lambda self, cr, uid, obj, ctx=None: obj['name'] == 'supername',
+                'mail.mt_name_supername': lambda self, cr, uid, obj, ctx=None: obj.name == 'supername',
             },
             'group_public_id': {
+                'mail.mt_group_public_set': lambda self, cr, uid, obj, ctx=None: obj.group_public_id,
                 'mail.mt_group_public': lambda self, cr, uid, obj, ctx=None: True,
             },
         }
@@ -787,21 +821,37 @@ class test_mail(TestMailBase):
         self.assertIn(u'Public\u2192Private', _strip_string_spaces(last_msg.body), 'tracked: message body incorrect')
         self.assertIn(u'Pigs\u2192supername', _strip_string_spaces(last_msg.body), 'tracked feature: message body does not hold always tracked field')
 
-        # Test: change public as public, group_public_id -> 1 subtype, name always tracked
+        # Test: change public as public, group_public_id -> 2 subtypes, name always tracked
         self.mail_group.write(cr, self.user_raoul_id, [self.group_pigs_id], {'public': 'public', 'group_public_id': group_system_id})
         self.group_pigs.refresh()
-        self.assertEqual(len(self.group_pigs.message_ids), 4, 'tracked: one message should have been produced')
-        # Test: first produced message: mt_group_public_id, with name always tracked, public tracked on change
+        self.assertEqual(len(self.group_pigs.message_ids), 5, 'tracked: one message should have been produced')
+        # Test: first produced message: mt_group_public_set_id, with name always tracked, public tracked on change
         last_msg = self.group_pigs.message_ids[-4]
-        self.assertEqual(last_msg.subtype_id.id, mt_group_public_id, 'tracked: message should not be linked to any subtype')
+        self.assertEqual(last_msg.subtype_id.id, mt_group_public_set_id, 'tracked: message should be linked to mt_group_public_set_id')
+        self.assertIn('Group set', last_msg.body, 'tracked: message body does not hold the subtype description')
+        self.assertIn(u'Private\u2192Public', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold changed tracked field')
+        self.assertIn(u'HumanResources/Employee\u2192Administration/Settings', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold always tracked field')
+        # Test: second produced message: mt_group_public_id, with name always tracked, public tracked on change
+        last_msg = self.group_pigs.message_ids[-5]
+        self.assertEqual(last_msg.subtype_id.id, mt_group_public_id, 'tracked: message should be linked to mt_group_public_id')
         self.assertIn('Group changed', last_msg.body, 'tracked: message body does not hold the subtype description')
         self.assertIn(u'Private\u2192Public', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold changed tracked field')
         self.assertIn(u'HumanResources/Employee\u2192Administration/Settings', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold always tracked field')
 
+        # Test: change group_public_id to False -> 1 subtype, name always tracked
+        self.mail_group.write(cr, self.user_raoul_id, [self.group_pigs_id], {'group_public_id': False})
+        self.group_pigs.refresh()
+        self.assertEqual(len(self.group_pigs.message_ids), 6, 'tracked: one message should have been produced')
+        # Test: first produced message: mt_group_public_set_id, with name always tracked, public tracked on change
+        last_msg = self.group_pigs.message_ids[-6]
+        self.assertEqual(last_msg.subtype_id.id, mt_group_public_id, 'tracked: message should be linked to mt_group_public_id')
+        self.assertIn('Group changed', last_msg.body, 'tracked: message body does not hold the subtype description')
+        self.assertIn(u'Administration/Settings\u2192', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold always tracked field')
+
         # Test: change not tracked field, no tracking message
         self.mail_group.write(cr, self.user_raoul_id, [self.group_pigs_id], {'description': 'Dummy'})
         self.group_pigs.refresh()
-        self.assertEqual(len(self.group_pigs.message_ids), 4, 'tracked: No message should have been produced')
+        self.assertEqual(len(self.group_pigs.message_ids), 6, 'tracked: No message should have been produced')
 
         # Data: removed changes
         public_col.track_visibility = None
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index 5615e22b2c2..fade38869f1 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -99,20 +99,20 @@ class TestMailgateway(TestMailBase):
         # --------------------------------------------------
 
         # 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]
+        partner_info = self.mail_thread.message_partner_info_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')
+                         'mail_thread: message_partner_info_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')
+                         'mail_thread: message_partner_info_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]
+        partner_info = self.mail_thread.message_partner_info_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')
+                         'mail_thread: message_partner_info_from_emails wrong partner found')
 
         # --------------------------------------------------
         # CASE1: with object
@@ -120,90 +120,106 @@ class TestMailgateway(TestMailBase):
 
         # 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]
+        partner_info = self.mail_group.message_partner_info_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')
+                         'mail_thread: message_partner_info_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
+        cr, uid, user_raoul_id = self.cr, self.uid, self.user_raoul_id
 
-        # Data: clean catchall domain
+        # Data: update + generic variables
+        reply_to1 = '_reply_to1@example.com'
+        reply_to2 = '_reply_to2@example.com'
+        email_from1 = 'from@example.com'
+        alias_domain = 'schlouby.fr'
+        raoul_from = 'Raoul Grosbedon <raoul@raoul.fr>'
+        raoul_from_alias = 'Raoul Grosbedon <raoul@schlouby.fr>'
+        raoul_reply = '"Followers of Pigs" <raoul@raoul.fr>'
+        raoul_reply_alias = '"Followers of Pigs" <group+pigs@schlouby.fr>'
+        # Data: remove alias_domain to see emails with alias
         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)
+        # Do: free message; specified values > default values
+        msg_id = self.mail_message.create(cr, user_raoul_id, {'reply_to': reply_to1, 'email_from': email_from1})
+        msg = self.mail_message.browse(cr, user_raoul_id, 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')
+                      'mail_message: message_id should be specific to a mail_message with a given reply_to')
+        self.assertEqual(msg.reply_to, reply_to1,
+                         'mail_message: incorrect reply_to: should come from values')
+        self.assertEqual(msg.email_from, email_from1,
+                         'mail_message: incorrect email_from: should come from 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)
+        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, user_raoul_id, 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')
+        self.assertEqual(mail.reply_to, reply_to1,
+                         'mail_mail: incorrect reply_to: should come from mail.message')
+        self.assertEqual(mail.email_from, email_from1,
+                         'mail_mail: incorrect email_from: should come from mail.message')
+        # Do: create a mail_mail with the previous mail_message + specified reply_to
+        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel', 'reply_to': reply_to2})
+        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, reply_to2,
+                         'mail_mail: incorrect reply_to: should come from values')
+        self.assertEqual(mail.email_from, email_from1,
+                         'mail_mail: incorrect email_from: should come from 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)
+        # Do: mail_message attached to a document
+        msg_id = self.mail_message.create(cr, user_raoul_id, {'model': 'mail.group', 'res_id': self.group_pigs_id})
+        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
         # Test: message content
         self.assertIn('mail.group', msg.message_id,
-                        'mail_message: message_id should contain model')
+                      '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')
+                      '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')
+                         'mail_message: incorrect reply_to: should not be generated if not specified')
+        self.assertEqual(msg.email_from, raoul_from,
+                         'mail_message: incorrect email_from: should be Raoul')
         # 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)
+        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, user_raoul_id, 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')
+        self.assertEqual(mail.reply_to, raoul_reply,
+                         'mail_mail: incorrect reply_to: should be Raoul')
 
         # Data: set catchall domain
-        self.registry('ir.config_parameter').set_param(cr, uid, 'mail.catchall.domain', 'schlouby.fr')
+        self.registry('ir.config_parameter').set_param(cr, uid, 'mail.catchall.domain', alias_domain)
         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})
+        self.mail_message.write(cr, user_raoul_id, [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)
+        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, user_raoul_id, 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')
+        self.assertEqual(mail.reply_to, raoul_reply_alias,
+                         'mail_mail: incorrect reply_to: should be Pigs alias')
+
+        # Update message: test alias on email_from
+        msg_id = self.mail_message.create(cr, user_raoul_id, {})
+        msg = self.mail_message.browse(cr, user_raoul_id, msg_id)
+        # Do: create a mail_mail based on the previous mail_message
+        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, user_raoul_id, mail_id)
+        # Test: mail_mail content
+        self.assertEqual(mail.reply_to, raoul_from_alias,
+                         'mail_mail: incorrect reply_to: should be message email_from using Raoul alias')
 
         # Update message
-        self.mail_message.write(cr, uid, [msg_id], {'res_id': False, 'email_from': 'someone@schlouby.fr', 'reply_to': False})
+        self.mail_message.write(cr, user_raoul_id, [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)
+        mail_id = self.mail_mail.create(cr, user_raoul_id, {'mail_message_id': msg_id, 'state': 'cancel'})
+        mail = self.mail_mail.browse(cr, user_raoul_id, 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')
+                         'mail_mail: incorrect reply_to: should be message email_from')
 
         # Data: set catchall alias
         self.registry('ir.config_parameter').set_param(self.cr, self.uid, 'mail.catchall.alias', 'gateway')
@@ -214,23 +230,23 @@ class TestMailgateway(TestMailBase):
         # 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
+        # Test: mail_mail Content-Type
         self.assertEqual(mail.reply_to, 'gateway@schlouby.fr',
-                        'mail_mail: reply_to should equal the catchall email alias')
+                         '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')
+                         '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')
+                         '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):
@@ -238,9 +254,9 @@ class TestMailgateway(TestMailBase):
         cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
 
         def format_and_process(template, to='groups@example.com, other@gmail.com', subject='Frogs',
-                                extra='', email_from='Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>',
-                                msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>',
-                                model=None):
+                               extra='', email_from='Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>',
+                               msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>',
+                               model=None):
             self.assertEqual(self.mail_group.search(cr, uid, [('name', '=', subject)]), [])
             mail = template.format(to=to, subject=subject, extra=extra, email_from=email_from, msg_id=msg_id)
             self.mail_thread.message_process(cr, uid, model, mail)
@@ -255,7 +271,10 @@ class TestMailgateway(TestMailBase):
         alias_id = self.mail_alias.create(cr, uid, {
             'alias_name': 'groups',
             'alias_user_id': False,
-            'alias_model_id': self.mail_group_model_id})
+            'alias_model_id': self.mail_group_model_id,
+            'alias_parent_model_id': self.mail_group_model_id,
+            'alias_parent_thread_id': self.group_pigs_id,
+            'alias_contact': 'everyone'})
 
         # --------------------------------------------------
         # Test1: new record creation
@@ -270,155 +289,244 @@ class TestMailgateway(TestMailBase):
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         res = self.mail_group.perm_read(cr, uid, [frog_group.id], details=False)
         self.assertEqual(res[0].get('create_uid'), uid,
-                            'message_process: group should have been created by uid as alias_user__id is False on the alias')
+                         'message_process: group should have been created by uid as alias_user__id is False on the alias')
         # Test: one message that is the incoming email
         self.assertEqual(len(frog_group.message_ids), 1,
-                            'message_process: newly created group should have the incoming email in message_ids')
+                         'message_process: newly created group should have the incoming email in message_ids')
         msg = frog_group.message_ids[0]
         self.assertEqual('Frogs', msg.subject,
-                            'message_process: newly created group should have the incoming email as first message')
+                         'message_process: newly created group should have the incoming email as first message')
         self.assertIn('Please call me as soon as possible this afternoon!', msg.body,
-                            'message_process: newly created group should have the incoming email as first message')
+                      'message_process: newly created group should have the incoming email as first message')
         self.assertEqual('email', msg.type,
-                            'message_process: newly created group should have an email as first message')
+                         'message_process: newly created group should have an email as first message')
         self.assertEqual('Discussions', msg.subtype_id.name,
-                            'message_process: newly created group should not have a log first message but an email')
+                         'message_process: newly created group should not have a log first message but an email')
         # Test: message: unknown email address -> message has email_from, not author_id
         self.assertFalse(msg.author_id,
-                            'message_process: message on created group should not have an author_id')
+                         'message_process: message on created group should not have an author_id')
         self.assertIn('test.sylvie.lelitre@agrolait.com', msg.email_from,
-                            'message_process: message on created group should have an email_from')
+                      'message_process: message on created group should have an email_from')
         # Test: followers: nobody
         self.assertEqual(len(frog_group.message_follower_ids), 0, 'message_process: newly create group should not have any follower')
         # Test: sent emails: no-one
         self.assertEqual(len(sent_emails), 0,
-                            'message_process: should create emails without any follower added')
+                         'message_process: should create emails without any follower added')
         # Data: unlink group
         frog_group.unlink()
 
-        # Do: incoming email from a known partner on an alias with known recipients, alias is owned by user that can create a group
-        self.mail_alias.write(cr, uid, [alias_id], {'alias_user_id': self.user_raoul_id})
-        p1id = self.res_partner.create(cr, uid, {'name': 'Sylvie Lelitre', 'email': 'test.sylvie.lelitre@agrolait.com'})
-        p2id = self.res_partner.create(cr, uid, {'name': 'Other Poilvache', 'email': 'other@gmail.com'})
+        # Do: incoming email from an unknown partner on a Partners only alias -> bounce
         self._init_mock_build_email()
-        frog_groups = format_and_process(MAIL_TEMPLATE, to='groups@example.com, other@gmail.com')
+        self.mail_alias.write(cr, uid, [alias_id], {'alias_contact': 'partners'})
+        frog_groups = format_and_process(MAIL_TEMPLATE, to='groups@example.com, other2@gmail.com')
+        # Test: no group created
+        self.assertTrue(len(frog_groups) == 0)
+        # Test: email bounced
+        sent_emails = self._build_email_kwargs_list
+        self.assertEqual(len(sent_emails), 1,
+                         'message_process: incoming email on Partners alias should send a bounce email')
+        self.assertIn('Frogs', sent_emails[0].get('subject'),
+                      'message_process: bounce email on Partners alias should contain the original subject')
+        self.assertIn('test.sylvie.lelitre@agrolait.com', sent_emails[0].get('email_to'),
+                      'message_process: bounce email on Partners alias should have original email sender as recipient')
+
+        # Do: incoming email from an unknown partner on a Followers only alias -> bounce
+        self._init_mock_build_email()
+        self.mail_alias.write(cr, uid, [alias_id], {'alias_contact': 'followers'})
+        frog_groups = format_and_process(MAIL_TEMPLATE, to='groups@example.com, other3@gmail.com')
+        # Test: no group created
+        self.assertTrue(len(frog_groups) == 0)
+        # Test: email bounced
+        sent_emails = self._build_email_kwargs_list
+        self.assertEqual(len(sent_emails), 1,
+                         'message_process: incoming email on Followers alias should send a bounce email')
+        self.assertIn('Frogs', sent_emails[0].get('subject'),
+                      'message_process: bounce email on Followers alias should contain the original subject')
+        self.assertIn('test.sylvie.lelitre@agrolait.com', sent_emails[0].get('email_to'),
+                      'message_process: bounce email on Followers alias should have original email sender as recipient')
+
+        # Do: incoming email from a known partner on a Partners alias -> ok (+ test on alias.user_id)
+        self.mail_alias.write(cr, uid, [alias_id], {'alias_user_id': self.user_raoul_id, 'alias_contact': 'partners'})
+        p1id = self.res_partner.create(cr, uid, {'name': 'Sylvie Lelitre', 'email': 'test.sylvie.lelitre@agrolait.com'})
+        p2id = self.res_partner.create(cr, uid, {'name': 'Other Poilvache', 'email': 'other4@gmail.com'})
+        self._init_mock_build_email()
+        frog_groups = format_and_process(MAIL_TEMPLATE, to='groups@example.com, other4@gmail.com')
         sent_emails = self._build_email_kwargs_list
         # Test: one group created by Raoul
         self.assertEqual(len(frog_groups), 1, 'message_process: a new mail.group should have been created')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         res = self.mail_group.perm_read(cr, uid, [frog_group.id], details=False)
         self.assertEqual(res[0].get('create_uid'), self.user_raoul_id,
-                            'message_process: group should have been created by alias_user_id')
+                         'message_process: group should have been created by alias_user_id')
         # Test: one message that is the incoming email
         self.assertEqual(len(frog_group.message_ids), 1,
-                            'message_process: newly created group should have the incoming email in message_ids')
+                         'message_process: newly created group should have the incoming email in message_ids')
         msg = frog_group.message_ids[0]
-        # Test: message: unknown email address -> message has email_from, not author_id
+        # Test: message: author found
         self.assertEqual(p1id, msg.author_id.id,
-                            'message_process: message on created group should have Sylvie as author_id')
+                         'message_process: message on created group should have Sylvie as author_id')
         self.assertIn('Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>', msg.email_from,
-                            'message_process: message on created group should have have an email_from')
-        # Test: author (not recipient and not raoul (as alias owner)) added as follower
+                      'message_process: message on created group should have have an email_from')
+        # Test: author (not recipient and not Raoul (as alias owner)) added as follower
         frog_follower_ids = set([p.id for p in frog_group.message_follower_ids])
         self.assertEqual(frog_follower_ids, set([p1id]),
-                            'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
+                         'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
         # Test: sent emails: no-one, no bounce effet
+        sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 0,
-                            'message_process: should not bounce incoming emails')
+                         'message_process: should not bounce incoming emails')
         # Data: unlink group
         frog_group.unlink()
 
-        # Do: incoming email from a known partner that is also an user that can create a mail.group
-        self.res_users.create(cr, uid, {'partner_id': p1id, 'login': 'sylvie', 'groups_id': [(6, 0, [self.group_employee_id])]})
-        frog_groups = format_and_process(MAIL_TEMPLATE, to='groups@example.com, other@gmail.com')
+        # Do: incoming email from a not follower Partner on a Followers only alias -> bounce
+        self._init_mock_build_email()
+        self.mail_alias.write(cr, uid, [alias_id], {'alias_user_id': False, 'alias_contact': 'followers'})
+        frog_groups = format_and_process(MAIL_TEMPLATE, to='groups@example.com, other5@gmail.com')
+        # Test: no group created
+        self.assertTrue(len(frog_groups) == 0)
+        # Test: email bounced
+        sent_emails = self._build_email_kwargs_list
+        self.assertEqual(len(sent_emails), 1,
+                         'message_process: incoming email on Partners alias should send a bounce email')
+
+        # Do: incoming email from a parent document follower on a Followers only alias -> ok
+        self._init_mock_build_email()
+        self.mail_group.message_subscribe(cr, uid, [self.group_pigs_id], [p1id])
+        frog_groups = format_and_process(MAIL_TEMPLATE, to='groups@example.com, other6@gmail.com')
         # Test: one group created by Raoul (or Sylvie maybe, if we implement it)
         self.assertEqual(len(frog_groups), 1, 'message_process: a new mail.group should have been created')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: one message that is the incoming email
         self.assertEqual(len(frog_group.message_ids), 1,
-                            'message_process: newly created group should have the incoming email in message_ids')
+                         'message_process: newly created group should have the incoming email in message_ids')
         # Test: author (and not recipient) added as follower
         frog_follower_ids = set([p.id for p in frog_group.message_follower_ids])
         self.assertEqual(frog_follower_ids, set([p1id]),
-                            'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
+                         'message_process: newly created group should have 1 follower (author, not creator, not recipients)')
         # Test: sent emails: no-one, no bounce effet
+        sent_emails = self._build_email_kwargs_list
         self.assertEqual(len(sent_emails), 0,
-                            'message_process: should not bounce incoming emails')
+                         'message_process: should not bounce incoming emails')
 
         # --------------------------------------------------
-        # Test2: discussion update
+        # Test2: update-like alias
         # --------------------------------------------------
 
-        # Do: even with a wrong destination, a reply should end up in the correct thread
-        frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other@gmail.com',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
-                                            to='erroneous@example.com>', subject='Re: news',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+        # Do: Pigs alias is restricted, should bounce
+        self._init_mock_build_email()
+        self.mail_group.write(cr, uid, [frog_group.id], {'alias_name': 'frogs', 'alias_contact': 'followers', 'alias_force_thread_id': frog_group.id})
+        frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
+                                         to='frogs@example.com>', subject='Re: news')
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
-                            'message_process: reply on Frogs should not have created a new group with new subject')
+                         'message_process: reply on Frogs should not have created a new group with new subject')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: reply on Frogs should not have created a duplicate group with old subject')
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
+        frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
+        # Test: email bounced
+        sent_emails = self._build_email_kwargs_list
+        self.assertEqual(len(sent_emails), 1,
+                         'message_process: incoming email on Followers alias should send a bounce email')
+        self.assertIn('Re: news', sent_emails[0].get('subject'),
+                      'message_process: bounce email on Followers alias should contain the original subject')
+
+        # Do: Pigs alias is restricted, should accept Followers
+        self._init_mock_build_email()
+        self.mail_group.message_subscribe(cr, uid, [frog_group.id], [p2id])
+        frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
+                                         msg_id='<1198923581.41972151344608186799.JavaMail.diff1@agrolait.com>',
+                                         to='frogs@example.com>', subject='Re: cats')
+        # Test: no group 'Re: news' created, still only 1 Frogs group
+        self.assertEqual(len(frog_groups), 0,
+                         'message_process: reply on Frogs should not have created a new group with new subject')
+        frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
+        self.assertEqual(len(frog_groups), 1,
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: one new message
         self.assertEqual(len(frog_group.message_ids), 2, 'message_process: group should contain 2 messages after reply')
+        # Test: sent emails: 1 (Sylvie copy of the incoming email, but no bounce)
+        sent_emails = self._build_email_kwargs_list
+        self.assertEqual(len(sent_emails), 1,
+                         'message_process: one email should have been generated')
+        self.assertIn('test.sylvie.lelitre@agrolait.com', sent_emails[0].get('email_to')[0],
+                      'message_process: email should be sent to Sylvie')
+        self.mail_group.message_unsubscribe(cr, uid, [frog_group.id], [p2id])
+
+        # --------------------------------------------------
+        # Test3: discussion and replies
+        # --------------------------------------------------
+
+        # Do: even with a wrong destination, a reply should end up in the correct thread
+        frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
+                                         to='erroneous@example.com>', subject='Re: news',
+                                         extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+        # Test: no group 'Re: news' created, still only 1 Frogs group
+        self.assertEqual(len(frog_groups), 0,
+                         'message_process: reply on Frogs should not have created a new group with new subject')
+        frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
+        self.assertEqual(len(frog_groups), 1,
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
+        frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
+        # Test: one new message
+        self.assertEqual(len(frog_group.message_ids), 3, 'message_process: group should contain 2 messages after reply')
         # Test: author (and not recipient) added as follower
         frog_follower_ids = set([p.id for p in frog_group.message_follower_ids])
         self.assertEqual(frog_follower_ids, set([p1id, p2id]),
-                            'message_process: after reply, group should have 2 followers')
+                         'message_process: after reply, group should have 2 followers')
 
         # Do: due to some issue, same email goes back into the mailgateway
-        frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other@gmail.com',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
-                                            subject='Re: news', extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+        frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other4@gmail.com',
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
+                                         subject='Re: news', extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
-                            'message_process: reply on Frogs should not have created a new group with new subject')
+                         'message_process: reply on Frogs should not have created a new group with new subject')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: reply on Frogs should not have created a duplicate group with old subject')
+                         'message_process: reply on Frogs should not have created a duplicate group with old subject')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: no new message
-        self.assertEqual(len(frog_group.message_ids), 2, 'message_process: message with already existing message_id should not have been duplicated')
+        self.assertEqual(len(frog_group.message_ids), 3, 'message_process: message with already existing message_id should not have been duplicated')
         # Test: message_id is still unique
         msg_ids = self.mail_message.search(cr, uid, [('message_id', 'ilike', '<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>')])
         self.assertEqual(len(msg_ids), 1,
-                            'message_process: message with already existing message_id should not have been duplicated')
+                         'message_process: message with already existing message_id should not have been duplicated')
 
         # --------------------------------------------------
-        # Test3: email_from and partner finding
+        # Test4: email_from and partner finding
         # --------------------------------------------------
 
         # Data: extra partner with Raoul's email -> test the 'better author finding'
         extra_partner_id = self.res_partner.create(cr, uid, {'name': 'A-Raoul', 'email': 'test_raoul@email.com'})
-        # extra_user_id = self.res_users.create(cr, uid, {'name': 'B-Raoul', 'email': self.user_raoul.email})
-        # extra_user_pid = self.res_users.browse(cr, uid, extra_user_id).partner_id.id
 
         # Do: post a new message, with a known partner -> duplicate emails -> partner
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik <test_raoul@email.com>',
-                                            to='erroneous@example.com>', subject='Re: news (2)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new1@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='erroneous@example.com>', subject='Re: news (2)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new1@agrolait.com>',
+                           extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is A-Raoul (only existing)
         self.assertEqual(frog_group.message_ids[0].author_id.id, extra_partner_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         # Do: post a new message, with a known partner -> duplicate emails -> user
         frog_group.message_unsubscribe([extra_partner_id])
         raoul_email = self.user_raoul.email
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': 'test_raoul@email.com'})
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik <test_raoul@email.com>',
-                                            to='erroneous@example.com>', subject='Re: news (3)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new2@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='erroneous@example.com>', subject='Re: news (3)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new2@agrolait.com>',
+                           extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is Raoul (user), not A-Raoul
         self.assertEqual(frog_group.message_ids[0].author_id.id, self.partner_raoul_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         # Do: post a new message, with a known partner -> duplicate emails -> partner because is follower
         frog_group.message_unsubscribe([self.partner_raoul_id])
@@ -426,54 +534,54 @@ class TestMailgateway(TestMailBase):
         raoul_email = self.user_raoul.email
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': 'test_raoul@email.com'})
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik <test_raoul@email.com>',
-                                            to='erroneous@example.com>', subject='Re: news (3)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new3@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='erroneous@example.com>', subject='Re: news (3)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new3@agrolait.com>',
+                           extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is Raoul (user), not A-Raoul
         self.assertEqual(frog_group.message_ids[0].author_id.id, extra_partner_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': raoul_email})
 
         # --------------------------------------------------
-        # Test4: misc gateway features
+        # Test5: misc gateway features
         # --------------------------------------------------
 
         # Do: incoming email with model that does not accepts incoming emails must raise
         self.assertRaises(AssertionError,
-                            format_and_process,
-                            MAIL_TEMPLATE,
-                            to='noone@example.com', subject='spam', extra='', model='res.country',
-                            msg_id='<1198923581.41972151344608186760.JavaMail.new4@agrolait.com>')
+                          format_and_process,
+                          MAIL_TEMPLATE,
+                          to='noone@example.com', subject='spam', extra='', model='res.country',
+                          msg_id='<1198923581.41972151344608186760.JavaMail.new4@agrolait.com>')
 
         # Do: incoming email without model and without alias must raise
         self.assertRaises(AssertionError,
-                            format_and_process,
-                            MAIL_TEMPLATE,
-                            to='noone@example.com', subject='spam', extra='',
-                            msg_id='<1198923581.41972151344608186760.JavaMail.new5@agrolait.com>')
+                          format_and_process,
+                          MAIL_TEMPLATE,
+                          to='noone@example.com', subject='spam', extra='',
+                          msg_id='<1198923581.41972151344608186760.JavaMail.new5@agrolait.com>')
 
         # Do: incoming email with model that accepting incoming emails as fallback
         frog_groups = format_and_process(MAIL_TEMPLATE,
-                                            to='noone@example.com',
-                                            subject='Spammy', extra='', model='mail.group',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new6@agrolait.com>')
+                                         to='noone@example.com',
+                                         subject='Spammy', extra='', model='mail.group',
+                                         msg_id='<1198923581.41972151344608186760.JavaMail.new6@agrolait.com>')
         self.assertEqual(len(frog_groups), 1,
-                            'message_process: erroneous email but with a fallback model should have created a new mail.group')
+                         'message_process: erroneous email but with a fallback model should have created a new mail.group')
 
         # Do: incoming email in plaintext should be stored as  html
         frog_groups = format_and_process(MAIL_TEMPLATE_PLAINTEXT,
-                                            to='groups@example.com', subject='Frogs Return', extra='',
-                                            msg_id='<deadcafe.1337@smtp.agrolait.com>')
+                                         to='groups@example.com', subject='Frogs Return', extra='',
+                                         msg_id='<deadcafe.1337@smtp.agrolait.com>')
         # Test: one group created with one message
         self.assertEqual(len(frog_groups), 1, 'message_process: a new mail.group should have been created')
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         msg = frog_group.message_ids[0]
         # Test: plain text content should be wrapped and stored as html
-        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')
+        self.assertIn('<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>', msg.body,
+                      'message_process: plaintext incoming email incorrectly parsed')
 
     @mute_logger('openerp.addons.mail.mail_thread', 'openerp.osv.orm')
     def test_20_thread_parent_resolution(self):
@@ -494,26 +602,26 @@ class TestMailgateway(TestMailBase):
         # Reply to msg1, make sure the reply is properly attached using the various reply identification mechanisms
         # 0. Direct alias match
         reply_msg1 = format(MAIL_TEMPLATE, to='Pretty Pigs <group+pigs@example.com>',
-                                extra='In-Reply-To: %s' % msg1.message_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.2@agrolait.com>')
+                            extra='In-Reply-To: %s' % msg1.message_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.2@agrolait.com>')
         self.mail_group.message_process(cr, uid, None, reply_msg1)
 
         # 1. In-Reply-To header
         reply_msg2 = format(MAIL_TEMPLATE, to='erroneous@example.com',
-                                extra='In-Reply-To: %s' % msg1.message_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.3@agrolait.com>')
+                            extra='In-Reply-To: %s' % msg1.message_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.3@agrolait.com>')
         self.mail_group.message_process(cr, uid, None, reply_msg2)
 
         # 2. References header
         reply_msg3 = format(MAIL_TEMPLATE, to='erroneous@example.com',
-                                extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.4@agrolait.com>')
+                            extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.4@agrolait.com>')
         self.mail_group.message_process(cr, uid, None, reply_msg3)
 
         # 3. Subject contains [<ID>] + model passed to message+process -> only attached to group, but not to mail (not in msg1.child_ids)
         reply_msg4 = format(MAIL_TEMPLATE, to='erroneous@example.com',
-                                extra='', subject='Re: [%s] 1' % self.group_pigs_id,
-                                msg_id='<1198923581.41972151344608186760.JavaMail.5@agrolait.com>')
+                            extra='', subject='Re: [%s] 1' % self.group_pigs_id,
+                            msg_id='<1198923581.41972151344608186760.JavaMail.5@agrolait.com>')
         self.mail_group.message_process(cr, uid, 'mail.group', reply_msg4)
 
         group_pigs.refresh()
@@ -525,12 +633,19 @@ class TestMailgateway(TestMailBase):
         """ Testing private discussion between partners. """
         cr, uid = self.cr, self.uid
 
+        def format(template, to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: 1',
+                                extra='', email_from='Sylvie Lelitre <test.sylvie.lelitre@agrolait.com>',
+                                msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>'):
+            return template.format(to=to, subject=subject, extra=extra, email_from=email_from, msg_id=msg_id)
+
         # Do: Raoul writes to Bert and Administrator, with a thread_model in context that should not be taken into account
         msg1_pids = [self.partner_admin_id, self.partner_bert_id]
-        msg1_id = self.mail_thread.message_post(cr, self.user_raoul_id, False,
-                        partner_ids=msg1_pids,
-                        subtype='mail.mt_comment',
-                        context={'thread_model': 'mail.group'})
+        msg1_id = self.mail_thread.message_post(
+            cr, self.user_raoul_id, False,
+            partner_ids=msg1_pids,
+            subtype='mail.mt_comment',
+            context={'thread_model': 'mail.group'}
+        )
 
         # Test: message recipients
         msg = self.mail_message.browse(cr, uid, msg1_id)
@@ -539,16 +654,26 @@ class TestMailgateway(TestMailBase):
         test_pids = msg1_pids
         test_nids = msg1_pids
         self.assertEqual(set(msg_pids), set(test_pids),
-                        'message_post: private discussion: incorrect recipients')
+                         'message_post: private discussion: incorrect recipients')
         self.assertEqual(set(msg_nids), set(test_nids),
-                        'message_post: private discussion: incorrect notified recipients')
+                         'message_post: private discussion: incorrect notified recipients')
         self.assertEqual(msg.model, False,
-                        'message_post: private discussion: context key "thread_model" not correctly ignored when having no res_id')
+                         'message_post: private discussion: context key "thread_model" not correctly ignored when having no res_id')
+        # Test: message reply_to and message-id
+        self.assertFalse(msg.reply_to,
+                         'message_post: private discussion: initial message should not have any reply_to specified')
+        self.assertIn('openerp-private', msg.message_id,
+                      'message_post: private discussion: message-id should contain the private keyword')
 
         # Do: Bert replies through mailgateway (is a customer)
-        msg2_id = self.mail_thread.message_post(cr, uid, False,
-                        author_id=self.partner_bert_id,
-                        parent_id=msg1_id, subtype='mail.mt_comment')
+        reply_message = format(MAIL_TEMPLATE, to='not_important@mydomain.com',
+                               email_from='bert@bert.fr',
+                               extra='In-Reply-To: %s' % msg.message_id,
+                               msg_id='<test30.JavaMail.0@agrolait.com>')
+        self.mail_thread.message_process(cr, uid, None, reply_message)
+
+        # Test: last mail_message created
+        msg2_id = self.mail_message.search(cr, uid, [], limit=1)[0]
 
         # Test: message recipients
         msg = self.mail_message.browse(cr, uid, msg2_id)
@@ -556,14 +681,32 @@ class TestMailgateway(TestMailBase):
         msg_nids = [p.id for p in msg.notified_partner_ids]
         test_pids = [self.partner_admin_id, self.partner_raoul_id]
         test_nids = test_pids
+        self.assertEqual(msg.author_id.id, self.partner_bert_id,
+                         'message_post: private discussion: wrong author through mailgatewya based on email')
         self.assertEqual(set(msg_pids), set(test_pids),
-                        'message_post: private discussion: incorrect recipients when replying')
+                         'message_post: private discussion: incorrect recipients when replying')
         self.assertEqual(set(msg_nids), set(test_nids),
-                        'message_post: private discussion: incorrect notified recipients when replying')
+                         'message_post: private discussion: incorrect notified recipients when replying')
+
+        # Do: Bert replies through chatter (is a customer)
+        msg3_id = self.mail_thread.message_post(
+            cr, uid, False,
+            author_id=self.partner_bert_id,
+            parent_id=msg1_id, subtype='mail.mt_comment')
+
+        # Test: message recipients
+        msg = self.mail_message.browse(cr, uid, msg3_id)
+        msg_pids = [p.id for p in msg.partner_ids]
+        msg_nids = [p.id for p in msg.notified_partner_ids]
+        test_pids = [self.partner_admin_id, self.partner_raoul_id]
+        test_nids = test_pids
+        self.assertEqual(set(msg_pids), set(test_pids),
+                         'message_post: private discussion: incorrect recipients when replying')
+        self.assertEqual(set(msg_nids), set(test_nids),
+                         'message_post: private discussion: incorrect notified recipients when replying')
 
         # Do: Administrator replies
-        msg3_id = self.mail_thread.message_post(cr, uid, False,
-                        parent_id=msg2_id, subtype='mail.mt_comment')
+        msg3_id = self.mail_thread.message_post(cr, uid, False, parent_id=msg3_id, subtype='mail.mt_comment')
 
         # Test: message recipients
         msg = self.mail_message.browse(cr, uid, msg3_id)
@@ -572,6 +715,6 @@ class TestMailgateway(TestMailBase):
         test_pids = [self.partner_bert_id, self.partner_raoul_id]
         test_nids = test_pids
         self.assertEqual(set(msg_pids), set(test_pids),
-                        'message_post: private discussion: incorrect recipients when replying')
+                         'message_post: private discussion: incorrect recipients when replying')
         self.assertEqual(set(msg_nids), set(test_nids),
-                        'message_post: private discussion: incorrect notified recipients when replying')
+                         'message_post: private discussion: incorrect notified recipients when replying')
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 7bf4d47d1ff..6ab1f0e81ff 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -73,6 +73,11 @@ class mail_compose_message(osv.TransientModel):
         res_id = context.get('default_res_id', context.get('active_id'))
         message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id')))
         active_ids = context.get('active_ids')
+        if 'active_domain' in context:  # not context.get() because we want to keep global [] domains
+            result['use_active_domain'] = True
+            result['active_domain'] = '%s' % context.get('active_domain')
+        else:
+            result['active_domain'] = ''
 
         # get default values according to the composition mode
         if composition_mode == 'reply':
@@ -112,6 +117,8 @@ class mail_compose_message(osv.TransientModel):
         'partner_ids': fields.many2many('res.partner',
             'mail_compose_message_res_partner_rel',
             'wizard_id', 'partner_id', 'Additional contacts'),
+        'use_active_domain': fields.boolean('Use active domain'),
+        'active_domain': fields.char('Active domain', readonly=True),
         'post': fields.boolean('Post a copy in the document',
             help='Post a copy of the message on the document communication history.'),
         'notify': fields.boolean('Notify followers',
@@ -126,11 +133,9 @@ class mail_compose_message(osv.TransientModel):
 
     _defaults = {
         'composition_mode': 'comment',
-        'email_from': lambda self, cr, uid, ctx={}: self.pool.get('mail.mail')._get_default_from(cr, uid, context=ctx),
         'body': lambda self, cr, uid, ctx={}: '',
         'subject': lambda self, cr, uid, ctx={}: False,
         'partner_ids': lambda self, cr, uid, ctx={}: [],
-        'notify': lambda self, cr, uid, ctx={}: False,
         'post': lambda self, cr, uid, ctx={}: True,
         'same_thread': lambda self, cr, uid, ctx={}: True,
     }
@@ -158,7 +163,7 @@ class mail_compose_message(osv.TransientModel):
 
         return super(mail_compose_message, self).check_access_rule(cr, uid, ids, operation, context=context)
 
-    def _notify(self, cr, uid, newid, context=None):
+    def _notify(self, cr, uid, newid, context=None, force_send=False, user_signature=True):
         """ Override specific notify method of mail.message, because we do
             not want that feature in the wizard. """
         return
@@ -235,9 +240,18 @@ class mail_compose_message(osv.TransientModel):
         for wizard in self.browse(cr, uid, ids, context=context):
             mass_mail_mode = wizard.composition_mode == 'mass_mail'
             active_model_pool = self.pool[wizard.model if wizard.model else 'mail.thread']
+            if not hasattr(active_model_pool, 'message_post'):
+                context['thread_model'] = wizard.model
+                active_model_pool = self.pool['mail.thread']
+
+            # wizard works in batch mode: [res_id] or active_ids or active_domain
+            if mass_mail_mode and wizard.use_active_domain and wizard.model:
+                res_ids = self.pool[wizard.model].search(cr, uid, eval(wizard.active_domain), context=context)
+            elif mass_mail_mode and wizard.model and active_ids:
+                res_ids = active_ids
+            else:
+                res_ids = [wizard.res_id]
 
-            # 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:
                 # mail.message values, according to the wizard options
                 post_values = {
@@ -257,13 +271,15 @@ class mail_compose_message(osv.TransientModel):
                         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'):
                         post_values['email_from'] = email_dict.pop('email_from')
                     # replies redirection: mass mailing only
                     if not wizard.same_thread:
                         post_values['reply_to'] = email_dict.pop('reply_to')
+                    else:
+                        email_dict.pop('reply_to')
+                    post_values.update(email_dict)
                 # clean the context (hint: mass mailing sets some default values that
                 # could be wrongly interpreted by mail_mail)
                 context.pop('default_email_to', None)
@@ -280,11 +296,10 @@ class mail_compose_message(osv.TransientModel):
                     elif mass_mail_mode:  # mass mail: is a log pushed to recipients unless specified, author not added
                         if not wizard.notify:
                             subtype = False
-                        context = dict(context, mail_create_nosubscribe=True)  # add context key to avoid subscribing the author
-                    msg_id = active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype=subtype, context=context, **post_values)
-                    # mass_mailing, post without notify: notify specific partners
-                    if mass_mail_mode and not wizard.notify and post_values['partner_ids']:
-                        self.pool.get('mail.notification')._notify(cr, uid, msg_id, post_values['partner_ids'], context=context)
+                        context = dict(context,
+                                    mail_notify_force_send=False,  # do not send emails directly but use the queue instead
+                                    mail_create_nosubscribe=True)  # add context key to avoid subscribing the author
+                    active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype=subtype, context=context, **post_values)
 
         return {'type': 'ir.actions.act_window_close'}
 
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 1ca07b6a94c..07d39bb0965 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -12,6 +12,9 @@
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
                         <field name="parent_id" invisible="1"/>
+                        <field name="mail_server_id" invisible="1"/>
+                        <field name="use_active_domain" invisible="1"/>
+                        <field name="active_domain" invisible="1"/>
                         <!-- visible wizard -->
                         <field name="email_from"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
diff --git a/addons/marketing_campaign/__init__.py b/addons/marketing_campaign/__init__.py
index 23796d1baaf..d37d8604380 100644
--- a/addons/marketing_campaign/__init__.py
+++ b/addons/marketing_campaign/__init__.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import marketing_campaign
-import res_partner
 import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index a51347fd1bb..0a37f8aae0b 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -59,7 +59,6 @@ input segments, workflow.
         'marketing_campaign_view.xml',
         'marketing_campaign_data.xml',
         'marketing_campaign_workflow.xml',
-        'res_partner_view.xml',
         'report/campaign_analysis_view.xml',
         'security/marketing_campaign_security.xml',
         'security/ir.model.access.csv'
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
deleted file mode 100644
index 63c65ccd97f..00000000000
--- a/addons/marketing_campaign/res_partner_view.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-         <!--  Partners inherited form -->  
-        <record id="view_workitem_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.workitem.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                   <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_campaign" string="Campaigns">
-                        <field name="workitem_ids" colspan="4" nolabel="1"/>
-                    </group>
-                </xpath>
-            </field>
-       </record>
-   </data>
-</openerp>
-
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index f6eb8a1d905..bdcbb984193 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -1,10 +1,10 @@
 <openerp>
     <data>
         <record id="action_dummy" model="ir.actions.server">
-            <field name="name">Dummy Action</field>
+            <field name="name">Dummy Python Code</field>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field name="state">dummy</field>
-            <field name="code"/>
+            <field name="state">code</field>
+            <field name="code">True</field>
             <field eval="5" name="sequence"/>
             <field eval="True" name="condition"/>
         </record>
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index b75284637c9..98e47f853fe 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -328,13 +328,13 @@ class Partner(osv.osv):
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
-                    }, help="""It indicates the membership state.
-                    -Non Member: A partner who has not applied for any membership.
-                    -Cancelled Member: A member who has cancelled his membership.
-                    -Old Member: A member whose membership date has expired.
-                    -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
-                    -Invoiced Member: A member whose invoice has been created.
-                    -Paying member: A member who has paid the membership fee."""),
+                    }, help='It indicates the membership state.\n'
+                            '-Non Member: A partner who has not applied for any membership.\n'
+                            '-Cancelled Member: A member who has cancelled his membership.\n'
+                            '-Old Member: A member whose membership date has expired.\n'
+                            '-Waiting Member: A member who has applied for the membership and whose invoice is going to be created.\n'
+                            '-Invoiced Member: A member whose invoice has been created.\n'
+                            '-Paying member: A member who has paid the membership fee.'),
         'membership_start': fields.function(
                     _membership_date, multi = 'membeship_start',
                     string = 'Membership Start Date', type = 'date',
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 6e025ae2d90..83f0a4f11eb 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -77,9 +77,9 @@ Dashboard / Reports for MRP will include:
     #TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company
     # so the ymls are too complex to change at this stage
     'test': [
-#         'test/order_demo.yml',
-#         'test/order_process.yml',
-#         'test/cancel_order.yml',
+         'test/order_demo.yml',
+         'test/order_process.yml',
+         'test/cancel_order.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/mrp/html/mrp_calendar.png b/addons/mrp/html/mrp_calendar.png
deleted file mode 100644
index a2d52775a0e..00000000000
Binary files a/addons/mrp/html/mrp_calendar.png and /dev/null differ
diff --git a/addons/mrp/html/mrp_list.png b/addons/mrp/html/mrp_list.png
deleted file mode 100644
index 5813c32e6b7..00000000000
Binary files a/addons/mrp/html/mrp_list.png and /dev/null differ
diff --git a/addons/mrp/html/mrp_mo.png b/addons/mrp/html/mrp_mo.png
deleted file mode 100644
index 6138973570f..00000000000
Binary files a/addons/mrp/html/mrp_mo.png and /dev/null differ
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 2722e28fee4..216c9f4d8b9 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/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-11-28 14:03+0000\n"
-"Last-Translator: hifly <Unknown>\n"
+"PO-Revision-Date: 2013-08-07 16:09+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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:02+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-08-08 04:39+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -69,7 +69,7 @@ msgstr "周期数"
 msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
-msgstr "最小库存规则允许系统在达到最小库存数量的时候立即创建补货单"
+msgstr "最小库存规则允许系统在达到最小库存数量的时会自动创建补货单"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -199,7 +199,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
@@ -286,7 +286,7 @@ msgstr "从一个生产订单生产几个产品"
 msgid ""
 "The selection of the right Bill of Material to use will depend on the "
 "properties specified on the sales order and the Bill of Material."
-msgstr ""
+msgstr "被正确使用的BOM依赖于销售单和BOM中指定的属性"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -294,7 +294,7 @@ msgid ""
 "When processing a sales order for this product, the delivery order\n"
 "                                will contain the raw materials, instead of "
 "the finished product."
-msgstr ""
+msgstr "当处理该产品的销售单时，发运单将以原料来替代成品"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -490,6 +490,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                创建新属性\n"
+"              </p><p>\n"
+"                当同一个产品有多种组成的方式，\n"
+"                OpenERP会根据属性来选择合适的BoM。\n"
+"                你可以给每个物料清单分配若干个属性，\n"
+"                当销售人员创建销售订单，根据需要指定几个属性，\n"
+"                然后OpenERP 会根据其来自动选择相应的BoM。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: view:mrp.production:0
@@ -499,7 +509,7 @@ msgid "Scheduled Date"
 msgstr "下单日期"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:124
+#: code:addons/mrp/procurement.py:129
 #, python-format
 msgid "Manufacturing Order <em>%s</em> created."
 msgstr "生产订单 <em>%s</em>  创建。"
@@ -684,7 +694,7 @@ msgid "Work Center Load"
 msgstr "工作中心负载"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:50
+#: code:addons/mrp/procurement.py:55
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr "该产品尚未定义物料清单！"
@@ -991,7 +1001,7 @@ msgid "BoM Type"
 msgstr "物料清单类型"
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:52
+#: code:addons/mrp/procurement.py:57
 #, python-format
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
@@ -1120,7 +1130,7 @@ msgstr "生产订单"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Awaiting Raw Materials"
-msgstr ""
+msgstr "等待原材料"
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -1629,6 +1639,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击创建属性组\n"
+"              </p><p>\n"
+"                可以定义特定的属性组用来分配到BoM和销售订单。\n"
+"                根据销售人员在销售订单上选取的属性，OpenERP可以\n"
+"                自动选择相应的BoM。\n"
+"              </p><p>\n"
+"                例如，在属性组“保修” ，你有两个属性：1年保修，3年保修。\n"
+"                根据销售订单上的选择，OpenERP会自动选择对应的BoM排单生产。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
@@ -1774,8 +1795,8 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
-"'废料' 模式会仅消耗对应成品数量的原材料而无产成品产出。\n"
-"'报工' 模式会消耗对应成品数量的原材料而且产出对应数量的产成品。"
+"'投料' 模式会仅消耗对应成品数量的原材料暂无产成品产出。\n"
+"'投料并产出' 模式会消耗对应成品数量的原材料并立即产出对应数量的产成品。"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1981,7 +2002,7 @@ msgstr "新建"
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr "废料"
+msgstr "投料"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2161,7 +2182,7 @@ msgstr "用户"
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr "报工"
+msgstr "投料并产出"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
@@ -2191,7 +2212,7 @@ msgstr "产品类型是可库存或消耗品"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Production Started"
-msgstr "生产开始了"
+msgstr "已开始生产"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 7fb40ce12af..82db2ace570 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -23,11 +23,12 @@ import time
 from datetime import datetime
 
 import openerp.addons.decimal_precision as dp
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
 from openerp.tools import float_compare
 from openerp.tools.translate import _
 from openerp import tools
+from openerp import SUPERUSER_ID
 
 #----------------------------------------------------------
 # Work Centers
@@ -405,12 +406,20 @@ class mrp_production(osv.osv):
         return result
 
     def _src_id_default(self, cr, uid, ids, context=None):
-        src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
-        return src_location_id.id
+        try:
+            location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+        except (orm.except_orm, ValueError):
+            location_id = False
+        return location_id
 
     def _dest_id_default(self, cr, uid, ids, context=None):
-        dest_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
-        return dest_location_id.id
+        try:
+            location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+        except (orm.except_orm, ValueError):
+            location_id = False
+        return location_id
 
     def _get_progress(self, cr, uid, ids, name, arg, context=None):
         """ Return product quantity percentage """
@@ -605,8 +614,12 @@ class mrp_production(osv.osv):
         prod_line_obj = self.pool.get('mrp.production.product.line')
         workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
         for production in self.browse(cr, uid, ids):
-            cr.execute('delete from mrp_production_product_line where production_id=%s', (production.id,))
-            cr.execute('delete from mrp_production_workcenter_line where production_id=%s', (production.id,))
+
+            p_ids = prod_line_obj.search(cr, SUPERUSER_ID, [('production_id', '=', production.id)], context=context)
+            prod_line_obj.unlink(cr, SUPERUSER_ID, p_ids, context=context)
+            w_ids = workcenter_line_obj.search(cr, SUPERUSER_ID, [('production_id', '=', production.id)], context=context)
+            workcenter_line_obj.unlink(cr, SUPERUSER_ID, w_ids, context=context)
+
             bom_point = production.bom_id
             bom_id = production.bom_id.id
             if not bom_point:
@@ -872,7 +885,7 @@ class mrp_production(osv.osv):
                     'move_id': shipment_move_id,
                     'company_id': production.company_id.id,
                 })
-        self.signal_button_confirm(cr, uid, [procurement_id])
+        procurement_order.signal_button_confirm(cr, uid, [procurement_id])
         return procurement_id
 
     def _make_production_internal_shipment_line(self, cr, uid, production_line, shipment_id, parent_move_id, destination_location_id=False, context=None):
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index a6b65b7c475..48e623c532e 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -21,7 +21,7 @@ This application supports complete integration and production scheduling for sto
         <record id="sequence_mrp_prod" model="ir.sequence">
             <field name="name">Production order</field>
             <field name="code">mrp.production</field>
-            <field name="prefix">MO/</field>
+            <field name="prefix">MO</field>
             <field name="padding">5</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2af1e876c70..47abeeaf9a9 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -189,7 +189,7 @@
                                     <field name="time_stop" widget="float_time"/>
                                 </group>
                                 <group string="Costing Information">
-                                    <field name="product_id" on_change="on_change_product_cost(product_id)"/>
+                                    <field name="product_id" on_change="on_change_product_cost(product_id)" context="{'default_supply_method':'produce'}"/>
                                     <field name="costs_hour"/>
                                     <field name="costs_hour_account_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="costs_cycle"/>
@@ -248,7 +248,7 @@
             <field name="model">mrp.routing.workcenter</field>
             <field name="arch" type="xml">
                 <form string="Routing Work Centers" version="7.0">
-                    <group col="4" string="General Information">
+                    <group col="4">
                         <field colspan="4" name="name"/>
                         <field name="sequence"/>
                         <field name="workcenter_id"/>
@@ -280,7 +280,7 @@
                     </group>
                     <notebook>
                         <page string="Work Center Operations">
-                            <field name="workcenter_lines"/>
+                            <field name="workcenter_lines" string="Operation"/>
                         </page>
                         <page string="Notes">
                             <field name="note"/>
@@ -440,7 +440,7 @@
             <field name="model">mrp.bom</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree string="Bill of Materials" colors="blue:method">
+                <tree string="Bill of Materials">
                     <field name="sequence" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="product_id"/>
@@ -448,7 +448,6 @@
                     <field name="product_uom" groups="product.group_uom"/>
                     <field name="code"/>
                     <field name="type"/>
-                    <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
@@ -460,19 +459,18 @@
             <field name="model">mrp.bom</field>
             <field name="field_parent">child_complete_ids</field>
             <field name="arch" type="xml">
-                <tree string="BoM Structure" colors="blue:method">
+                <tree string="BoM Structure">
                     <field name="sequence" invisible="1"/>
                     <field name="name" groups="base.group_no_one"/>
                     <field name="code"/>
                     <field name="product_id"/>
-                    <field name="bom_id"/>
+                    <field name="bom_id" groups="product.group_mrp_properties"/>
                     <field name="product_qty"/>
                     <field name="product_uom" groups="product.group_uom"/>
                     <field name="type"/>
-                    <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
+                    <field name="date_start" groups="product.group_mrp_properties"/>
+                    <field name="date_stop" groups="product.group_mrp_properties"/>
                 </tree>
             </field>
         </record>
@@ -545,6 +543,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
             <field name="domain">[('bom_id', '=',active_ids)]</field>
+            <field name="view_type">tree</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
@@ -620,8 +619,8 @@
                 <form string="Manufacturing Orders" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
-                    <button name="%(act_mrp_product_produce)d" states="confirmed,ready,in_production" string="Produce" type="action" class="oe_highlight"/>
-                    <button name="force_production" states="confirmed" string="Force Reservation" type="object"/>
+                    <button name="%(act_mrp_product_produce)d" states="ready,in_production" string="Produce" type="action" class="oe_highlight"/>
+                    <button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_highlight"/>
                     <button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
                     <button name="button_produce" states="ready" string="Mark as Started"/>
                     <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
@@ -974,7 +973,7 @@
         <!-- Menu for Resource for MRP-->
 
         <record id="mrp_workcenter_action" model="ir.actions.act_window">
-            <field name="name">Work Center</field>
+            <field name="name">Work Centers</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.workcenter</field>
             <field name="view_type">form</field>
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 22a14addcd1..7343990a32f 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -36,7 +36,7 @@ class mrp_config_settings(osv.osv_memory):
                     * Repair quotation report
                     * Notes for the technician and for the final customer.
                 This installs the module mrp_repair."""),
-        'module_mrp_operations': fields.boolean("Allow detailed planning of work order",
+        'module_mrp_operations': fields.boolean("Allow detailed planning of work orders",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
         'module_mrp_byproduct': fields.boolean("Produce several products from one manufacturing order",
@@ -60,7 +60,7 @@ class mrp_config_settings(osv.osv_memory):
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
                 within your work centers in order to produce a product. They are attached to bills of materials
                 that will define the required raw materials."""),
-        'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties",
+        'group_mrp_properties': fields.boolean("Allow several bill of materials per product using properties",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the properties specified on the sales order and the Bill of Material."""),
         'module_product_manufacturer': fields.boolean("Define manufacturers on products ",
diff --git a/addons/mrp/html/coppernic.png b/addons/mrp/static/description/coppernic.png
similarity index 100%
rename from addons/mrp/html/coppernic.png
rename to addons/mrp/static/description/coppernic.png
diff --git a/addons/mrp/static/src/img/icon.png b/addons/mrp/static/description/icon.png
similarity index 100%
rename from addons/mrp/static/src/img/icon.png
rename to addons/mrp/static/description/icon.png
diff --git a/addons/mrp/html/index.html b/addons/mrp/static/description/index.html
similarity index 97%
rename from addons/mrp/html/index.html
rename to addons/mrp/static/description/index.html
index 5777eb5f147..d44da3f37b1 100644
--- a/addons/mrp/html/index.html
+++ b/addons/mrp/static/description/index.html
@@ -20,7 +20,7 @@ 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>
+                <a href="http://www.openerp.com/start?app=mrp" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/mrp/html/manufacturing_illu_01.png b/addons/mrp/static/description/manufacturing_illu_01.png
similarity index 100%
rename from addons/mrp/html/manufacturing_illu_01.png
rename to addons/mrp/static/description/manufacturing_illu_01.png
diff --git a/addons/mrp/html/manufacturing_illu_02.png b/addons/mrp/static/description/manufacturing_illu_02.png
similarity index 100%
rename from addons/mrp/html/manufacturing_illu_02.png
rename to addons/mrp/static/description/manufacturing_illu_02.png
diff --git a/addons/mrp/html/mrp_bom.png b/addons/mrp/static/description/mrp_bom.png
similarity index 100%
rename from addons/mrp/html/mrp_bom.png
rename to addons/mrp/static/description/mrp_bom.png
diff --git a/addons/mrp/static/description/mrp_calendar.png b/addons/mrp/static/description/mrp_calendar.png
new file mode 100644
index 00000000000..b8afb51443b
Binary files /dev/null and b/addons/mrp/static/description/mrp_calendar.png differ
diff --git a/addons/mrp/html/mrp_gantt.png b/addons/mrp/static/description/mrp_gantt.png
similarity index 100%
rename from addons/mrp/html/mrp_gantt.png
rename to addons/mrp/static/description/mrp_gantt.png
diff --git a/addons/mrp/html/mrp_integrate.png b/addons/mrp/static/description/mrp_integrate.png
similarity index 100%
rename from addons/mrp/html/mrp_integrate.png
rename to addons/mrp/static/description/mrp_integrate.png
diff --git a/addons/mrp/static/description/mrp_list.png b/addons/mrp/static/description/mrp_list.png
new file mode 100644
index 00000000000..39b249fdcf2
Binary files /dev/null and b/addons/mrp/static/description/mrp_list.png differ
diff --git a/addons/mrp/static/description/mrp_mo.png b/addons/mrp/static/description/mrp_mo.png
new file mode 100644
index 00000000000..90417cedf83
Binary files /dev/null and b/addons/mrp/static/description/mrp_mo.png differ
diff --git a/addons/mrp/html/mrp_product.png b/addons/mrp/static/description/mrp_product.png
similarity index 100%
rename from addons/mrp/html/mrp_product.png
rename to addons/mrp/static/description/mrp_product.png
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index acbfea48182..801f20f0747 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -94,6 +94,11 @@
                 procurement_ids = procurement.search(cr, uid, [('move_id','=',move_line.id)])
                 assert procurement_ids, "Procurement should be created for shipment line of raw materials."
                 shipment_procurement = procurement.browse(cr, uid, procurement_ids[0], context=context)
+                # procurement state should be `confirmed` at this stage, except if mrp_jit is installed, in which
+                # case it could already be in `running` or `exception` state (not enough stock)
+                expected_states = ('confirmed', 'running', 'exception')
+                assert shipment_procurement.state in expected_states, 'Procurement state is `%s` for %s, expected one of %s' % \
+                    (shipment_procurement.state, shipment_procurement.product_id.name, expected_states)
                 assert shipment_procurement.date_planned == date_planned, "Planned date is not correspond in procurement."
                 assert shipment_procurement.product_id.id == order_line.product_id.id, "Product is not correspond in procurement."
                 assert shipment_procurement.product_qty == order_line.product_qty, "Qty is not correspond in procurement."
@@ -157,9 +162,9 @@
     scrap_location_id = scrap_location_ids[0]
     order = self.browse(cr, uid, ref("mrp_production_test1"))
     for move in order.move_lines:
-        move.action_consume(move.product_qty)
         if move.product_id.id == ref("product.product_product_6"):
             move.action_scrap(5.0, scrap_location_id)
+        move.action_consume(move.product_qty)
 -
   I produce product.
 -
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index d6f026530dc..52fdda1a7b2 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -128,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)
@@ -246,6 +246,7 @@ class mrp_production(osv.osv):
         """ Cancels work order if production order is canceled.
         @return: Super method
         """
+        workcenter_pool = self.pool.get('mrp.production.workcenter.line')
         obj = self.browse(cr, uid, ids,context=context)[0]
         for workcenter_line in obj.workcenter_lines:
             workcenter_pool.signal_button_cancel(cr, uid, [workcenter_line.id])
@@ -443,7 +444,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:
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 43ee34b0c05..9d812e06547 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -347,8 +347,9 @@ class mrp_repair(osv.osv):
         return self.write(cr,uid,ids,{'state':'cancel'})
 
     def wkf_invoice_create(self, cr, uid, ids, *args):
-        return self.action_invoice_create(cr, uid, ids)
-
+        self.action_invoice_create(cr, uid, ids)
+        return True
+        
     def action_invoice_create(self, cr, uid, ids, group=False, context=None):
         """ Creates invoice(s) for repair order.
         @param group: It is set to true when group invoice is to be generated.
@@ -365,7 +366,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 +583,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.'
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index a4526b5b581..b7a667ce308 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -31,7 +31,7 @@
                    <button name="repair_ready" states="confirmed,ready" string="Start Repair" class="oe_highlight"/>
                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                    <button name="action_repair_end" states="under_repair" string="End Repair" class="oe_highlight"/>
-                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
+                   <button name="action_invoice_create" states="2binvoiced" string="Create Invoice" class="oe_highlight"/>
                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                    <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
                    <button name="action_cancel" string="Cancel Repair" type="object" attrs="{'invisible':['|',('invoice_method','!=','none'), ('state', 'not in',('confirmed','2binvoiced','ready','under_repair', 'invoice_except'))]}"/>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 21d71064901..9c14728bc05 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -21,7 +21,7 @@
             </field>
         </record>
 
-        <act_window name="Make Invoice"            
+        <act_window name="Create Invoice"            
             res_model="mrp.repair.make_invoice"
             src_model="mrp.repair"
             view_mode="form"
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/note/i18n/bs.po b/addons/note/i18n/bs.po
new file mode 100644
index 00000000000..d31dd1870f0
--- /dev/null
+++ b/addons/note/i18n/bs.po
@@ -0,0 +1,284 @@
+# Bosnian 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-08-06 16:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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-08-07 04:46+0000\n"
+"X-Generator: Launchpad (build 16721)\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/static/src/img/icon.png b/addons/note/static/description/icon.png
similarity index 100%
rename from addons/note/static/src/img/icon.png
rename to addons/note/static/description/icon.png
diff --git a/addons/note/html/index.html b/addons/note/static/description/index.html
similarity index 97%
rename from addons/note/html/index.html
rename to addons/note/static/description/index.html
index 7ef37c646e9..dc688859334 100644
--- a/addons/note/html/index.html
+++ b/addons/note/static/description/index.html
@@ -15,7 +15,7 @@
 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>
+                <a href="http://www.openerp.com/start?app=note" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/note/html/notes_illu_01.png b/addons/note/static/description/notes_illu_01.png
similarity index 100%
rename from addons/note/html/notes_illu_01.png
rename to addons/note/static/description/notes_illu_01.png
diff --git a/addons/note/html/notes_sc_00.png b/addons/note/static/description/notes_sc_00.png
similarity index 100%
rename from addons/note/html/notes_sc_00.png
rename to addons/note/static/description/notes_sc_00.png
diff --git a/addons/note/html/notes_sc_01.png b/addons/note/static/description/notes_sc_01.png
similarity index 100%
rename from addons/note/html/notes_sc_01.png
rename to addons/note/static/description/notes_sc_01.png
diff --git a/addons/note/html/notes_sc_02.png b/addons/note/static/description/notes_sc_02.png
similarity index 100%
rename from addons/note/html/notes_sc_02.png
rename to addons/note/static/description/notes_sc_02.png
diff --git a/addons/note/html/notes_sc_03.png b/addons/note/static/description/notes_sc_03.png
similarity index 100%
rename from addons/note/html/notes_sc_03.png
rename to addons/note/static/description/notes_sc_03.png
diff --git a/addons/note_pad/i18n/vi.po b/addons/note_pad/i18n/vi.po
new file mode 100644
index 00000000000..76bed331d8a
--- /dev/null
+++ b/addons/note_pad/i18n/vi.po
@@ -0,0 +1,28 @@
+# Vietnamese 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-27 16:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Ghi chú"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Đường dẫn Pad"
diff --git a/addons/pad_project/project_task.xml b/addons/pad_project/project_task.xml
index 24efbc9dad0..c8cbbe1c626 100644
--- a/addons/pad_project/project_task.xml
+++ b/addons/pad_project/project_task.xml
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="description" position="replace">
-                    <field name="description_pad" attrs="{'readonly':[('state','=','done')]}" widget="pad"/>
+                    <field name="description_pad" widget="pad"/>
                 </field>
             </field>
         </record>
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index b189c8f204a..db5d5a25018 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -4,29 +4,31 @@ import simplejson
 import os
 import openerp
 
+from openerp.addons.web import http
+from openerp.addons.web.http import request
 from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
 
-class PointOfSaleController(openerp.addons.web.http.Controller):
-    _cp_path = '/pos'
+class PointOfSaleController(http.Controller):
 
-    @openerp.addons.web.http.httprequest
-    def app(self, req, s_action=None, **kw):
-        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js'))
-        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css'))
+    @http.route('/pos/app', type='http', auth='admin')
+    def app(self):
+        js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list('js',db=request.db))
+        css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list('css',db=request.db))
 
-        cookie = req.httprequest.cookies.get("instance0|session_id")
+        cookie = request.httprequest.cookies.get("instance0|session_id")
         session_id = cookie.replace("%22","")
-        template = html_template.replace('<html','<html manifest="/pos/manifest?session_id=%s"'%session_id)
+        template = html_template.replace('<html','<html manifest="/pos/manifest?session_id=%s"' % request.session_id)
+
         r = template % {
             'js': js,
             'css': css,
-            'modules': simplejson.dumps(module_boot(req)),
+            'modules': simplejson.dumps(module_boot(request)),
             'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
         }
         return r
 
-    @openerp.addons.web.http.httprequest
-    def manifest(self, req, **kwargs):
+    @http.route('/pos/manifest',type='http', auth='admin')
+    def manifest(self):
         """ This generates a HTML5 cache manifest files that preloads the categories and products thumbnails 
             and other ressources necessary for the point of sale to work offline """
 
@@ -45,16 +47,16 @@ class PointOfSaleController(openerp.addons.web.http.Controller):
         imgdir = openerp.modules.get_module_resource('point_of_sale','static/src/img');
         load_css_img(imgdir,'/point_of_sale/static/src/img')
         
-        products = req.session.model('product.product')
-        for p in products.search_read([('pos_categ_id','!=',False)], ['name']):
+        products = request.registry.get('product.product')
+        for p in products.search_read(request.cr, request.uid, [('pos_categ_id','!=',False)], ['name']):
             product_id = p['id']
-            url = "/web/binary/image?session_id=%s&model=product.product&field=image&id=%s" % (req.session_id, product_id)
+            url = "/web/binary/image?session_id=%s&model=product.product&field=image&id=%s" % (request.session_id, product_id)
             ml.append(url)
         
-        categories = req.session.model('pos.category')
-        for c in categories.search_read([],['name']):
+        categories = request.registry.get('pos.category')
+        for c in categories.search_read(request.cr, request.uid, [], ['name']):
             category_id = c['id']
-            url = "/web/binary/image?session_id=%s&model=pos.category&field=image&id=%s" % (req.session_id, category_id)
+            url = "/web/binary/image?session_id=%s&model=pos.category&field=image&id=%s" % (request.session_id, category_id)
             ml.append(url)
 
         ml += ["NETWORK:","*"]
@@ -62,108 +64,103 @@ class PointOfSaleController(openerp.addons.web.http.Controller):
 
         return m
 
-    @openerp.addons.web.http.jsonrequest
-    def dispatch(self, request, iface, **kwargs):
-        method = 'iface_%s' % iface
-        return getattr(self, method)(request, **kwargs)
-
-    @openerp.addons.web.http.jsonrequest
-    def scan_item_success(self, request, ean):
+    @http.route('/pos/scan_item_success', type='json', auth='admin')
+    def scan_item_success(self, ean):
         """
         A product has been scanned with success
         """
         print 'scan_item_success: ' + str(ean)
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def scan_item_error_unrecognized(self, request, ean):
+    @http.route('/pos/scan_item_error_unrecognized')
+    def scan_item_error_unrecognized(self, ean):
         """
         A product has been scanned without success
         """
         print 'scan_item_error_unrecognized: ' + str(ean)
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def help_needed(self, request):
+    @http.route('/pos/help_needed', type='json', auth='admin')
+    def help_needed(self):
         """
         The user wants an help (ex: light is on)
         """
         print "help_needed"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def help_canceled(self, request):
+    @http.route('/pos/help_canceled', type='json', auth='admin')
+    def help_canceled(self):
         """
         The user stops the help request
         """
         print "help_canceled"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def weighting_start(self, request):
+    @http.route('/pos/weighting_start', type='json', auth='admin')
+    def weighting_start(self):
         print "weighting_start"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def weighting_read_kg(self, request):
+    @http.route('/pos/weighting_read_kg', type='json', auth='admin')
+    def weighting_read_kg(self):
         print "weighting_read_kg"
-        return 0.0
+        return 3.14
 
-    @openerp.addons.web.http.jsonrequest
-    def weighting_end(self, request):
+    @http.route('/pos/weighting_end', type='json', auth='admin')
+    def weighting_end(self):
         print "weighting_end"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def payment_request(self, request, price):
+    @http.route('/pos/payment_request', type='json', auth='admin')
+    def payment_request(self, price):
         """
         The PoS will activate the method payment 
         """
         print "payment_request: price:"+str(price)
         return 'ok'
 
-    @openerp.addons.web.http.jsonrequest
-    def payment_status(self, request):
+    @http.route('/pos/payment_status', type='json', auth='admin')
+    def payment_status(self):
         print "payment_status"
         return { 'status':'waiting' } 
 
-    @openerp.addons.web.http.jsonrequest
-    def payment_cancel(self, request):
+    @http.route('/pos/payment_cancel', type='json', auth='admin')
+    def payment_cancel(self):
         print "payment_cancel"
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def transaction_start(self, request):
+    @http.route('/pos/transaction_start', type='json', auth='admin')
+    def transaction_start(self):
         print 'transaction_start'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def transaction_end(self, request):
+    @http.route('/pos/transaction_end', type='json', auth='admin')
+    def transaction_end(self):
         print 'transaction_end'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def cashier_mode_activated(self, request):
+    @http.route('/pos/cashier_mode_activated', type='json', auth='admin')
+    def cashier_mode_activated(self):
         print 'cashier_mode_activated'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def cashier_mode_deactivated(self, request):
+    @http.route('/pos/cashier_mode_deactivated', type='json', auth='admin')
+    def cashier_mode_deactivated(self):
         print 'cashier_mode_deactivated'
         return 
 
-    @openerp.addons.web.http.jsonrequest
-    def open_cashbox(self, request):
+    @http.route('/pos/open_cashbox', type='json', auth='admin')
+    def open_cashbox(self):
         print 'open_cashbox'
         return
 
-    @openerp.addons.web.http.jsonrequest
-    def print_receipt(self, request, receipt):
+    @http.route('/pos/print_receipt', type='json', auth='admin')
+    def print_receipt(self, receipt):
         print 'print_receipt' + str(receipt)
         return
 
-    @openerp.addons.web.http.jsonrequest
-    def print_pdf_invoice(self, request, pdfinvoice):
+    @http.route('/pos/print_pdf_invoice', type='json', auth='admin')
+    def print_pdf_invoice(self, pdfinvoice):
         print 'print_pdf_invoice' + str(pdfinvoice)
         return
 
diff --git a/addons/point_of_sale/i18n/he.po b/addons/point_of_sale/i18n/he.po
new file mode 100644
index 00000000000..31f12afc166
--- /dev/null
+++ b/addons/point_of_sale/i18n/he.po
@@ -0,0 +1,4053 @@
+# Hebrew 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-09 16:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@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-11 05:40+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr "מס' מוצר"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr "מחיר לפי יום"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.pos_category_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new category.\n"
+"              </p><p>\n"
+"                Categories are used to browse your products through the\n"
+"                touchscreen interface.\n"
+"              </p><p>\n"
+"                If you put a photo on the category, the layout of the\n"
+"                touchscreen interface will automatically. We suggest not to "
+"put\n"
+"                a photo on categories for small (1024x768) screens.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               לחץ כדי להגדיר קטגוריה חדש.\n"
+"              </p><p>\n"
+"               קטגרויות נועדו לכך שתוכל לנווט במוצרים שלך\n"
+"               באמצעות מסך המגע.\n"
+"              </p><p>\n"
+"               במידה ותבחר תמונה עבור הקטגוריה תראה אותה בקטלוג\n"
+"               מוצרים בתוך הקופה שלך. אנו מציעים לא להשתמש בתמונות\n"
+"               עבור מסכים קטנים כגון 1024X768.\n"
+"            </p>\n"
+"            "
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the Receipt of the Sale"
+msgstr "הדפס קבלה עבור המכירה"
+
+#. module: point_of_sale
+#: field:pos.session,cash_register_balance_end:0
+msgid "Computed Balance"
+msgstr "יתרה מחושבת"
+
+#. module: point_of_sale
+#: view:pos.session:0
+#: view:report.pos.order:0
+msgid "Today"
+msgstr "נוכחי"
+
+#. module: point_of_sale
+#: field:pos.config,iface_electronic_scale:0
+msgid "Electronic Scale Interface"
+msgstr "ממשק משקל דיגיטלי"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.plain_water
+msgid "Plain Water"
+msgstr "מיים רגילים"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.poire_conference_product_template
+msgid "Conference pears"
+msgstr "אגסים"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:398
+#, python-format
+msgid "&atilde;"
+msgstr "&atilde;"
+
+#. module: point_of_sale
+#: field:pos.config,journal_id:0
+#: field:pos.order,sale_journal:0
+msgid "Sale Journal"
+msgstr "יומן מכירות"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_2l_product_template
+msgid "Spa Reine 2L"
+msgstr "ספא רני 2 ליטר"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Details of Sales"
+msgstr "פרטי מכירות"
+
+#. module: point_of_sale
+#: constraint:pos.config:0
+msgid "You cannot have two cash controls in one Point Of Sale !"
+msgstr "לא ניתן לשייך שתי בקרי מזומן לקופה רושמת אחת!"
+
+#. module: point_of_sale
+#: field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0
+#: field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0
+#: field:report.pos.order,user_id:0
+msgid "Salesperson"
+msgstr "איש מכירות"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,day:0
+msgid "Day"
+msgstr "יום"
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,product_name:0
+#: field:report.sales.by.margin.pos.month,product_name:0
+msgid "Product Name"
+msgstr "שם המוצר"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template
+msgid "Red grapefruit"
+msgstr "אשכולית אדומה"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1373
+#, python-format
+msgid "Assign a Custom EAN"
+msgstr "שייך מספר סידורי מותאם אישית"
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid ""
+"You may have to control your cash amount in your cash register, before\n"
+"                          being able to start selling through the "
+"touchscreen interface."
+msgstr ""
+"יתכן ותצתרך לעשות ספירת מזומנים, לפני\n"
+"                          שתוכל להתחיל למכור באמצעות קופה רושמת."
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: field:pos.box.entries,amount:0
+#: report:pos.invoice:0
+#: field:pos.make.payment,amount:0
+#: report:pos.user.product:0
+#: field:report.transaction.pos,amount:0
+msgid "Amount"
+msgstr "סכום"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_box_out
+#: view:pos.session:0
+msgid "Take Money Out"
+msgstr "הוצא את הכסף"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:105
+#, python-format
+msgid "not used"
+msgstr "לא בשימוש"
+
+#. module: point_of_sale
+#: field:pos.config,iface_vkeyboard:0
+msgid "Virtual KeyBoard Interface"
+msgstr "ממשק מקלדת וירטואלית"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:96
+#, python-format
+msgid "+/-"
+msgstr "+/-"
+
+#. module: point_of_sale
+#: field:pos.ean_wizard,ean13_pattern:0
+msgid "Reference"
+msgstr "ייחוס"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1083
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#, python-format
+msgid "Tax"
+msgstr "מס"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "תאריך התחלה"
+
+#. module: point_of_sale
+#: constraint:pos.session:0
+msgid "You cannot create two active sessions with the same responsible!"
+msgstr "אתה לא יכול ליצור שני מפגשים פעילים עם אותו אחראי!"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:473
+#, python-format
+msgid "Weighting"
+msgstr "שוקל"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fenouil_fenouil_product_template
+msgid "Fennel"
+msgstr "שומר"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:472
+#, python-format
+msgid "Help needed"
+msgstr "צריך עזרה"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:760
+#, python-format
+msgid "Configuration Error!"
+msgstr "שגיאת הגדרות!"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.model,name:point_of_sale.model_res_partner
+#: field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "שותף"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Closing Cash Control"
+msgstr "סגירת קופת מזומנים"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total of the day"
+msgstr "סה\"כ ליום"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,average_price:0
+msgid "Average Price"
+msgstr "מחיר ממוצע"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Accounting Information"
+msgstr "פרטי חשבון"
+
+#. module: point_of_sale
+#: field:pos.session.opening,show_config:0
+msgid "Show Config"
+msgstr "הצג הגדרות"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "תיאור  (%)"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total discount"
+msgstr "סה\"כ הנחה"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:441
+#, python-format
+msgid "Debug Window"
+msgstr "חלון ניפוי שגיאות"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:241
+#: code:addons/point_of_sale/static/src/xml/pos.xml:613
+#, python-format
+msgid "Change:"
+msgstr "עודף:"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_2l_product_template
+msgid "Coca-Cola Regular 2L"
+msgstr "קוקה קולה רגילה 2 ליטר"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr "מכירות לפי חודש"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda_orange
+msgid "Orange"
+msgstr "תפוז"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+msgid "Sales by User"
+msgstr "מכירות למשתמש"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Disc.(%)"
+msgstr "תיאור (%)"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1031
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr "אנה הגדר חשבון הכנסות עבור מוצר זה: \"%s\" (id:%d)"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,price_total:0
+msgid "Total Price"
+msgstr "סה\"כ מחיר"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
+msgid "Leffe Brune 33cl"
+msgstr "לף קהה 330 מ\"ל"
+
+#. module: point_of_sale
+#: help:pos.config,iface_self_checkout:0
+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 ""
+"סמן כאן במידה וקופה זה תומכת ברכישה אצמעית. במידה ולא סומן, OpenERP יגדיר "
+"קופה רגילה כברירת מחדל."
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
+#: report:pos.sales.user:0
+msgid "Sales Report"
+msgstr "דוח מכירות"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beverage
+msgid "Beverages"
+msgstr "משקאות"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_session_opening
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_session_opening
+msgid "Your Session"
+msgstr "חשבון מכירות שלך"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_50cl_product_template
+msgid "Stella Artois 50cl"
+msgstr "סטלה ארטוס 0.5 ליטר"
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "Dates"
+msgstr "תאריכים"
+
+#. module: point_of_sale
+#: field:pos.category,parent_id:0
+msgid "Parent Category"
+msgstr "קטגוריית אב"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:482
+#, python-format
+msgid "Open Cashbox"
+msgstr "פתח מגירה"
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "Select your Point of Sale"
+msgstr "אנה בחר את הקופה שלך"
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,total:0
+#: field:report.sales.by.margin.pos.month,total:0
+msgid "Margin"
+msgstr "שוליים"
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0
+#: field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "הנחה (%)"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_speciale_product_template
+msgid "Dr. Oetker Ristorante Speciale"
+msgstr "דר. אוייטקר מומחה מסעדנות"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:480
+#, python-format
+msgid "Payment Request"
+msgstr "בקשת תשלום"
+
+#. module: point_of_sale
+#: field:product.product,to_weight:0
+msgid "To Weight"
+msgstr "עבור משקל"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:476
+#, python-format
+msgid "Hardware Events"
+msgstr "איורעי חומרה"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:301
+#, python-format
+msgid "You should assign a Point of Sale to your session."
+msgstr "הינך חייב לבחור קופה לחשבון המכירות שלך"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "כמות כוללת"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
+msgid "Fanta Orange 33cl"
+msgstr "פאנטה תופזים 330 מ\"ל"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:423
+#, python-format
+msgid ""
+"Please set your profit and loss accounts on your payment method '%s'. This "
+"will allow OpenERP to post the difference of %.2f in your ending balance. To "
+"close this session, you can update the 'Closing Cash Control' to avoid any "
+"difference."
+msgstr ""
+"אנה בחר חשבון הרווח וההפסד שלך עבור שיתת תשלום '%s'. זה יאפשר לOpenERP להזין "
+"הפרשי %.2f בתוך חשבון הסופי שלך. על מנת לסגור חשבון מכירות זה, אתה יכול "
+"לעדכן את 'סיגרת קופת מזומנים' על מנת לא לגרום להפרשים."
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:514
+#, python-format
+msgid "error!"
+msgstr "שגיא!"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
+msgid "Sales by User Monthly"
+msgstr "מכירות חודשיות לפי משתמש"
+
+#. module: point_of_sale
+#: help:pos.session,cash_register_difference:0
+msgid ""
+"Difference between the counted cash control at the closing and the computed "
+"balance."
+msgstr "הפרשים בין ספירה ידנית לספירה ממוחשבת."
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid ") is \""
+msgstr ") הוא \""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.Onions_product_template
+msgid "Onions"
+msgstr "בצלים"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Validate & Open Session"
+msgstr "אמת ופתח יומן מכירות"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:99
+#: selection:pos.session,state:0
+#: selection:pos.session.opening,pos_state:0
+#, python-format
+msgid "In Progress"
+msgstr "בתהליך"
+
+#. module: point_of_sale
+#: view:pos.session:0
+#: field:pos.session,opening_details_ids:0
+msgid "Opening Cash Control"
+msgstr "פתח קופת מזומנים"
+
+#. module: point_of_sale
+#: help:res.users,ean13:0
+msgid "BarCode"
+msgstr "ברקוד"
+
+#. module: point_of_sale
+#: help:pos.category,image_medium:0
+msgid ""
+"Medium-sized image of the category. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved. Use this field in form views "
+"or some kanban views."
+msgstr ""
+"תמונה בגודל בינוני עבור קטגוריה זו. התמונות יוקטנו אוטומטית לגודל 128X128 "
+"פיקסל, תוך כדי שמירה על יחס התמונה."
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "Open Session"
+msgstr "פתח הפעלה"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr "פעולות יומיות"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:42
+#, python-format
+msgid "Google Chrome"
+msgstr "גוגל כרום"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.sparkling_water
+msgid "Sparkling Water"
+msgstr "מים מוגזים"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr "חיפוש דוחות מזומנים"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:pos.config,state:0
+#: view:pos.order:0
+#: field:pos.order,state:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: field:pos.session,state:0
+#: field:pos.session.opening,pos_state_str:0
+#: field:report.pos.order,state:0
+msgid "Status"
+msgstr "סטטוס"
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "August"
+msgstr "אוגוסט"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template
+msgid "Pepsi Max Cool Lemon 33cl"
+msgstr "פפסי מקס בטעם לימון 330 מ\"ל"
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "June"
+msgstr "יוני"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "שורת הזמנה בקופה"
+
+#. module: point_of_sale
+#: view:pos.config:0
+msgid "Point of Sale Configuration"
+msgstr "הגדרות קופה רושמת"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:359
+#, python-format
+msgid "Your order has to be validated by a cashier."
+msgstr "הזמנת חייבת לעבור עימות על ידי קופאי"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
+msgid "Fanta Orange 50cl"
+msgstr "פנטה תפוזים 0.5 ליטר"
+
+#. module: point_of_sale
+#: field:pos.category,child_id:0
+msgid "Children Categories"
+msgstr "קטגוריות ילדים"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_pos_session
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to start a new session.\n"
+"              </p><p>\n"
+"                A session is a period of time, usually one day, during "
+"which\n"
+"                you sell through the point of sale. The user has to check "
+"the\n"
+"                currencies in your cash registers at the beginning and the "
+"end\n"
+"                of each session.\n"
+"              </p><p>\n"
+"                Note that you should better to use the menu <i>Your "
+"Session</i>\n"
+"                to quickly open a new session.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                לחץ כאן על מנת לפתוח יומן מכירות חדש.\n"
+"              </p><p>\n"
+"                יומן מכירות הינה תקופת עבודה בקופה, בדרך כלל\n"
+"                יום מכירות אחד, באה הינך מוכר באמצעות הקופה.\n"
+"                משתמש חייב לבחור מטבעה בכל תחילת וסוף יום.\n"
+"              </p><p>\n"
+"                שים לב, עדיף שתשתמש ב <i>יומן מכירות שלך</i>\n"
+"                על מנת לפתוח במהירות יומן מכירות.\n"
+"              </p>\n"
+"            "
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:888
+#, python-format
+msgid "Customer Invoice"
+msgstr "חשבונית לקוח"
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid ""
+"You can continue sales from the touchscreen interface by clicking on \"Start "
+"Selling\" or close the cash register session."
+msgstr ""
+"הינך יכול להמשיך את המכירות שלך על ידי לחיצה על \"התחל למכור\" או לסגור את "
+"יומן המכירות הנוכחי."
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: field:pos.session,stop_at:0
+msgid "Closing Date"
+msgstr "תריך סגירה"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Opening Cashbox Lines"
+msgstr "שורת פתיחה של קופת מזומנים"
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "October"
+msgstr "אוקטובר"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_1l_product_template
+msgid "Coca-Cola Light 1L"
+msgstr "קוקה קולה דיאט 1 ליטר"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Summary"
+msgstr "סיכום"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
+msgid "Lays Natural 45g"
+msgstr "לייס בטעם טבעי 45 גר'"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
+msgid "Chaudfontaine 50cl"
+msgstr "Chaudfontaine 50 מ\"ל"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
+msgid "Quantity"
+msgstr "כמות"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line No"
+msgstr "שורה מס'"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:453
+#, python-format
+msgid "Set Weight"
+msgstr "קבע משקל"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "תקופה"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Net Total:"
+msgstr "סה\"כ נטו:"
+
+#. module: point_of_sale
+#: model:ir.actions.client,name:point_of_sale.action_client_pos_menu
+msgid "Open POS Menu"
+msgstr "פתח תפריט קופה"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr "צורת תשלום"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Post POS Journal Entries"
+msgstr "הזן ערך לתוך יומן"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:457
+#, python-format
+msgid "Barcode Scanner"
+msgstr "סורק ברקודים"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
+msgid "Granny Smith apples"
+msgstr "תפוחי ספתה טובה"
+
+#. module: point_of_sale
+#: help:product.product,expense_pdt:0
+msgid ""
+"Check if, this is a product you can use to take cash from a statement for "
+"the point of sale backend, example: money lost, transfer to bank, etc."
+msgstr ""
+"סמן כאן במידה ומוצר זה יכול להשתמש ביתרה מיוחדת כגון: חוב אבוד, העבורת לבנק "
+"וכו'."
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "סה\"כ הנחה"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:39
+#, python-format
+msgid ""
+"The Point of Sale is not supported by Microsoft Internet Explorer. Please "
+"use\n"
+"                        a modern browser like"
+msgstr ""
+"קופה רושמת זו אינה תומכת באינטרנט אקספלורר, אנה השתמש בדפדפן\n"
+"                        מודרני יותר על מנת להשתמש בקופה רושמת."
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "Click to start a session."
+msgstr "הקלק על מנת לפתוח יומן מכירות"
+
+#. module: point_of_sale
+#: view:pos.details:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+msgid "Print Report"
+msgstr "הדפס דוח"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_bolognese_product_template
+msgid "Dr. Oetker Ristorante Bolognese"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pizza
+msgid "Pizza"
+msgstr "פיצה"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr "= יתרה טאורטית"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:85
+#: code:addons/point_of_sale/wizard/pos_return.py:240
+#, python-format
+msgid "Add Product"
+msgstr "הוסף מוצר"
+
+#. module: point_of_sale
+#: field:pos.config,name:0
+msgid "Point of Sale Name"
+msgstr "שם קופה רושמת"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr "סכום חשבונית"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.coke
+msgid "Coke"
+msgstr "קוקה קולה"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr "טל:"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:254
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#, python-format
+msgid "Receipt"
+msgstr "קבלה"
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,net_margin_per_qty:0
+#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
+msgid "Net margin per Qty"
+msgstr "רווח נקי לכמות"
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Post All Orders"
+msgstr "פרסם את כל ההזמנות"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: field:pos.session,cash_register_balance_end_real:0
+msgid "Ending Balance"
+msgstr "יתרה סופית"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:89
+#, python-format
+msgid "please check that account is set to %s."
+msgstr "אנה בדוק שחשבון זה מקושר ל %s."
+
+#. module: point_of_sale
+#: help:pos.category,image:0
+msgid ""
+"This field holds the image used as image for the cateogry, limited to "
+"1024x1024px."
+msgstr ""
+"בשדה זה נמצאת תמונה של קטגוריה, מוגבל לגודל מקסימאלי 1024X1024 פיקסלים."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
+msgid "Pepsi Max 50cl"
+msgstr "פפסי מאקס 50 מ\"ל"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
+msgid "San Pellegrino 1L"
+msgstr "סאן פלגרינו 1 ליטר"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid ""
+"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\"."
+msgstr ""
+"הינך חייב לבחור בצורת תשלום שתהיה זמינה בקופה על ידי שימוש בחשבון בנק קיים "
+"דרך : \"חשבונות\\ הגדרות\\ יומנים\\ יומים\". בחר יומן זמין וסמן בשורת \"צורת "
+"תשלום עבור קופה רושמת\". אתה יכול ליצור צורת תשלום חדשה ישירות מתוך התפריט : "
+"\"הגדרות\\ צורות תשלום\"."
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.rouges_noyau_fruits
+msgid "Berries"
+msgstr "פירות יער"
+
+#. module: point_of_sale
+#: view:pos.ean_wizard:0
+msgid "Ean13 Generator"
+msgstr "מחולל EAN 13"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_1l_product_template
+msgid "Spa Reine 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:res.partner:0
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "שגיאה : קוד EAN אינו תקין"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.legumes_racine
+msgid "Root vegetables"
+msgstr "ירקות שורש"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr "פתח דוחות"
+
+#. module: point_of_sale
+#: field:pos.details,date_end:0
+#: field:pos.sale.user,date_end:0
+msgid "Date End"
+msgstr "תאריך סיום"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pomme_jonagold_product_template
+msgid "Jonagold apples"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
+#: field:report.pos.order,journal_id:0
+msgid "Journal"
+msgstr "יומן"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Statements"
+msgstr "דוחות"
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr "סה\"כ מכירות (רווחים)"
+
+#. module: point_of_sale
+#: help:pos.config,group_by:0
+msgid ""
+"Check this if you want to group the Journal Items by Product while closing a "
+"Session"
+msgstr ""
+"סמן כאן במידה והינך רוצה לשלב פרטי יומן על ידי מוצרים בזמן סגירת יומן מכירות"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total paid"
+msgstr "שולם סה\"כ"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_session_opening
+msgid "pos.session.opening"
+msgstr ""
+
+#. module: point_of_sale
+#: view:res.users:0
+msgid "Edit EAN"
+msgstr "ערוך EAN"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:80
+#, python-format
+msgid "List of Cash Registers"
+msgstr "רשימת קופות מזומן"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_50cl_product_template
+msgid "Maes 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Not Invoiced"
+msgstr "ללא חשבונית"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
+msgid "250g Lays Pickels"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.session.opening,pos_session_id:0
+msgid "PoS Session"
+msgstr "יומן מכירות"
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "March"
+msgstr "מרץ"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
+#: report:pos.user.product:0
+msgid "User's Product"
+msgstr "מוצרי משתמש"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1173
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"הינך חייב לבחור מחירון עבור מכירה זו!\n"
+"אנה בחר אחד לפני בחירת המוצר."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
+msgid "Fanta Orange 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_1l_product_template
+msgid "Perrier 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_33cl_product_template
+msgid "Spa Reine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add a Global Discount"
+msgstr "הוסף הנחה כוללת"
+
+#. module: point_of_sale
+#: view:pos.config:0
+msgid "Journals"
+msgstr "יומנים"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
+msgid "Dr. Oetker Ristorante Prosciutto"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
+#: model:product.template,name:point_of_sale.lays_paprika_170g_product_template
+msgid "Lays Light Paprika 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template
+msgid "Coca-Cola Light Lemon 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/static/src/xml/pos.xml:689
+#: code:addons/point_of_sale/static/src/xml/pos.xml:744
+#, python-format
+msgid "return"
+msgstr "חזרה"
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Set a Custom EAN"
+msgstr "בחר מספר EAN מותאם אישית"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:235
+#, python-format
+msgid "Remaining:"
+msgstr "נותרו:"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.legumes
+msgid "Fresh vegetables"
+msgstr "ירקות טריים"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "tab of the"
+msgstr "לשונית של"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:478
+#, python-format
+msgid "Scan Item Success"
+msgstr "סירקת המוצר הושלמה"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: field:pos.session,cash_register_balance_start:0
+msgid "Starting Balance"
+msgstr "יתרת התחלה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
+msgid "Oven Baked Lays Natural 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:pos.session:0
+msgid "The name of this POS Session must be unique !"
+msgstr "שם יומן מכירות זה חייב להיות ייחודי !"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Opening Subtotal"
+msgstr "יתרת פתיחה"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "payment method."
+msgstr "צורת תשלום."
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Re-Print"
+msgstr "הדפס מחדש"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
+msgid "Chimay Bleu 75cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr "תשלומים ללקוח"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:215
+#: code:addons/point_of_sale/static/src/xml/pos.xml:285
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+#: report:pos.details:0
+#: view:pos.order:0
+#, python-format
+msgid "Payment"
+msgstr "תשלום"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "# שורות"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:89
+#, python-format
+msgid "Disc"
+msgstr "הנחה"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "(update)"
+msgstr "(עדכן)"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
+msgid "IJsboerke Vanilla 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_details
+msgid "Sale Details"
+msgstr "פרטי מכירה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_2l_product_template
+msgid "2L Evian"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/wizard/pos_session_opening.py:33
+#, python-format
+msgid "Start Point Of Sale"
+msgstr "התחלה יומן מכירות"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pils
+msgid "Pils"
+msgstr "כדורים"
+
+#. module: point_of_sale
+#: help:pos.session,cash_register_balance_end_real:0
+msgid "Computed using the cash control lines"
+msgstr "מחושב לפי שורות קופה"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr "רחוב"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr "סה\"כ מכירות"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:741
+#, python-format
+msgid "ABC"
+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 ""
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "שורות הזמנה"
+
+#. module: point_of_sale
+#: view:report.transaction.pos:0
+msgid "Total Transaction"
+msgstr "סה\"כ עסקה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
+msgid "Chaudfontaine Petillante 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:485
+#, python-format
+msgid "Read Weighting Scale"
+msgstr "קראה משקל דיגיטלי"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:426
+#, python-format
+msgid "0.00 €"
+msgstr "0.00 ₪"
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "תאריך יצירה"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
+msgstr "מכירות להיום"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:264
+#: code:addons/point_of_sale/static/src/xml/pos.xml:324
+#, python-format
+msgid "Welcome"
+msgstr "ברוכים הבאים"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#, python-format
+msgid ""
+"You do not have any open cash register. You must create a payment method or "
+"open a cash register."
+msgstr ""
+"לא נמצאו קופות מזומנים. הינך חייב ליצור שיתת תשלום או לפתוח קופת מזומנים."
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS "
+msgstr "קופה "
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:pos.user.product:0
+msgid "Total :"
+msgstr "סה\"כ:"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "My Sales"
+msgstr "המכירות שלי"
+
+#. module: point_of_sale
+#: view:pos.config:0
+msgid "Set to Deprecated"
+msgstr "הגדר לחסרי ערך"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.limon_product_template
+msgid "Stringers"
+msgstr "סטרינגרים"
+
+#. module: point_of_sale
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "מחירון"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr "סה\"כ עם חשבונית"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_category
+#: field:product.product,pos_categ_id:0
+msgid "Point of Sale Category"
+msgstr "קטגוריית קופה"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "# כמות"
+
+#. module: point_of_sale
+#: help:pos.config,sequence_id:0
+msgid ""
+"This sequence is automatically created by OpenERP but you can change it to "
+"customize the reference numbers of your orders."
+msgstr ""
+"רצף זה נוצר באופן אוטומטי על ידי OpenERP אבל אתה יכול לשנות את זה כדי להתאים "
+"אישית את התייחסות למספרים של ההזמנות שלך."
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:324
+#, python-format
+msgid "Choose your type of receipt:"
+msgstr "בחר את סוג הקבלה שלך:"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr "מכירות לפי מרווח חודשי"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.poivron_jaunes_product_template
+msgid "Yellow Peppers"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.order,date_order:0
+#: field:report.sales.by.margin.pos,date_order:0
+#: field:report.sales.by.margin.pos.month,date_order:0
+#: field:report.sales.by.user.pos,date_order:0
+#: field:report.sales.by.user.pos.month,date_order:0
+msgid "Order Date"
+msgstr "תאריך הזמנה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_33cl_product_template
+msgid "Stella Artois 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
+msgid "Lays Natural XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:479
+#, python-format
+msgid "Scan Item Unrecognized"
+msgstr "סרוק פריט ללא קטגוריה"
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr "דוח מזומנים להיום"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:920
+#, python-format
+msgid "Selected orders do not have the same session!"
+msgstr "הזמנות שנבחרו לא בוצעו באותו יומן מכירות!"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "חשבונית ברירת מחדל"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
+msgid "Oven Baked Lays Paprika 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "הערת מצב פיסקלי:"
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "September"
+msgstr "ספטמבר"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: field:pos.session,start_at:0
+msgid "Opening Date"
+msgstr "תאריך פתיחה"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_session
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_session_all
+msgid "All Sessions"
+msgstr "כל היומנים"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:663
+#, python-format
+msgid "tab"
+msgstr "לשונית"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "מיסים:"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:271
+#, python-format
+msgid "Thank you for shopping with us."
+msgstr "תודה על כך שעשיתה קניות אתנו."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_2l_product_template
+msgid "Coca-Cola Light 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_funghi_product_template
+msgid "Dr. Oetker Ristorante Funghi"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_category
+msgid "Product Categories"
+msgstr "קטגוריות מוצרים"
+
+#. module: point_of_sale
+#: help:pos.config,journal_id:0
+msgid "Accounting journal used to post sales entries."
+msgstr "יומן מכירות להזנת מכירות."
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr "תיאור"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:467
+#, python-format
+msgid "Invalid Ean"
+msgstr "EAN שגוי"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
+msgid "Lindemans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.config:0
+msgid "Point of Sale Config"
+msgstr "הגדרות קופה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
+msgid "Coca-Cola Zero 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:405
+#, python-format
+msgid "&auml;"
+msgstr "&auml;"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr "שורות הזמנה לקופה"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr "קבלה:"
+
+#. module: point_of_sale
+#: field:account.bank.statement,pos_session_id:0
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+#: field:pos.session.opening,pos_session_name:0
+#: field:pos.session.opening,pos_session_username:0
+msgid "unknown"
+msgstr "לא ידוע"
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "Point of Sale Cash In"
+msgstr "כניסת מזומנים לקופה"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:590
+#, python-format
+msgid "Tax:"
+msgstr "מע\"מ:"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "+ Transactions"
+msgstr "+ עסקאות"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
+msgstr "עדכן הנחה"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: field:pos.box.entries,user_id:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: view:pos.session:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
+#: field:report.transaction.pos,user_id:0
+#: model:res.groups,name:point_of_sale.group_pos_user
+msgid "User"
+msgstr "משתמש/ת"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:194
+#, python-format
+msgid "Kg"
+msgstr "ק\"ג"
+
+#. module: point_of_sale
+#: field:product.product,available_in_pos:0
+msgid "Available in the Point of Sale"
+msgstr "זמין בקופה"
+
+#. module: point_of_sale
+#: selection:pos.config,state:0
+msgid "Deprecated"
+msgstr "מומלץ לשימוש"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
+msgid "Coca-Cola Light 33cl Decaf"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:338
+#, python-format
+msgid "The scanned product was not recognized"
+msgstr "מוצר נסרק אינו מזוהה"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr "עסקאות לקופה"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "תאריך"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
+msgstr "תנועות קופה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
+msgid "Boon Framboise 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config
+msgid "pos.config"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.ean_wizard:0
+msgid ""
+"Enter a reference, it will be converted\n"
+"                        automatically to a valid EAN number."
+msgstr ""
+"הזן מספק, הוא יומר אוטומטית\n"
+"                        לקוד EAN חוקי לשימוש."
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "Point of Sale Cash Out"
+msgstr "מכירות במזומן"
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "November"
+msgstr "נובמבר"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:267
+#, python-format
+msgid "Please scan an item or your member card"
+msgstr "אנה סרוק מוצר או כרטיס חבר מועדון"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.poivron_verts_product_template
+msgid "Green Peppers"
+msgstr "פלפלים ירוקים"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
+msgid "Timmermans Faro 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:410
+#, python-format
+msgid ""
+"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."
+msgstr ""
+"בסיגרת הקופה נמצאה הבדל של (%.2f), כאשר המקסימום המותר הינו %.2f. אנה צור "
+"קשר עם אחראי משמרת."
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Validate Closing & Post Entries"
+msgstr "אמת סגירה ותנועות קופה"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr "מספר עסקאות"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:759
+#, python-format
+msgid ""
+"There is no receivable account defined to make payment for the partner: "
+"\"%s\" (id:%d)."
+msgstr "לא נמצא חשבון אשר יכול לקבל כספים עבור שותף : \"%s\" (id:%d)."
+
+#. module: point_of_sale
+#: view:pos.config:0
+#: selection:pos.config,state:0
+msgid "Inactive"
+msgstr "לא פעיל"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:313
+#: view:pos.confirm:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.ean_wizard:0
+#: view:pos.make.payment:0
+#: view:pos.open.statement:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.user:0
+#: view:pos.receipt:0
+#: view:pos.sale.user:0
+#, python-format
+msgid "Cancel"
+msgstr "ביטול"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:296
+#, python-format
+msgid "Please put your product on the scale"
+msgstr "אנה מקם את המוצר שלך על משקל דיגיטלי"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr "מכירות (סה\"כ)"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.nectarine_product_template
+msgid "Peach"
+msgstr "אפרסק"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
+msgid "Timmermans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config,sequence_id:0
+msgid "Order IDs Sequence"
+msgstr "רצף מספרי הזמנות"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: field:pos.order.line,price_unit:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr "מחיר ליחידה"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:190
+#, python-format
+msgid "Product Weighting"
+msgstr "משקל המוצר"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:704
+#: code:addons/point_of_sale/static/src/xml/pos.xml:746
+#, python-format
+msgid "close"
+msgstr "סגור"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.report_user_label
+msgid "User Labels"
+msgstr "תוויות משתמש"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr "שורות קופה"
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: view:report.transaction.pos:0
+msgid "Amount total"
+msgstr "סכום כולל"
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "End of Session"
+msgstr "סוף ההפעלה"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+#: view:pos.session:0
+msgid "Cash Registers"
+msgstr "קופות מזומן"
+
+#. module: point_of_sale
+#: help:pos.session,cash_register_balance_end:0
+msgid "Computed with the initial cash control and the sum of all payments."
+msgstr "מחושב עם שליטה הראשונית במזומן והסכום של כל התשלומים."
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:474
+#, python-format
+msgid "In Transaction"
+msgstr "בעסקה"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.food
+msgid "Food"
+msgstr "מזון"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+msgid "Ref"
+msgstr "הפניה"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:94
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#, python-format
+msgid "Price"
+msgstr "מחיר"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_33cl_product_template
+msgid "Coca-Cola Light 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS"
+msgstr "קופה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
+msgid "Coca-Cola Regular 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:325
+#, python-format
+msgid "Ticket"
+msgstr "פנייה"
+
+#. module: point_of_sale
+#: field:pos.session,cash_register_difference:0
+msgid "Difference"
+msgstr "הפרש"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:549
+#, python-format
+msgid "Unable to Delete !"
+msgstr "לא ניתן למחיקה!"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.autres_agrumes
+msgid "Other Citrus"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Start Period"
+msgstr "תקופת הדוח"
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: field:pos.category,complete_name:0
+#: field:pos.category,name:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+msgid "Name"
+msgstr "שם"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
+msgid "Spa Barisart 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid ""
+"Generate all sale journal entries for non invoiced orders linked to a closed "
+"cash register or statement."
+msgstr "חולל את כל המכירות להם לא הונפקה חשבונית אשר קשורים לקופה זו."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.unreferenced_product_product_template
+msgid "Unreferenced Products"
+msgstr "מוצרים מנותקים מ"
+
+#. module: point_of_sale
+#: view:pos.ean_wizard:0
+msgid "Apply"
+msgstr "החל"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:288
+#, python-format
+msgid ""
+"Please insert your card in the reader and follow the instructions to "
+"complete\n"
+"            your purchase"
+msgstr ""
+"אנה הכנס את הכרטיס שלך לתוך קורא הכרטיסיפ ועקוב אחר ההוראות להשלמת\n"
+"                                                                             "
+"                                                       הקניה שלך"
+
+#. module: point_of_sale
+#: help:product.product,income_pdt:0
+msgid ""
+"Check if, this is a product you can use to put cash into a statement for the "
+"point of sale backend."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
+msgid "IJsboerke Mocha 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.session,cash_control:0
+msgid "Has Cash Control"
+msgstr "יש קופת מזומן"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
+msgid "Orders Analysis"
+msgstr "ניתוח הזמנות"
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:563
+#, python-format
+msgid "User:"
+msgstr "משתמש:"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:316
+#, python-format
+msgid ""
+"Unable to open the session. You have to assign a sale journal to your point "
+"of sale."
+msgstr "לא ניתן לפתוח יומן מכירות. הינך חייב לקשר יומן לקופה."
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current year"
+msgstr "זמנות קופה שנוצרו במהלך השנה הנוכחית"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.peche_product_template
+msgid "Fishing"
+msgstr "דייג"
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.user.product:0
+msgid "Print Date"
+msgstr "תאריך הדפסה"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.poireaux_poireaux_product_template
+msgid "Leeks"
+msgstr "כרישה"
+
+#. module: point_of_sale
+#: help:pos.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr "נותן את סדר הרצף בעת הצגת רשימה של קטגוריות מוצר."
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.order:0
+#: view:pos.session:0
+#: view:report.pos.order:0
+msgid "Group By..."
+msgstr "מקובץ על ידי ..."
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:564
+#, python-format
+msgid "Shop:"
+msgstr "חנות:"
+
+#. module: point_of_sale
+#: field:account.journal,self_checkout_payment_method:0
+msgid "Self Checkout Payment Method"
+msgstr "צורות תשלום ברכישה עצמית"
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr "הזמנות קופה"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr "כל קופות מזומן סגורות"
+
+#. module: point_of_sale
+#: field:pos.details,user_ids:0
+msgid "Salespeople"
+msgstr "אנשי מכירות"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:777
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:118
+#: code:addons/point_of_sale/wizard/pos_box_out.py:91
+#, python-format
+msgid "You have to open at least one cashbox."
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1172
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.poivron_rouges_product_template
+msgid "Red Pepper"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:677
+#, python-format
+msgid "caps lock"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
+msgid "Grisette Cherry 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:702
+#: code:addons/point_of_sale/static/src/xml/pos.xml:742
+#, python-format
+msgid "&nbsp;"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.categ_others
+msgid "Others"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.autres_legumes_frais
+msgid "Other fresh vegetables"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid "No Cash Register Defined !"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:515
+#, python-format
+msgid ""
+"No cash statement found for this session. Unable to record returned cash."
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.oignons_ail_echalotes
+msgid "Onions / Garlic / Shallots"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_50cl_product_template
+msgid "Evian 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
+msgid "Coca-Cola Light Lemon 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.invoice:0
+#: field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
+msgid "Sale line"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:741
+#, python-format
+msgid "123"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_normal_action
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
+#: view:pos.order:0
+msgid "Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
+msgid "Dr. Oetker Ristorante Quattro Formaggi"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
+msgid "Croky Natural 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.tomate_en_grappe_product_template
+msgid "In Cluster Tomatoes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.client,name:point_of_sale.action_pos_pos
+msgid "Start Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:84
+#: report:pos.details:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+#, python-format
+msgid "Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_1l_product_template
+msgid "Coca-Cola Zero 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: field:report.pos.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Point of Sale Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
+msgid "Spa Fruit and Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.config:0
+#: field:pos.config,journal_ids:0
+#: field:pos.session,journal_ids:0
+msgid "Available Payment Methods"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.product_normal_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a new product.\n"
+"              </p><p>\n"
+"                You must define a product for everything you sell through\n"
+"                the point of sale interface.\n"
+"              </p><p>\n"
+"                Do not forget to set the price and the point of sale "
+"category\n"
+"                in which it should appear. If a product has no point of "
+"sale\n"
+"                category, you can not sell it through the point of sale\n"
+"                interface.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Point of Sale Session"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Source"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:461
+#, python-format
+msgid "Admin Badge"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,journal_id:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
+msgid "Lays Paprika 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+#: field:pos.session,statement_ids:0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:101
+#: selection:pos.session,state:0
+#: selection:pos.session.opening,pos_state:0
+#, python-format
+msgid "Closed & Posted"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
+#: model:ir.model,name:point_of_sale.model_pos_sale_user
+#: view:pos.payment.report.user:0
+msgid "Sale by User"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:562
+#, python-format
+msgid "Phone:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_1l_product_template
+msgid "Evian 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.water
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_ean_wizard
+msgid "pos.ean_wizard"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_config_pos
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_config_pos
+#: view:pos.session:0
+msgid "Point of Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Qty of product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pomme_golden_perlim_product_template
+msgid "Golden Apples Perlim"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:100
+#: selection:pos.session,state:0
+#: selection:pos.session.opening,pos_state:0
+#, python-format
+msgid "Closing Control"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_50cl_product_template
+msgid "Coca-Cola Light 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:466
+#, python-format
+msgid "Unknown Product"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:36
+#, python-format
+msgid "<![endif]-->"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_50cl_product_template
+msgid "Jupiler 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "End Period"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template
+msgid "Coca-Cola Light Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:33
+#, python-format
+msgid "<!--[if IE]>"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
+msgid "Lays Ketchup 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,state:0
+msgid "Synchronized"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
+msgid "Chimay Red 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,image_medium:0
+msgid "Medium-sized image"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.papillon_orange_product_template
+msgid "Orange Butterfly"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Year of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,to_weight:0
+msgid ""
+"Check if the product should be weighted (mainly used with self check-out "
+"interface)."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: field:pos.box.entries,journal_id:0
+#: field:pos.session,cash_register_id:0
+msgid "Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:447
+#, python-format
+msgid "Accept Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
+msgid "Sales by User Daily margin"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Open Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.poire
+msgid "Pears"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: selection:report.pos.order,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config,iface_cashdrawer:0
+msgid "Cashdrawer Interface"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.tomates
+msgid "Tomatos"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_2l_product_template
+msgid "Coca-Cola Zero 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.oranges
+msgid "Oranges"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beers
+msgid "Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.config,name:0
+msgid "An internal identification of the point of sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.config:0
+#: selection:pos.config,state:0
+msgid "Active"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.session,name:0
+msgid "Session ID"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Pay Order"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Summary by Payment Methods"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:470
+#, python-format
+msgid "Hardware Status"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:220
+#: code:addons/point_of_sale/static/src/xml/pos.xml:426
+#: code:addons/point_of_sale/static/src/xml/pos.xml:596
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.invoice:0
+#: report:pos.lines:0
+#: report:pos.payment.report.user:0
+#, python-format
+msgid "Total:"
+msgstr ""
+
+#. module: point_of_sale
+#: field:res.users,ean13:0
+msgid "EAN13"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:573
+#, python-format
+msgid "% discount"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
+msgid "Croky Paprika 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Reprint"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config,iface_payment_terminal:0
+msgid "Payment Terminal Interface"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:141
+#, python-format
+msgid "Search Products"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.carotte_product_template
+msgid "Carrots"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid ""
+"The system will open all cash registers, so that you can start recording "
+"payments. We suggest you to control the opening balance of each register, "
+"using their CashBox tab."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Done"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:328
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0
+#: view:pos.order:0
+#: field:pos.order,invoice_id:0
+#, python-format
+msgid "Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:690
+#: code:addons/point_of_sale/static/src/xml/pos.xml:701
+#, python-format
+msgid "shift"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
+msgid "Rochefort \"8\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: view:pos.session:0
+msgid "Open"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,name:0
+#: field:pos.order.line,order_id:0
+msgid "Order Ref"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:513
+#: code:addons/point_of_sale/static/src/xml/pos.xml:572
+#, python-format
+msgid "With a"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.courgette_product_template
+msgid "Zucchini"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
+msgid "Timmermans Geuze 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Continue Selling"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:444
+#, python-format
+msgid "Payment Terminal"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+#: field:pos.session,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
+msgid "Croky Bolognese 250g"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:460
+#, python-format
+msgid "Custom Ean13"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:465
+#, python-format
+msgid "1.54€ Lemon"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment Reference"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Cashbox Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0
+#: view:report.sales.by.margin.pos.month:0
+msgid "Sales by User Margin"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:427
+#: report:pos.invoice:0
+#, python-format
+msgid "Taxes:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
+msgid "Pepsi Max 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_product_product
+#: report:pos.details:0
+#: field:pos.order.line,product_id:0
+#: report:pos.payment.report.user:0
+#: report:pos.user.product:0
+#: view:report.pos.order:0
+#: field:report.pos.order,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_pollo_product_template
+msgid "Dr. Oetker Ristorante Pollo"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:pos.session:0
+msgid ""
+"You cannot create two active sessions related to the same point of sale!"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,image_small:0
+msgid "Smal-sized image"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:416
+#, python-format
+msgid "Point of Sale Profit"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:338
+#, python-format
+msgid "Please wait, a cashier is on the way"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_session_opening.py:67
+#: field:pos.box.entries,session_id:0
+#: view:pos.order:0
+#: field:pos.order,session_id:0
+#, python-format
+msgid "Session"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
+msgid "Chaudfontaine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_margherita_product_template
+msgid "Dr. Oetker La Margherita"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: selection:pos.order,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:229
+#, python-format
+msgid "Paid:"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.session,cash_register_total_entry_encoding:0
+msgid "Total Cash Transaction"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pommes_de_terre
+#: model:product.template,name:point_of_sale.pomme_de_terre_product_template
+msgid "Potatoes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "\"."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_user
+msgid "Sales lines by Users"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:481
+#, python-format
+msgid "Payment Status"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_2l_product_template
+msgid "Pepsi 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pomme
+msgid "Apples"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_res_users
+#: report:pos.details:0
+msgid "Users"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:462
+#, python-format
+msgid "Client Badge"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.session,cash_journal_id:0
+msgid "Cash Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: model:res.groups,name:point_of_sale.group_pos_manager
+msgid "Manager"
+msgstr ""
+
+#. 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 ""
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0
+#: field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_total:0
+#: report:pos.payment.report.user:0
+#: view:pos.session:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+msgid "Total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,amount_authorized_diff:0
+msgid "Amount Authorized Difference"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:311
+#, python-format
+msgid "Please be patient, help is on the way"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_session
+msgid "pos.session"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.session,config_id:0
+msgid "The physical point of sale you will use."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config,iface_self_checkout:0
+msgid "Self Checkout Mode"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,journal_user:0
+msgid "PoS Payment Method"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_33cl_product_template
+msgid "Pepsi 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.order,user_id:0
+msgid ""
+"Person who uses the the cash register. It can be a reliever, a student or an "
+"interim employee."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
+msgid "Coca-Cola Zero Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
+msgid "Fanta Orange 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+#: report:pos.lines:0
+#: field:pos.order,company_id:0
+#: field:pos.order.line,company_id:0
+#: report:pos.payment.report.user:0
+#: report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+#: report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_33cl_product_template
+msgid "Orangina 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.config:0
+msgid "Set to Inactive"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
+msgid "Chimay Bleu 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
+#: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
+msgid "Payment Methods"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.chips
+msgid "Chips"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_spinaci_product_template
+msgid "Dr. Oetker Ristorante Spinaci"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:454
+#, python-format
+msgid "Reset"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:342
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:278
+#, python-format
+msgid "Please scan an item"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_box_in
+#: view:pos.session:0
+msgid "Put Money In"
+msgstr ""
+
+#. 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 ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.boni_orange_product_template
+msgid "Boni Oranges"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:459
+#: code:addons/point_of_sale/point_of_sale.py:536
+#: code:addons/point_of_sale/point_of_sale.py:733
+#: code:addons/point_of_sale/point_of_sale.py:777
+#: code:addons/point_of_sale/point_of_sale.py:839
+#: code:addons/point_of_sale/point_of_sale.py:920
+#: code:addons/point_of_sale/point_of_sale.py:1031
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box.py:22
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:118
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:123
+#: code:addons/point_of_sale/wizard/pos_box_out.py:89
+#: code:addons/point_of_sale/wizard/pos_box_out.py:91
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,pos_categ_id:0
+msgid ""
+"The Point of Sale Category this products belongs to. Those categories are "
+"used to group similar products and are specific to the Point of Sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_1,5l_product_template
+msgid "Orangina 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Point of Sale Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.ice_cream
+msgid "Ice Cream"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config,shop_id:0
+#: field:pos.order,shop_id:0
+#: field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:123
+#, python-format
+msgid "Please check that income account is set to %s."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
+msgid "Belle-Vue Kriek 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
+msgid "Chaudfontaine Petillante 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
+msgid "IJsboerke Stracciatella 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.user.pos:0
+#: view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
+msgid "Chaudfontaine 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:1096
+#, python-format
+msgid "Trade Receivables"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:549
+#, python-format
+msgid "In order to delete a sale, it must be new or cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:71
+#, python-format
+msgid ""
+"There are pending operations that could not be saved into the database, are "
+"you sure you want to exit?"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
+msgid "Coca-Cola Regular 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0
+msgid "Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:757
+#, python-format
+msgid "There is no receivable account defined to make payment."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.citron_product_template
+msgid "Lemon"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
+msgid "Coca-Cola Zero 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_tonno_product_template
+msgid "Dr. Oetker Ristorante Tonno"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:460
+#, python-format
+msgid ""
+"You cannot confirm all orders of this session, because they have not the "
+"'paid' status"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "New"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Do you want to open cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_50cl_product_template
+msgid "50cl Perrier"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_cash_box_out
+msgid "cash.box.out"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
+msgid "Fanta Zero Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,available_in_pos:0
+msgid "Check if you want this product to appear in the Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Day of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_33cl_product_template
+msgid "Maes 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:448
+#, python-format
+msgid "Reject Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orval_33cl_product_template
+msgid "Orval 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:515
+#, python-format
+msgid "discount"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_1l_product_template
+msgid "Coca-Cola Regular 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:733
+#, python-format
+msgid "Unable to cancel the picking."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.config:0
+msgid "Material Interfaces"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.fruits
+msgid "Fresh Fruits"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,,5cl_product_template
+msgid "Lindemans sinful 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,image:0
+msgid "Image"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
+msgid "Spa Barisart 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:810
+#: view:pos.order:0
+#, python-format
+msgid "Return Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_33cl_product_template
+msgid "Jupiler 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:484
+#, python-format
+msgid "Print Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,pos_reference:0
+msgid "Receipt Ref"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+msgid "Sales Details"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+#: model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+#: field:pos.session,config_id:0
+#: field:pos.session.opening,pos_config_id:0
+#: view:product.product:0
+#: view:res.partner:0
+#: view:res.users:0
+msgid "Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.order,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:41
+#: view:pos.confirm:0
+#: view:pos.details:0
+#: view:pos.discount:0
+#: view:pos.ean_wizard:0
+#: view:pos.make.payment:0
+#: view:pos.open.statement:0
+#: view:pos.payment.report:0
+#: view:pos.payment.report.user:0
+#: view:pos.receipt:0
+#: view:pos.sale.user:0
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: view:pos.order:0
+#: selection:pos.order,state:0
+#: view:report.pos.order:0
+#: selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "New Session"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config,group_by:0
+msgid "Group Journal Items"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_pos_pos_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new order.\n"
+"              </p><p>\n"
+"                Use this menu to browse your preceeding orders. To record "
+"new\n"
+"                orders, you should better use the menu <i>Your Session</i> "
+"for\n"
+"                the touchscreen interface.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:450
+#, python-format
+msgid "Electronic Scale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
+msgid "Spa Barisart 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:res.users,pos_config:0
+msgid "Default Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box.py:23
+#, python-format
+msgid "There is no cash register for this PoS Session"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.special_beers
+msgid "Special Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Cash Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0
+#: selection:pos.order,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:464
+#, python-format
+msgid "3.141Kg Oranges"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:839
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.fruity_beers
+msgid "Fruity Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "You can define another list of available currencies on the"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:463
+#, python-format
+msgid "Soda 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.session,cash_register_balance_start:0
+msgid "Computed using the cash control at the opening."
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.raisins
+msgid "Grapes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+msgid "Sales by user"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_hawaii_product_template
+msgid "Dr. Oetker Ristorante Hawaii"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:483
+#: view:pos.receipt:0
+#, python-format
+msgid "Print Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:420
+#, python-format
+msgid "Point of Sale Loss"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
+msgid "Chaudfontaine Petillante 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
+msgid "Pepsi Max 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.session,details_ids:0
+msgid "Cash Control"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
+msgid "Dr. Oetker Ristorante Vegetable"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda
+msgid "Soda"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
+msgid "Lays Paprika XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:417
+#, python-format
+msgid "Your shopping cart is empty"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#, python-format
+msgid "Please create an invoice for this sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
+msgid "Dr. Oetker Ristorante Mozzarella"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+#: report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "The session"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "Close Session"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "PoS Session Opening"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:662
+#: code:addons/point_of_sale/static/src/xml/pos.xml:739
+#, python-format
+msgid "delete"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_50cl_product_template
+msgid "Spa Reine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chicon_flandria_extra_product_template
+msgid "Extra Flandria chicory"
+msgstr ""
+
+#. module: point_of_sale
+#: 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 ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
+msgid "Leffe Blonde 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "Session:"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config,iface_print_via_proxy:0
+msgid "Print via Proxy"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+#: report:pos.lines:0
+msgid "Description"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_config_sessions
+#: field:pos.config,session_ids:0
+msgid "Sessions"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
+msgid "IJsboerke Chocolat 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.category,image_small:0
+msgid ""
+"Small-sized image of the category. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.session.opening,pos_state:0
+msgid "Session Status"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a payment method.\n"
+"              </p><p>\n"
+"                Payment methods are defined by accounting journals having "
+"the\n"
+"                field <i>PoS Payment Method</i> checked. In order to be "
+"useable\n"
+"                from the touchscreen interface, you must set the payment "
+"method\n"
+"                on the <i>Point of Sale</i> configuration.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.order,partner_id:0
+#: view:report.pos.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: point_of_sale
+#: view:res.partner:0
+msgid "Edit"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "Click to continue the session."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.config:0
+msgid "Set to Active"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.category:0
+msgid "Product PoS Categories"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.session.opening:0
+msgid "Start Selling"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+#: field:pos.order,statement_ids:0
+msgid "Payments"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:593
+#, python-format
+msgid "Discount:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
+msgid "Sales by User Monthly margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
+msgid "Leffe Brune \"9\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,journal_user:0
+msgid ""
+"Check this box if this journal define a payment method that can be used in "
+"point of sales."
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:41
+#, python-format
+msgid "Mozilla Firefox"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.raisins_noir_product_template
+msgid "Black Grapes"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:316
+#: view:pos.make.payment:0
+#, python-format
+msgid "Make Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:pos.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+msgid "Sales User Today"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: 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 ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:98
+#: selection:pos.session,state:0
+#: selection:pos.session.opening,pos_state:0
+#, python-format
+msgid "Opening Control"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Month of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+#: field:report.pos.order,year:0
+msgid "Year"
+msgstr ""
+
+#. module: point_of_sale
+#. openerp-web
+#: code:addons/point_of_sale/static/src/xml/pos.xml:505
+#, python-format
+msgid "at"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_cash_box_in
+msgid "cash.box.in"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_session_orders
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale
+#: field:pos.session,order_ids:0
+msgid "Orders"
+msgstr ""
+
+#, python-format
+#~ msgid "Print"
+#~ msgstr "הדפס"
+
+#, python-format
+#~ msgid "Subtotal:"
+#~ msgstr "סיכום ביניים:"
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 23dc97f2376..2dc8e2bb0d0 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: 2013-04-24 06:41+0000\n"
-"Last-Translator: viney <Unknown>\n"
+"PO-Revision-Date: 2013-08-06 09:45+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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-04-25 05:20+0000\n"
-"X-Generator: Launchpad (build 16580)\n"
+"X-Launchpad-Export-Date: 2013-08-07 04:46+0000\n"
+"X-Generator: Launchpad (build 16721)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -42,6 +42,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义一个新的产品类别。\n"
+"              </p><p>\n"
+"                产品类别用于通过触摸屏浏览产品。\n"
+"              </p><p>\n"
+"                "
+"为产品类别上传图片后，触摸屏布局将会自动调整。因此，针对分辨率小于（1024x768）的显示设备，我们建议不要为产品类别上传图片。\n"
+"              </p>\n"
+"            "
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -51,7 +60,7 @@ msgstr "打印销售订单的收据"
 #. module: point_of_sale
 #: field:pos.session,cash_register_balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "计算余额"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -62,7 +71,7 @@ msgstr "今天"
 #. module: point_of_sale
 #: field:pos.config,iface_electronic_scale:0
 msgid "Electronic Scale Interface"
-msgstr ""
+msgstr "电子称接口"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.plain_water
@@ -85,7 +94,7 @@ msgstr ""
 #: field:pos.config,journal_id:0
 #: field:pos.order,sale_journal:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "销售日记账"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -102,7 +111,7 @@ msgstr "销售详情"
 #. module: point_of_sale
 #: constraint:pos.config:0
 msgid "You cannot have two cash controls in one Point Of Sale !"
-msgstr ""
+msgstr "同一个销售点不能使用两个钱箱"
 
 #. module: point_of_sale
 #: field:pos.payment.report.user,user_id:0
@@ -111,7 +120,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "销售员"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -128,13 +137,13 @@ msgstr "产品名称"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template
 msgid "Red grapefruit"
-msgstr ""
+msgstr "红葡萄柚"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1373
 #, python-format
 msgid "Assign a Custom EAN"
-msgstr ""
+msgstr "使用自定义的条码"
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -164,12 +173,12 @@ msgstr "取钱"
 #: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
-msgstr ""
+msgstr "未被使用"
 
 #. module: point_of_sale
 #: field:pos.config,iface_vkeyboard:0
 msgid "Virtual KeyBoard Interface"
-msgstr ""
+msgstr "虚拟键盘接口"
 
 #. module: point_of_sale
 #. openerp-web
@@ -181,11 +190,11 @@ msgstr "+/-"
 #. module: point_of_sale
 #: field:pos.ean_wizard,ean13_pattern:0
 msgid "Reference"
-msgstr ""
+msgstr "单号"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1041
-#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1066
+#: code:addons/point_of_sale/point_of_sale.py:1083
 #: report:pos.invoice:0
 #: report:pos.lines:0
 #, python-format
@@ -200,32 +209,32 @@ msgstr "开始日期"
 #. module: point_of_sale
 #: constraint:pos.session:0
 msgid "You cannot create two active sessions with the same responsible!"
-msgstr ""
+msgstr "同一个负责人不能创建两个活动销售会话"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:473
 #, python-format
 msgid "Weighting"
-msgstr ""
+msgstr "称重"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fenouil_fenouil_product_template
 msgid "Fennel"
-msgstr ""
+msgstr "小茴香"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:472
 #, python-format
 msgid "Help needed"
-msgstr ""
+msgstr "需要帮助"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:739
+#: code:addons/point_of_sale/point_of_sale.py:760
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "设置错误！"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -237,7 +246,7 @@ msgstr "业务伙伴"
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Closing Cash Control"
-msgstr ""
+msgstr "关闭现金箱"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -259,7 +268,7 @@ msgstr "会计信息"
 #. module: point_of_sale
 #: field:pos.session.opening,show_config:0
 msgid "Show Config"
-msgstr ""
+msgstr "显示配置"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -277,7 +286,7 @@ msgstr "折扣合计"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:441
 #, python-format
 msgid "Debug Window"
-msgstr ""
+msgstr "调试窗口"
 
 #. module: point_of_sale
 #. openerp-web
@@ -285,7 +294,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:613
 #, python-format
 msgid "Change:"
-msgstr "零钞"
+msgstr "找零："
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_2l_product_template
@@ -315,10 +324,10 @@ msgid "Disc.(%)"
 msgstr "折扣(%)"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1006
+#: code:addons/point_of_sale/point_of_sale.py:1031
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "请为这个产品定义收益科目：\"%s\" (id:%d)."
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -336,7 +345,7 @@ msgstr "Leffe Brune 33cl"
 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 ""
+msgstr "如果需要把自助收银作为默认模式，请选中这里。 如果未选， OpenERP 将使用普通收银员作为默认模式。"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -353,7 +362,7 @@ msgstr "饮料类"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_session_opening
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_session_opening
 msgid "Your Session"
-msgstr ""
+msgstr "您的销售会话"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.stella_50cl_product_template
@@ -375,12 +384,12 @@ msgstr "上级类别"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:482
 #, python-format
 msgid "Open Cashbox"
-msgstr ""
+msgstr "打开钱箱"
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Select your Point of Sale"
-msgstr ""
+msgstr "选择您的销售点"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,total:0
@@ -404,25 +413,25 @@ msgstr "Dr. Oetker Ristorante Speciale"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:480
 #, python-format
 msgid "Payment Request"
-msgstr ""
+msgstr "付款请求"
 
 #. module: point_of_sale
 #: field:product.product,to_weight:0
 msgid "To Weight"
-msgstr ""
+msgstr "需要称重"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:476
 #, python-format
 msgid "Hardware Events"
-msgstr ""
+msgstr "硬件事件"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:301
 #, python-format
 msgid "You should assign a Point of Sale to your session."
-msgstr ""
+msgstr "您需要为您的销售会话指定一个销售点"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -435,7 +444,7 @@ msgid "Fanta Orange 33cl"
 msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:420
+#: code:addons/point_of_sale/point_of_sale.py:423
 #, python-format
 msgid ""
 "Please set your profit and loss accounts on your payment method '%s'. This "
@@ -446,10 +455,10 @@ msgstr ""
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:315
-#: code:addons/point_of_sale/point_of_sale.py:512
+#: code:addons/point_of_sale/point_of_sale.py:514
 #, python-format
 msgid "error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
@@ -471,12 +480,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.Onions_product_template
 msgid "Onions"
-msgstr ""
+msgstr "洋葱"
 
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Validate & Open Session"
-msgstr ""
+msgstr "验证并打开销售会话"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:99
@@ -484,18 +493,18 @@ msgstr ""
 #: selection:pos.session.opening,pos_state:0
 #, python-format
 msgid "In Progress"
-msgstr ""
+msgstr "进行中"
 
 #. module: point_of_sale
 #: view:pos.session:0
 #: field:pos.session,opening_details_ids:0
 msgid "Opening Cash Control"
-msgstr ""
+msgstr "正在打开钱箱"
 
 #. module: point_of_sale
 #: help:res.users,ean13:0
 msgid "BarCode"
-msgstr ""
+msgstr "条码"
 
 #. module: point_of_sale
 #: help:pos.category,image_medium:0
@@ -508,19 +517,19 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Open Session"
-msgstr ""
+msgstr "打开销售会话"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr "每天经营"
+msgstr "日常经营"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:42
 #, python-format
 msgid "Google Chrome"
-msgstr ""
+msgstr "Google Chrome"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.sparkling_water
@@ -543,7 +552,7 @@ msgstr "查询现金对账单"
 #: field:pos.session.opening,pos_state_str:0
 #: field:report.pos.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -568,14 +577,14 @@ msgstr "POS单明细"
 #. module: point_of_sale
 #: view:pos.config:0
 msgid "Point of Sale Configuration"
-msgstr ""
+msgstr "销售点配置"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:359
 #, python-format
 msgid "Your order has to be validated by a cashier."
-msgstr ""
+msgstr "您的订单已被收银员确认"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
@@ -609,7 +618,7 @@ msgid ""
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:867
+#: code:addons/point_of_sale/point_of_sale.py:888
 #, python-format
 msgid "Customer Invoice"
 msgstr "客户发票"
@@ -619,7 +628,7 @@ msgstr "客户发票"
 msgid ""
 "You can continue sales from the touchscreen interface by clicking on \"Start "
 "Selling\" or close the cash register session."
-msgstr ""
+msgstr "通过触摸屏幕的“开始销售”或者关闭钱箱之后您就可以继续进行销售。"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -631,7 +640,7 @@ msgstr "结束日期"
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "正在打开钱箱"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -678,7 +687,7 @@ msgstr "行号"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:453
 #, python-format
 msgid "Set Weight"
-msgstr ""
+msgstr "设置重量"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -693,7 +702,7 @@ msgstr "净合计:"
 #. module: point_of_sale
 #: model:ir.actions.client,name:point_of_sale.action_client_pos_menu
 msgid "Open POS Menu"
-msgstr ""
+msgstr "打开销售点菜单"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
@@ -710,12 +719,12 @@ msgstr "发表POS机日记帐分录"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:457
 #, python-format
 msgid "Barcode Scanner"
-msgstr ""
+msgstr "条码扫描器"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
 msgid "Granny Smith apples"
-msgstr ""
+msgstr "Granny Smith 苹果"
 
 #. module: point_of_sale
 #: help:product.product,expense_pdt:0
@@ -739,11 +748,13 @@ msgid ""
 "use\n"
 "                        a modern browser like"
 msgstr ""
+"销售点功能不支持 Microsoft Internet Explorer 浏览器，请使用更现代化的浏览器如：Mozilla Firefox 和 "
+"Google Chrome 等"
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Click to start a session."
-msgstr ""
+msgstr "单击开始销售会话"
 
 #. module: point_of_sale
 #: view:pos.details:0
@@ -778,7 +789,7 @@ msgstr "新增产品"
 #. module: point_of_sale
 #: field:pos.config,name:0
 msgid "Point of Sale Name"
-msgstr ""
+msgstr "销售点名称"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
@@ -825,7 +836,7 @@ msgstr "期末结余"
 #: code:addons/point_of_sale/wizard/pos_box_out.py:89
 #, python-format
 msgid "please check that account is set to %s."
-msgstr ""
+msgstr "请检查该科目已经设为为：%s"
 
 #. module: point_of_sale
 #: help:pos.category,image:0
@@ -863,7 +874,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.ean_wizard:0
 msgid "Ean13 Generator"
-msgstr ""
+msgstr "条码生成器"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_1l_product_template
@@ -879,7 +890,7 @@ msgstr "错误：无效的EAN编码"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.legumes_racine
 msgid "Root vegetables"
-msgstr ""
+msgstr "根类蔬菜"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
@@ -934,12 +945,12 @@ msgstr "付款合计"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_session_opening
 msgid "pos.session.opening"
-msgstr ""
+msgstr "pos.session.opening"
 
 #. module: point_of_sale
 #: view:res.users:0
 msgid "Edit EAN"
-msgstr ""
+msgstr "编辑条码"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:80
@@ -965,7 +976,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.session.opening,pos_session_id:0
 msgid "PoS Session"
-msgstr ""
+msgstr "销售点会话"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -979,7 +990,7 @@ msgid "User's Product"
 msgstr "用户的产品"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1143
+#: code:addons/point_of_sale/point_of_sale.py:1173
 #, python-format
 msgid ""
 "You have to select a pricelist in the sale form !\n"
@@ -1011,7 +1022,7 @@ msgstr "增加一个全局折扣"
 #. module: point_of_sale
 #: view:pos.config:0
 msgid "Journals"
-msgstr ""
+msgstr "日记账"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
@@ -1031,7 +1042,7 @@ msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:518
+#: code:addons/point_of_sale/point_of_sale.py:520
 #: code:addons/point_of_sale/static/src/xml/pos.xml:689
 #: code:addons/point_of_sale/static/src/xml/pos.xml:744
 #, python-format
@@ -1041,7 +1052,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Set a Custom EAN"
-msgstr ""
+msgstr "设置自定义条码"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1053,7 +1064,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.legumes
 msgid "Fresh vegetables"
-msgstr ""
+msgstr "新鲜蔬菜"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -1065,7 +1076,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:478
 #, python-format
 msgid "Scan Item Success"
-msgstr ""
+msgstr "扫描条目成功"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1077,22 +1088,22 @@ msgstr "期初余额"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
 msgid "Oven Baked Lays Natural 150g"
-msgstr ""
+msgstr "Oven Baked Lays Natural 150g"
 
 #. module: point_of_sale
 #: sql_constraint:pos.session:0
 msgid "The name of this POS Session must be unique !"
-msgstr ""
+msgstr "销售会话名称必须唯一"
 
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "Opening Subtotal"
-msgstr ""
+msgstr "小计"
 
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "payment method."
-msgstr ""
+msgstr "付款方式"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1137,12 +1148,12 @@ msgstr "折扣"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "(update)"
-msgstr ""
+msgstr "（更新）"
 
 #. 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
@@ -1153,15 +1164,15 @@ msgstr "销售详情"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
 msgid "2L Evian"
-msgstr ""
+msgstr "2L 依云"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:373
-#: code:addons/point_of_sale/point_of_sale.py:472
-#: code:addons/point_of_sale/wizard/pos_session_opening.py:34
+#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/wizard/pos_session_opening.py:33
 #, python-format
 msgid "Start Point Of Sale"
-msgstr ""
+msgstr "启动销售点"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pils
@@ -1215,14 +1226,14 @@ msgstr "Chaudfontaine Petillante 50cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:485
 #, python-format
 msgid "Read Weighting Scale"
-msgstr ""
+msgstr "读取电子秤"
 
 #. module: point_of_sale
 #. openerp-web
 #: code:addons/point_of_sale/static/src/xml/pos.xml:426
 #, python-format
 msgid "0.00 €"
-msgstr ""
+msgstr "0.00 €"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
@@ -1240,7 +1251,7 @@ msgstr "今天的销售情况"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:324
 #, python-format
 msgid "Welcome"
-msgstr ""
+msgstr "欢迎"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
@@ -1295,7 +1306,7 @@ msgstr "已开票合计"
 #: model:ir.model,name:point_of_sale.model_pos_category
 #: field:product.product,pos_categ_id:0
 msgid "Point of Sale Category"
-msgstr ""
+msgstr "销售点商品分类"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1315,7 +1326,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:324
 #, python-format
 msgid "Choose your type of receipt:"
-msgstr ""
+msgstr "选择小票类型"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
@@ -1352,7 +1363,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:479
 #, python-format
 msgid "Scan Item Unrecognized"
-msgstr ""
+msgstr "未能识别扫描的条目"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -1360,7 +1371,7 @@ msgid "Today's Closed Cashbox"
 msgstr "今日关闭的钱箱"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:897
+#: code:addons/point_of_sale/point_of_sale.py:920
 #, python-format
 msgid "Selected orders do not have the same session!"
 msgstr ""
@@ -1396,7 +1407,7 @@ msgstr "开启日期"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_session
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_session_all
 msgid "All Sessions"
-msgstr ""
+msgstr "全部销售会话"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1415,7 +1426,7 @@ msgstr "税："
 #: code:addons/point_of_sale/static/src/xml/pos.xml:271
 #, python-format
 msgid "Thank you for shopping with us."
-msgstr ""
+msgstr "感谢您的光临。"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_2l_product_template
@@ -1431,7 +1442,7 @@ msgstr "Dr. Oetker Ristorante Funghi"
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_category
 msgid "Product Categories"
-msgstr ""
+msgstr "商品类别"
 
 #. module: point_of_sale
 #: help:pos.config,journal_id:0
@@ -1448,7 +1459,7 @@ msgstr "折扣"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:467
 #, python-format
 msgid "Invalid Ean"
-msgstr ""
+msgstr "无效的条码"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
@@ -1458,7 +1469,7 @@ msgstr "Lindemans Kriek 37.5cl"
 #. module: point_of_sale
 #: view:pos.config:0
 msgid "Point of Sale Config"
-msgstr ""
+msgstr "销售点配置"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
@@ -1511,7 +1522,7 @@ msgstr "税："
 #. module: point_of_sale
 #: view:pos.session:0
 msgid "+ Transactions"
-msgstr ""
+msgstr "+ 交易"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
@@ -1541,12 +1552,12 @@ msgstr "用户"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:194
 #, python-format
 msgid "Kg"
-msgstr ""
+msgstr "千克"
 
 #. module: point_of_sale
 #: field:product.product,available_in_pos:0
 msgid "Available in the Point of Sale"
-msgstr ""
+msgstr "可在销售点销售"
 
 #. module: point_of_sale
 #: selection:pos.config,state:0
@@ -1563,7 +1574,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:338
 #, python-format
 msgid "The scanned product was not recognized"
-msgstr ""
+msgstr "无法识别扫描的商品"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -1613,7 +1624,7 @@ msgstr "11月"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:267
 #, python-format
 msgid "Please scan an item or your member card"
-msgstr ""
+msgstr "请扫描商品或您的会员卡"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.poivron_verts_product_template
@@ -1644,7 +1655,7 @@ msgid "Number of Transaction"
 msgstr "交易数"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:759
 #, python-format
 msgid ""
 "There is no receivable account defined to make payment for the partner: "
@@ -1655,7 +1666,7 @@ msgstr ""
 #: view:pos.config:0
 #: selection:pos.config,state:0
 msgid "Inactive"
-msgstr ""
+msgstr "不活跃的"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1679,7 +1690,7 @@ msgstr "取消"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:296
 #, python-format
 msgid "Please put your product on the scale"
-msgstr ""
+msgstr "请将商品放到称上"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -1699,7 +1710,7 @@ msgstr "Timmermans Kriek 37.5cl"
 #. module: point_of_sale
 #: field:pos.config,sequence_id:0
 msgid "Order IDs Sequence"
-msgstr ""
+msgstr "订单号序列"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1815,7 +1826,7 @@ msgid "Difference"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:529
+#: code:addons/point_of_sale/point_of_sale.py:549
 #, python-format
 msgid "Unable to Delete !"
 msgstr "不能删除！"
@@ -1978,7 +1989,7 @@ msgid "Salespeople"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:777
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_out.py:91
 #, python-format
@@ -1986,7 +1997,7 @@ msgid "You have to open at least one cashbox."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1172
 #, python-format
 msgid "No Pricelist !"
 msgstr "没有价格表！"
@@ -2038,7 +2049,7 @@ msgid "No Cash Register Defined !"
 msgstr "没有定义收银机"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:513
+#: code:addons/point_of_sale/point_of_sale.py:515
 #, python-format
 msgid ""
 "No cash statement found for this session. Unable to record returned cash."
@@ -2761,7 +2772,7 @@ msgid "Pos Lines"
 msgstr "销售单明细"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:413
+#: code:addons/point_of_sale/point_of_sale.py:416
 #, python-format
 msgid "Point of Sale Profit"
 msgstr ""
@@ -2774,7 +2785,7 @@ msgid "Please wait, a cashier is on the way"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_session_opening.py:68
+#: code:addons/point_of_sale/wizard/pos_session_opening.py:67
 #: field:pos.box.entries,session_id:0
 #: view:pos.order:0
 #: field:pos.order,session_id:0
@@ -3085,15 +3096,17 @@ msgstr ""
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:300
 #: code:addons/point_of_sale/point_of_sale.py:409
-#: code:addons/point_of_sale/point_of_sale.py:419
-#: code:addons/point_of_sale/point_of_sale.py:457
-#: code:addons/point_of_sale/point_of_sale.py:712
-#: code:addons/point_of_sale/point_of_sale.py:756
-#: code:addons/point_of_sale/point_of_sale.py:818
-#: code:addons/point_of_sale/point_of_sale.py:897
-#: code:addons/point_of_sale/point_of_sale.py:1006
+#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:459
+#: code:addons/point_of_sale/point_of_sale.py:536
+#: code:addons/point_of_sale/point_of_sale.py:733
+#: code:addons/point_of_sale/point_of_sale.py:777
+#: code:addons/point_of_sale/point_of_sale.py:839
+#: code:addons/point_of_sale/point_of_sale.py:920
+#: code:addons/point_of_sale/point_of_sale.py:1031
 #: code:addons/point_of_sale/report/pos_invoice.py:46
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:22
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:46
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:118
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3187,13 +3200,13 @@ msgid "Chaudfontaine 1.5l"
 msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1069
+#: code:addons/point_of_sale/point_of_sale.py:1096
 #, python-format
 msgid "Trade Receivables"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:529
+#: code:addons/point_of_sale/point_of_sale.py:549
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
 msgstr "只有新的或被取消的销售流水可以删除"
@@ -3228,7 +3241,7 @@ msgid "Journal Entry"
 msgstr "日记账簿"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:736
+#: code:addons/point_of_sale/point_of_sale.py:757
 #, python-format
 msgid "There is no receivable account defined to make payment."
 msgstr ""
@@ -3259,7 +3272,7 @@ msgid "Supplier Invoice"
 msgstr "供应商发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:458
+#: code:addons/point_of_sale/point_of_sale.py:460
 #, python-format
 msgid ""
 "You cannot confirm all orders of this session, because they have not the "
@@ -3338,7 +3351,7 @@ msgid "Coca-Cola Regular 1L"
 msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:733
 #, python-format
 msgid "Unable to cancel the picking."
 msgstr "无法取消发货"
@@ -3379,7 +3392,7 @@ msgid "Spa Barisart 1.5l"
 msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:789
+#: code:addons/point_of_sale/point_of_sale.py:810
 #: view:pos.order:0
 #, python-format
 msgid "Return Products"
@@ -3418,7 +3431,7 @@ msgstr "销售明细"
 #: view:res.partner:0
 #: view:res.users:0
 msgid "Point of Sale"
-msgstr "POS"
+msgstr "销售点"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -3495,7 +3508,7 @@ msgid "Default Point of Sale"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:24
+#: code:addons/point_of_sale/wizard/pos_box.py:23
 #, python-format
 msgid "There is no cash register for this PoS Session"
 msgstr ""
@@ -3539,7 +3552,7 @@ msgid "PRO-FORMA"
 msgstr "形式发票"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:839
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr "请提供业务伙伴。"
@@ -3591,7 +3604,7 @@ msgid "Print Receipt"
 msgstr "打印收银条"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:417
+#: code:addons/point_of_sale/point_of_sale.py:420
 #, python-format
 msgid "Point of Sale Loss"
 msgstr ""
@@ -4020,6 +4033,7 @@ msgstr ""
 #~ msgid "Discount percentage"
 #~ msgstr "折扣百分比"
 
+#, python-format
 #~ msgid "Close"
 #~ msgstr "关闭"
 
@@ -4843,9 +4857,11 @@ msgstr ""
 #~ msgid "Subtotal:"
 #~ msgstr "小计:"
 
+#, python-format
 #~ msgid "Validate"
 #~ msgstr "确认"
 
+#, python-format
 #~ msgid "Print"
 #~ msgstr "打印"
 
@@ -4931,6 +4947,7 @@ msgstr ""
 #~ msgid "PoS Backend"
 #~ msgstr "POS后端"
 
+#, python-format
 #~ msgid "Next Order"
 #~ msgstr "下一订单"
 
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 349ad8b4f81..e743a9323e4 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -51,7 +51,7 @@ class pos_config(osv.osv):
         'journal_ids' : fields.many2many('account.journal', 'pos_config_journal_rel', 
              'pos_config_id', 'journal_id', 'Available Payment Methods',
              domain="[('journal_user', '=', True ), ('type', 'in', ['bank', 'cash'])]",),
-        'shop_id' : fields.many2one('sale.shop', 'Shop',
+        'warehouse_id' : fields.many2one('stock.warehouse', 'Warehouse',
              required=True),
         'journal_id' : fields.many2one('account.journal', 'Sale Journal',
              domain=[('type', '=', 'sale')],
@@ -63,6 +63,7 @@ class pos_config(osv.osv):
         'iface_electronic_scale' : fields.boolean('Electronic Scale Interface'),
         'iface_vkeyboard' : fields.boolean('Virtual KeyBoard Interface'),
         'iface_print_via_proxy' : fields.boolean('Print via Proxy'),
+        'iface_invoicing': fields.boolean('Invoicing',help='Enables invoice generation from the Point of Sale'),
 
         'state' : fields.selection(POS_CONFIG_STATE, 'Status', required=True, readonly=True),
         'sequence_id' : fields.many2one('ir.sequence', 'Order IDs Sequence', readonly=True,
@@ -70,6 +71,7 @@ class pos_config(osv.osv):
                 "to customize the reference numbers of your orders."),
         'session_ids': fields.one2many('pos.session', 'config_id', 'Sessions'),
         'group_by' : fields.boolean('Group Journal Items', help="Check this if you want to group the Journal Items by Product while closing a Session"),
+        'pricelist_id': fields.many2one('product.pricelist','Pricelist', required=True)
     }
 
     def _check_cash_control(self, cr, uid, ids, context=None):
@@ -109,18 +111,26 @@ class pos_config(osv.osv):
         return result
 
     def _default_sale_journal(self, cr, uid, context=None):
-        res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale')], limit=1)
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+        res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', company_id)], limit=1, context=context)
         return res and res[0] or False
 
-    def _default_shop(self, cr, uid, context=None):
-        res = self.pool.get('sale.shop').search(cr, uid, [])
+    def _default_warehouse(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', user.company_id.id)], limit=1, context=context)
+        return res and res[0] or False
+
+    def _default_pricelist(self, cr, uid, context=None):
+        res = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')], limit=1, context=context)
         return res and res[0] or False
 
     _defaults = {
         'state' : POS_CONFIG_STATE[0][0],
-        'shop_id': _default_shop,
+        'warehouse_id': _default_warehouse,
         'journal_id': _default_sale_journal,
         'group_by' : True,
+        'pricelist_id': _default_pricelist,
+        'iface_invoicing': True,
     }
 
     def set_active(self, cr, uid, ids, context=None):
@@ -306,7 +316,7 @@ class pos_session(osv.osv):
         # the .xml files as the CoA is not yet installed.
         jobj = self.pool.get('pos.config')
         pos_config = jobj.browse(cr, uid, config_id, context=context)
-        context.update({'company_id': pos_config.shop_id.company_id.id})
+        context.update({'company_id': pos_config.warehouse_id.company_id.id})
         if not pos_config.journal_id:
             jid = jobj.default_get(cr, uid, ['journal_id'], context=context)['journal_id']
             if jid:
@@ -333,7 +343,7 @@ class pos_session(osv.osv):
             bank_values = {
                 'journal_id' : journal.id,
                 'user_id' : uid,
-                'company_id' : pos_config.shop_id.company_id.id
+                'company_id' : pos_config.warehouse_id.company_id.id
             }
             statement_id = self.pool.get('account.bank.statement').create(cr, uid, bank_values, context=context)
             bank_statement_ids.append(statement_id)
@@ -407,7 +417,7 @@ 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 "))
@@ -485,13 +495,17 @@ class pos_order(osv.osv):
         #_logger.info("orders: %r", orders)
         order_ids = []
         for tmp_order in orders:
+            to_invoice = tmp_order['to_invoice']
             order = tmp_order['data']
+
+
             order_id = self.create(cr, uid, {
                 'name': order['name'],
                 'user_id': order['user_id'] or False,
                 'session_id': order['pos_session_id'],
                 'lines': order['lines'],
-                'pos_reference':order['name']
+                'pos_reference':order['name'],
+                'partner_id': order['partner_id'] or False
             }, context)
 
             for payments in order['statement_ids']:
@@ -522,6 +536,12 @@ class pos_order(osv.osv):
                 }, context=context)
             order_ids.append(order_id)
             self.signal_paid(cr, uid, [order_id])
+
+            if to_invoice:
+                self.action_invoice(cr, uid, [order_id], context)
+                order_obj = self.browse(cr, uid, order_id, context)
+                self.pool['account.invoice'].signal_invoice_open(cr, uid, [order_obj.invoice_id.id])
+
         return order_ids
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -545,7 +565,7 @@ class pos_order(osv.osv):
     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):
@@ -594,7 +614,7 @@ class pos_order(osv.osv):
     _columns = {
         'name': fields.char('Order Ref', size=64, required=True, readonly=True),
         'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True),
-        'shop_id': fields.related('session_id', 'config_id', 'shop_id', relation='sale.shop', type='many2one', string='Shop', store=True, readonly=True),
+        'warehouse_id': fields.related('session_id', 'config_id', 'warehouse_id', relation='stock.warehouse', type='many2one', string='Warehouse', store=True, readonly=True),
         'date_order': fields.datetime('Order Date', readonly=True, select=True),
         'user_id': fields.many2one('res.users', 'Salesman', help="Person who uses the the cash register. It can be a reliever, a student or an interim employee."),
         'amount_tax': fields.function(_amount_all, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
@@ -638,8 +658,7 @@ class pos_order(osv.osv):
         session_ids = self._default_session(cr, uid, context) 
         if session_ids:
             session_record = self.pool.get('pos.session').browse(cr, uid, session_ids, context=context)
-            shop = self.pool.get('sale.shop').browse(cr, uid, session_record.config_id.shop_id.id, context=context)
-            return shop.pricelist_id and shop.pricelist_id.id or False
+            return session_record.config_id.pricelist_id and session_record.config_id.pricelist_id.id or False
         return False
 
     _defaults = {
@@ -690,8 +709,8 @@ class pos_order(osv.osv):
                 'auto_picking': True,
             }, context=context)
             self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
-            location_id = order.shop_id.warehouse_id.lot_stock_id.id
-            output_id = order.shop_id.warehouse_id.lot_output_id.id
+            location_id = order.warehouse_id.lot_stock_id.id
+            output_id = order.warehouse_id.lot_output_id.id
 
             for line in order.lines:
                 if line.product_id and line.product_id.type == 'service':
@@ -875,6 +894,7 @@ class pos_order(osv.osv):
                 inv_line_ref.create(cr, uid, inv_line, context=context)
             inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
             self.signal_invoice(cr, uid, [order.id])
+            inv_ref.signal_validate(cr, uid, [inv_id])
 
         if not inv_ids: return {}
 
@@ -969,11 +989,11 @@ class pos_order(osv.osv):
                 })
 
                 if data_type == 'product':
-                    key = ('product', values['partner_id'], values['product_id'])
+                    key = ('product', values['partner_id'], values['product_id'], values['debit'] > 0)
                 elif data_type == 'tax':
-                    key = ('tax', values['partner_id'], values['tax_code_id'],)
+                    key = ('tax', values['partner_id'], values['tax_code_id'], values['debit'] > 0)
                 elif data_type == 'counter_part':
-                    key = ('counter_part', values['partner_id'], values['account_id'])
+                    key = ('counter_part', values['partner_id'], values['account_id'], values['debit'] > 0)
                 else:
                     return
 
@@ -1163,7 +1183,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.'))
 
@@ -1332,7 +1352,7 @@ class product_product(osv.osv):
         'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, example: money lost, transfer to bank, etc."),
         'available_in_pos': fields.boolean('Available in the Point of Sale', help='Check if you want this product to appear in the Point of Sale'), 
         'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
-            help="The Point of Sale Category this products belongs to. Those categories are used to group similar products and are specific to the Point of Sale."),
+            help="These products belong to those categories that are used to group similar products and are specific to the Point of Sale."),
         'to_weight' : fields.boolean('To Weight', help="Check if the product should be weighted (mainly used with self check-out interface)."),
     }
 
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 1c61218a4cb..c27bb5fc7f3 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -290,7 +290,7 @@
         <record id="peche" model="product.product">
           <field name="available_in_pos">True</field>
           <field name="list_price">5.10</field>
-          <field name="name">Fishing</field>
+          <field name="name">Peaches</field>
           <field name="to_weight">True</field>
           <field name="ean13">2300001000008</field>
           <field name="pos_categ_id" ref="rouges_noyau_fruits"/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 8a53015b7d7..f87fc9603a8 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -84,7 +84,7 @@
                         <page string="Extra Info">
                             <group string="General Information">
                                 <field name="company_id" groups="base.group_multi_company"/>
-                                <field name="shop_id" widget="selection"/>
+                                <field name="warehouse_id" widget="selection" groups="stock.group_locations"/>
                                 <field name="user_id"/>
                                 <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
                                 <field name="picking_id" readonly="1"/>
@@ -769,12 +769,16 @@
                     </header>
 
                     <sheet>
-                        <group>
-                        <field name="name"/>
-                        <field name="shop_id" widget="selection" groups="stock.group_locations" />
-                        <field name="journal_id" widget="selection" />
-                        <field name="sequence_id" readonly="1" groups="base.group_no_one" />
-                        <field name="group_by" groups="account.group_account_user"  />
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <group col="4">
+                            <field name="warehouse_id" widget="selection" groups="stock.group_locations" />
+                            <field name="pricelist_id" groups="product.group_sale_pricelist"/>
+                            <field name="journal_id" widget="selection"/>
+                            <field name="group_by" groups="account.group_account_user"/>
+                            <field name="sequence_id" readonly="1" groups="base.group_no_one"/>
                         </group>
                         <separator string="Available Payment Methods" colspan="4"/>
                         <field name="journal_ids" colspan="4" nolabel="1">
@@ -790,6 +794,7 @@
                                 <field name="iface_self_checkout" />
                                 <field name="iface_cashdrawer" />
                                 <field name="iface_payment_terminal" />
+                                <field name="iface_invoicing" />
                             </group>
                             <group>
                                 <field name="iface_electronic_scale" />
@@ -809,7 +814,7 @@
             <field name="arch" type="xml">
                 <tree string="Point of Sale Configuration" colors="grey:state == 'inactive'">
                     <field name="name" />
-                    <field name="shop_id" />
+                    <field name="warehouse_id" groups="stock.group_locations"/>
                     <field name="state" />
                 </tree>
             </field>
@@ -823,7 +828,7 @@
                     <field name="name" />
                     <filter string="Active" domain="[('state', '=', 'active')]" />
                     <filter string="Inactive" domain="[('state', '=', 'inactive')]" />
-                    <field name="shop_id" />
+                    <field name="warehouse_id" groups="stock.group_locations" />
                 </search>
             </field>
         </record>
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index f4df5f0f5f6..f3ee5e317c8 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -41,7 +41,7 @@ class pos_order_report(osv.osv):
         'price_total':fields.float('Total Price', readonly=True),
         'total_discount':fields.float('Total Discount', readonly=True),
         'average_price': fields.float('Average Price', readonly=True,group_operator="avg"),
-        'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
+        'warehouse_id':fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
         'product_qty':fields.integer('# of Qty', readonly=True),
@@ -69,7 +69,7 @@ class pos_order_report(osv.osv):
                     s.partner_id as partner_id,
                     s.state as state,
                     s.user_id as user_id,
-                    s.shop_id as shop_id,
+                    s.warehouse_id as warehouse_id,
                     s.company_id as company_id,
                     s.sale_journal as journal_id,
                     l.product_id as product_id
@@ -80,7 +80,7 @@ class pos_order_report(osv.osv):
                 group by
                     to_char(s.date_order, 'dd-MM-YYYY'),to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),
                     to_char(s.date_order, 'YYYY-MM-DD'), s.partner_id,s.state,
-                    s.user_id,s.shop_id,s.company_id,s.sale_journal,l.product_id,s.create_date
+                    s.user_id,s.warehouse_id,s.company_id,s.sale_journal,l.product_id,s.create_date
                 having
                     sum(l.qty * u.factor) != 0)""")
 
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 8d7bf84171a..135b6dcadaa 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -13,7 +13,7 @@
                     <field name="month" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
-                    <field name="shop_id" invisible="1"/>
+                    <field name="warehouse_id" invisible="1"/>
                     <!--<field name="journal_id" invisible="1"/>-->
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="nbr" sum="# of Lines"/>
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 0802114bb48..02b8a5b1a1a 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -75,7 +75,7 @@
     <para style="terp_default_Centre_9">[[ address and display_address(address)]]</para>
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">User : [[ o.user_id.name ]]</para>
-    <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
+    <para style="terp_default_Centre_9">Warehouse : [[ o.warehouse_id.name ]]</para>
     <para style="terp_default_Centre_9">Date : [[ o.date_order ]]</para>
     <para style="P4">
       <font color="white"> </font>
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 1d2c22053fb..b278c48e1f2 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -8,7 +8,7 @@ access_account_journal_pos_user,account.journal pos_user,account.model_account_j
 access_account_move_pos_user,account.move pos_user,account.model_account_move,group_pos_user,1,1,1,0
 access_account_account_pos_user,account.account pos_user,account.model_account_account,group_pos_user,1,0,0,0
 access_stock_picking_pos_user,stock.picking pos_user,stock.model_stock_picking,group_pos_user,1,1,1,1
-access_sale_shop_pos_user,sale.shop pos_user,sale.model_sale_shop,group_pos_user,1,0,0,0
+access_stock_warehouse_pos_user,stock.warehouse pos_user,stock.model_stock_warehouse,group_pos_user,1,0,0,0
 access_pos_order_stock_worker,pos.order stock_worker,model_pos_order,stock.group_stock_user,1,0,0,0
 access_stock_move_pos_user,stock.move pos_user,stock.model_stock_move,group_pos_user,1,1,1,1
 access_report_sales_by_user_pos,report.sales.by.user.pos,model_report_sales_by_user_pos,group_pos_user,1,0,0,0
diff --git a/addons/point_of_sale/static/src/img/icon.png b/addons/point_of_sale/static/description/icon.png
similarity index 100%
rename from addons/point_of_sale/static/src/img/icon.png
rename to addons/point_of_sale/static/description/icon.png
diff --git a/addons/point_of_sale/html/index.html b/addons/point_of_sale/static/description/index.html
similarity index 98%
rename from addons/point_of_sale/html/index.html
rename to addons/point_of_sale/static/description/index.html
index 130806ddb11..7f1b7a5c097 100644
--- a/addons/point_of_sale/html/index.html
+++ b/addons/point_of_sale/static/description/index.html
@@ -22,7 +22,7 @@
                 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>
+                <a href="http://www.openerp.com/start?app=point_of_sale" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/point_of_sale/html/pos_checkout.jpg b/addons/point_of_sale/static/description/pos_checkout.jpg
similarity index 100%
rename from addons/point_of_sale/html/pos_checkout.jpg
rename to addons/point_of_sale/static/description/pos_checkout.jpg
diff --git a/addons/point_of_sale/html/pos_customer_form.png b/addons/point_of_sale/static/description/pos_customer_form.png
similarity index 100%
rename from addons/point_of_sale/html/pos_customer_form.png
rename to addons/point_of_sale/static/description/pos_customer_form.png
diff --git a/addons/point_of_sale/html/pos_customers.png b/addons/point_of_sale/static/description/pos_customers.png
similarity index 100%
rename from addons/point_of_sale/html/pos_customers.png
rename to addons/point_of_sale/static/description/pos_customers.png
diff --git a/addons/point_of_sale/html/pos_devices.png b/addons/point_of_sale/static/description/pos_devices.png
similarity index 100%
rename from addons/point_of_sale/html/pos_devices.png
rename to addons/point_of_sale/static/description/pos_devices.png
diff --git a/addons/point_of_sale/html/pos_invoice.png b/addons/point_of_sale/static/description/pos_invoice.png
similarity index 100%
rename from addons/point_of_sale/html/pos_invoice.png
rename to addons/point_of_sale/static/description/pos_invoice.png
diff --git a/addons/point_of_sale/html/pos_offline.png b/addons/point_of_sale/static/description/pos_offline.png
similarity index 100%
rename from addons/point_of_sale/html/pos_offline.png
rename to addons/point_of_sale/static/description/pos_offline.png
diff --git a/addons/point_of_sale/html/pos_product_form.png b/addons/point_of_sale/static/description/pos_product_form.png
similarity index 100%
rename from addons/point_of_sale/html/pos_product_form.png
rename to addons/point_of_sale/static/description/pos_product_form.png
diff --git a/addons/point_of_sale/html/pos_products.png b/addons/point_of_sale/static/description/pos_products.png
similarity index 100%
rename from addons/point_of_sale/html/pos_products.png
rename to addons/point_of_sale/static/description/pos_products.png
diff --git a/addons/point_of_sale/html/pos_sc_01.jpg b/addons/point_of_sale/static/description/pos_sc_01.jpg
similarity index 100%
rename from addons/point_of_sale/html/pos_sc_01.jpg
rename to addons/point_of_sale/static/description/pos_sc_01.jpg
diff --git a/addons/point_of_sale/html/pos_sc_02.jpg b/addons/point_of_sale/static/description/pos_sc_02.jpg
similarity index 100%
rename from addons/point_of_sale/html/pos_sc_02.jpg
rename to addons/point_of_sale/static/description/pos_sc_02.jpg
diff --git a/addons/point_of_sale/html/pos_sc_03.jpg b/addons/point_of_sale/static/description/pos_sc_03.jpg
similarity index 100%
rename from addons/point_of_sale/html/pos_sc_03.jpg
rename to addons/point_of_sale/static/description/pos_sc_03.jpg
diff --git a/addons/point_of_sale/html/pos_ui_01.png b/addons/point_of_sale/static/description/pos_ui_01.png
similarity index 100%
rename from addons/point_of_sale/html/pos_ui_01.png
rename to addons/point_of_sale/static/description/pos_ui_01.png
diff --git a/addons/point_of_sale/html/pos_ui_02.png b/addons/point_of_sale/static/description/pos_ui_02.png
similarity index 100%
rename from addons/point_of_sale/html/pos_ui_02.png
rename to addons/point_of_sale/static/description/pos_ui_02.png
diff --git a/addons/point_of_sale/html/pos_ui_03.png b/addons/point_of_sale/static/description/pos_ui_03.png
similarity index 100%
rename from addons/point_of_sale/html/pos_ui_03.png
rename to addons/point_of_sale/static/description/pos_ui_03.png
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index d9a4d6d00a9..e328054aa28 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -291,10 +291,15 @@
     display: inline-block;
     text-align: center;
     vertical-align: top;
+    width: 205px;
+    max-height: 232px;
+    overflow-y: auto;
+    overflow-x: hidden;
 }
 .point-of-sale #paypad button {
     height: 50px;
-    width: 208px;
+    display: block;
+    width: 100%;
     margin: 0px -6px 4px -2px;
     font-weight: bold;
     vertical-align: middle;
@@ -302,6 +307,17 @@
     border-top: 1px solid #efefef;
     font-size: 14px;
 }
+.point-of-sale #paypad button, .point-of-sale #numpad button, .point-of-sale .popup button{
+    position: relative;
+    top: 0;
+    -webkit-transition: top 150ms linear;
+       -moz-transition: top 150ms linear;
+        -ms-transition: top 150ms linear;
+            transition: top 150ms linear;
+}
+.point-of-sale #paypad button:active, .point-of-sale #numpad button:active, .point-of-sale .popup button:active{
+    top:3px;
+}
 .point-of-sale #paypad button:hover, .point-of-sale #numpad button:hover, .point-of-sale #numpad .selected-mode, .point-of-sale .popup button:hover {
     border: none;
     color: white;
diff --git a/addons/point_of_sale/static/src/img/icons/png48/invoice.png b/addons/point_of_sale/static/src/img/icons/png48/invoice.png
new file mode 100644
index 00000000000..e65d2ec5a67
Binary files /dev/null and b/addons/point_of_sale/static/src/img/icons/png48/invoice.png differ
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index e47ce66f648..d16ba5a53dd 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -267,11 +267,21 @@ function openerp_pos_db(instance, module){
             return results;
         },
         add_order: function(order){
-            var last_id = this.load('last_order_id',0);
+            var order_id = order.uid;
             var orders  = this.load('orders',[]);
-            orders.push({id: last_id + 1, data: order});
-            this.save('last_order_id',last_id+1);
+
+            // if the order was already stored, we overwrite its data
+            for(var i = 0, len = orders.length; i < len; i++){
+                if(orders[i].id === order_id){
+                    orders[i].data = order;
+                    this.save('orders',orders);
+                    return order_id;
+                }
+            }
+
+            orders.push({id: order_id, data: order});
             this.save('orders',orders);
+            return order_id;
         },
         remove_order: function(order_id){
             var orders = this.load('orders',[]);
@@ -283,5 +293,14 @@ function openerp_pos_db(instance, module){
         get_orders: function(){
             return this.load('orders',[]);
         },
+        get_order: function(order_id){
+            var orders = this.get_orders();
+            for(var i = 0, len = orders.length; i < len; i++){
+                if(orders[i].id === order_id){
+                    return orders[i];
+                }
+            }
+            return undefined;
+        },
     });
 }
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index e7d0376938c..835b7fe7b5a 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -12,6 +12,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             
             this.weight = 0;
             this.weighting = false;
+            this.debug_weight = 0;
+            this.use_debug_weight = false;
 
             this.paying = false;
             this.default_payment_status = {
@@ -92,38 +94,36 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         // and a weighting_end()
         weighting_read_kg: function(){
             var self = this;
-            if(this.bypass_proxy){
-                return this.weight;
-            }else{
-                this.message('weighting_read_kg',{})
-                    .done(function(weight){
-                        if(self.weighting && !self.bypass_proxy){
+            this.message('weighting_read_kg',{})
+                .done(function(weight){
+                    if(self.weighting){
+                        if(self.use_debug_weight){
+                            self.weight = self.debug_weight;
+                        }else{
                             self.weight = weight;
                         }
-                    });
-                return this.weight;
-            }
+                    }
+                });
+            return this.weight;
         },
 
         // sets a custom weight, ignoring the proxy returned value. 
         debug_set_weight: function(kg){
-            this.bypass_proxy = true;
-            this.weight = kg;
+            this.use_debug_weight = true;
+            this.debug_weight = kg;
         },
 
         // resets the custom weight and re-enable listening to the proxy for weight values
         debug_reset_weight: function(){
-            this.bypass_proxy = false;
-            this.weight = 0;
+            this.use_debug_weight = false;
+            this.debug_weight = 0;
         },
 
         // the client has finished weighting products
         weighting_end: function(){
-            if(!this.bypass_proxy){
-                this.weight = 0;
-                this.weighting = false;
-                this.message('weighting_end');
-            }
+            this.weight = 0;
+            this.weighting = false;
+            this.message('weighting_end');
         },
 
         // the pos asks the client to pay 'price' units
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 13003bcf19f..70fdc89246e 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -104,7 +104,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
                     return self.fetch('res.currency',['symbol','position','rounding','accuracy'],[['id','=',self.get('company').currency_id[0]]]);
                 }).then(function(currencies){
-                    console.log('Currency:',currencies[0]);
                     self.set('currency',currencies[0]);
 
                     return self.fetch('product.uom', null, null);
@@ -142,10 +141,10 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
                     return self.fetch(
                         'pos.config',
-                        ['name','journal_ids','shop_id','journal_id',
+                        ['name','journal_ids','warehouse_id','journal_id','pricelist_id',
                          'iface_self_checkout', 'iface_led', 'iface_cashdrawer',
                          'iface_payment_terminal', 'iface_electronic_scale', 'iface_barscan', 'iface_vkeyboard',
-                         'iface_print_via_proxy','iface_cashdrawer','state','sequence_id','session_ids'],
+                         'iface_print_via_proxy','iface_cashdrawer','iface_invoicing','state','sequence_id','session_ids'],
                         [['id','=', self.get('pos_session').config_id[0]]]
                     );
                 }).then(function(configs){
@@ -156,8 +155,9 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     self.iface_vkeyboard           =  !!pos_config.iface_vkeyboard; 
                     self.iface_self_checkout       =  !!pos_config.iface_self_checkout;
                     self.iface_cashdrawer          =  !!pos_config.iface_cashdrawer;
+                    self.iface_invoicing           =  !!pos_config.iface_invoicing;
 
-                    return self.fetch('sale.shop',[],[['id','=',pos_config.shop_id[0]]]);
+                    return self.fetch('stock.warehouse',[],[['id','=',pos_config.warehouse_id[0]]]);
                 }).then(function(shops){
                     self.set('shop',shops[0]);
 
@@ -174,7 +174,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                         ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
-                        {pricelist: self.get('shop').pricelist_id[0]} // context for price
+                        {pricelist: self.get('pos_config').pricelist_id[0]} // context for price
                     );
                 }).then(function(products){
                     self.db.add_products(products);
@@ -234,18 +234,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         on_removed_order: function(removed_order){
             if( this.get('orders').isEmpty()){
                 this.add_new_order();
-            }
-            if( this.get('selectedOrder') === removed_order){
+            }else{
                 this.set({ selectedOrder: this.get('orders').last() });
             }
         },
 
-        // saves the order locally and try to send it to the backend. 'record' is a bizzarely defined JSON version of the Order
-        push_order: function(record) {
-            this.db.add_order(record);
-            this.flush();
-        },
-
         //creates a new empty order and sets it as the current order
         add_new_order: function(){
             var order = new module.Order({pos:this});
@@ -253,45 +246,161 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.set('selectedOrder', order);
         },
 
+        // saves the order locally and try to send it to the backend. 
+        // it returns a deferred that succeeds after having tried to send the order and all the other pending orders.
+        push_order: function(order) {
+            var self = this;
+            var order_id = this.db.add_order(order.export_as_JSON());
+            var pushed = new $.Deferred();
+
+            this.set('nbr_pending_operations',self.db.get_orders().length);
+
+            this.flush_mutex.exec(function(){
+                var flushed = self._flush_all_orders();
+
+                flushed.always(function(){
+                    pushed.resolve();
+                });
+
+                return flushed;
+            });
+            return pushed;
+        },
+
+        // saves the order locally and try to send it to the backend and make an invoice
+        // returns a deferred that succeeds when the order has been posted and successfully generated
+        // an invoice. This method can fail in various ways:
+        // error-no-client: the order must have an associated partner_id. You can retry to make an invoice once
+        //     this error is solved
+        // error-transfer: there was a connection error during the transfer. You can retry to make the invoice once
+        //     the network connection is up 
+
+        push_and_invoice_order: function(order){
+            var self = this;
+            var invoiced = new $.Deferred(); 
+
+            if(!order.get_client()){
+                invoiced.reject('error-no-client');
+                return invoiced;
+            }
+
+            var order_id = this.db.add_order(order.export_as_JSON());
+
+            this.set('nbr_pending_operations',self.db.get_orders().length);
+
+            this.flush_mutex.exec(function(){
+                var done = new $.Deferred(); // holds the mutex
+
+                // send the order to the server
+                // we have a 30 seconds timeout on this push.
+                // FIXME: if the server takes more than 30 seconds to accept the order,
+                // the client will believe it wasn't successfully sent, and very bad
+                // things will happen as a duplicate will be sent next time
+                // so we must make sure the server detects and ignores duplicated orders
+
+                var transfer = self._flush_order(order_id, {timeout:30000, to_invoice:true});
+                
+                transfer.fail(function(){
+                    invoiced.reject('error-transfer');
+                    done.reject();
+                });
+
+                // on success, get the order id generated by the server
+                transfer.pipe(function(order_server_id){    
+                    // generate the pdf and download it
+                    self.pos_widget.do_action('point_of_sale.pos_invoice_report',{additional_context:{ 
+                        active_ids:order_server_id,
+                    }});
+                    invoiced.resolve();
+                    done.resolve();
+                });
+
+                return done;
+
+            });
+
+            return invoiced;
+        },
+
         // attemps to send all pending orders ( stored in the pos_db ) to the server,
         // and remove the successfully sent ones from the db once
         // it has been confirmed that they have been sent correctly.
         flush: function() {
-            //TODO make the mutex work 
-            //this makes sure only one _int_flush is called at the same time
-            /*
-            return this.flush_mutex.exec(_.bind(function() {
-                return this._flush(0);
-            }, this));
-            */
-            this._flush(0);
+            var self = this;
+            var flushed = new $.Deferred();
+
+            this.flush_mutex.exec(function(){
+                var done = new $.Deferred();
+
+                self._flush_all_orders()
+                    .done(  function(){ flushed.resolve();})
+                    .fail(  function(){ flushed.reject(); })
+                    .always(function(){ done.resolve();   });
+
+                return done;
+            });
+
+            return flushed;
         },
-        // attempts to send an order of index 'index' in the list of order to send. The index
-        // is used to skip orders that failed. do not call this method outside the mutex provided
-        // by flush() 
-        _flush: function(index){
+
+        // attempts to send the locally stored order of id 'order_id'
+        // the sending is asynchronous and can take some time to decide if it is successful or not
+        // it is therefore important to only call this method from inside a mutex
+        // this method returns a deferred indicating wether the sending was successful or not
+        // there is a timeout parameter which is set to 2 seconds by default. 
+        _flush_order: function(order_id, options){
+            var self   = this;
+            options = options || {};
+            timeout = typeof options.timeout === 'number' ? options.timeout : 5000;
+
+            var order  = this.db.get_order(order_id);
+            order.to_invoice = options.to_invoice || false;
+
+            if(!order){
+                // flushing a non existing order always fails
+                return (new $.Deferred()).reject();
+            }
+
+            // we try to send the order. shadow prevents a spinner if it takes too long. (unless we are sending an invoice,
+            // then we want to notify the user that we are waiting on something )
+            var rpc = (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{shadow: !options.to_invoice, timeout:timeout});
+
+            rpc.fail(function(unused,event){
+                // prevent an error popup creation by the rpc failure
+                // we want the failure to be silent as we send the orders in the background
+                event.preventDefault();
+                console.error('Failed to send order:',order);
+            });
+
+            rpc.done(function(){
+                self.db.remove_order(order_id);
+                self.set('nbr_pending_operations',self.db.get_orders().length);
+            });
+
+            return rpc;
+        },
+        
+        // attempts to send all the locally stored orders. As with _flush_order, it should only be
+        // called from within a mutex. 
+        // this method returns a deferred that always succeeds when all orders have been tried to be sent,
+        // even if none of them could actually be sent. 
+        _flush_all_orders: function(){
             var self = this;
             var orders = this.db.get_orders();
-            self.set('nbr_pending_operations',orders.length);
+            var tried_all = new $.Deferred();
 
-            var order  = orders[index];
-            if(!order){
-                return;
+            function rec_flush(index){
+                if(index < orders.length){
+                    self._flush_order(orders[index].id).always(function(){ 
+                        rec_flush(index+1); 
+                    })
+                }else{
+                    tried_all.resolve();
+                }
             }
-            //try to push an order to the server
-            // shadow : true is to prevent a spinner to appear in case of timeout
-            (new instance.web.Model('pos.order')).call('create_from_ui',[[order]],undefined,{ shadow:true })
-                .fail(function(unused, event){
-                    //don't show error popup if it fails 
-                    event.preventDefault();
-                    console.error('Failed to send order:',order);
-                    self._flush(index+1);
-                })
-                .done(function(){
-                    //remove from db if success
-                    self.db.remove_order(order.id);
-                    self._flush(index);
-                });
+            rec_flush(0);
+
+            return tried_all;
         },
 
         scan_product: function(parsed_ean){
@@ -590,11 +699,12 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
     module.Order = Backbone.Model.extend({
         initialize: function(attributes){
             Backbone.Model.prototype.initialize.apply(this, arguments);
+            this.uid =     this.generateUniqueId();
             this.set({
                 creationDate:   new Date(),
                 orderLines:     new module.OrderlineCollection(),
                 paymentLines:   new module.PaymentlineCollection(),
-                name:           "Order " + this.generateUniqueId(),
+                name:           "Order " + this.uid,
                 client:         null,
             });
             this.pos =     attributes.pos; 
@@ -770,7 +880,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 currency: this.pos.get('currency'),
             };
         },
-        exportAsJSON: function() {
+        export_as_JSON: function() {
             var orderLines, paymentLines;
             orderLines = [];
             (this.get('orderLines')).each(_.bind( function(item) {
@@ -789,8 +899,9 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 lines: orderLines,
                 statement_ids: paymentLines,
                 pos_session_id: this.pos.get('pos_session').id,
-                partner_id: this.pos.get('client') ? this.pos.get('client').id : undefined,
+                partner_id: this.get_client() ? this.get_client().id : false,
                 user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id,
+                uid: this.uid,
             };
         },
         getSelectedLine: function(){
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 0bd399428ed..8c588adadf3 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -16,7 +16,8 @@
 // hide()s
 
 function openerp_pos_screens(instance, module){ //module is instance.point_of_sale
-    var QWeb = instance.web.qweb;
+    var QWeb = instance.web.qweb,
+    _t = instance.web._t;
 
     module.ScreenSelector = instance.web.Class.extend({
         init: function(options){
@@ -264,7 +265,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             // we add the help button by default. we do this because the buttons are cleared on each refresh so that
             // the button stay local to each screen
             this.pos_widget.left_action_bar.add_new_button({
-                    label: 'help',
+                    label: _t('Help'),
                     icon: '/point_of_sale/static/src/img/icons/png48/help.png',
                     click: function(){ self.help_button_action(); },
                 });
@@ -433,6 +434,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         template:'ErrorNegativePricePopupWidget',
     });
 
+    module.ErrorNoClientPopupWidget = module.ErrorPopupWidget.extend({
+        template: 'ErrorNoClientPopupWidget',
+    });
+
+    module.ErrorInvoiceTransferPopupWidget = module.ErrorPopupWidget.extend({
+        template: 'ErrorInvoiceTransferPopupWidget',
+    });
+
     module.ScaleInviteScreenWidget = module.ScreenWidget.extend({
         template:'ScaleInviteScreenWidget',
 
@@ -451,14 +460,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     clearInterval(this.intervalID);
                     self.pos_widget.screen_selector.set_current_screen(self.next_screen);
                 }
-            },500);
+            },100);
 
             this.add_action_button({
-                    label: 'back',
+                    label: _t('Back'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
                         clearInterval(this.intervalID);
-                        self.pos.proxy.weighting_end();
                         self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
                     }
                 });
@@ -483,7 +491,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
 
             this.add_action_button({
-                    label: 'back',
+                    label: _t('Back'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){
                         self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
@@ -491,7 +499,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                 });
 
             this.validate_button = this.add_action_button({
-                    label: 'Validate',
+                    label: _t('Validate'),
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
                     click: function(){
                         self.order_product();
@@ -506,7 +514,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     self.weight = weight;
                     self.renderElement();
                 }
-            },200);
+            },100);
         },
         renderElement: function(){
             var self = this;
@@ -639,7 +647,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
                             var cashregister = selfCheckoutRegisters[0] || self.pos.get('cashRegisters').models[0];
                             currentOrder.addPaymentLine(cashregister);
-                            self.pos.push_order(currentOrder.exportAsJSON())
+                            self.pos.push_order(currentOrder)
                             currentOrder.destroy();
                             self.pos.proxy.transaction_end();
                             self.pos_widget.screen_selector.set_current_screen(self.next_screen);
@@ -674,7 +682,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             }
 
             this.add_action_button({
-                    label: 'back',
+                    label: _t('Back'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
                        self.queue.schedule(self.cancel);
@@ -714,7 +722,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             var self = this;
 
             this.add_action_button({
-                    label: 'help',
+                    label: _t('Help'),
                     icon: '/point_of_sale/static/src/img/icons/png48/help.png',
                     click: function(){ 
                         $('.goodbye-message').css({opacity:1}).hide();
@@ -768,7 +776,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
             if(this.pos_widget.screen_selector.current_mode === 'client'){ 
                 this.add_action_button({
-                        label: 'pay',
+                        label: _t('Pay'),
                         icon: '/point_of_sale/static/src/img/icons/png48/go-next.png',
                         click: function(){  
                             self.pos_widget.screen_selector.set_current_screen(self.client_next_screen);
@@ -807,19 +815,42 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this._super();
             var self = this;
 
-            this.add_action_button({
-                    label: 'Print',
+            var print_button = this.add_action_button({
+                    label: _t('Print'),
                     icon: '/point_of_sale/static/src/img/icons/png48/printer.png',
                     click: function(){ self.print(); },
                 });
 
-            this.add_action_button({
-                    label: 'Next Order',
+            var finish_button = this.add_action_button({
+                    label: _t('Next Order'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-next.png',
                     click: function() { self.finishOrder(); },
                 });
 
-            window.print();
+            this.print();
+
+            // THIS IS THE HACK OF THE CENTURY
+            //
+            // The problem is that in chrome the print() is asynchronous and doesn't
+            // execute until all rpc are finished. So it conflicts with the rpc used
+            // to send the orders to the backend, and the user is able to go to the next 
+            // screen before the printing dialog is opened. The problem is that what's 
+            // printed is whatever is in the page when the dialog is opened and not when it's called,
+            // and so you end up printing the product list instead of the receipt... 
+            //
+            // Fixing this would need a re-architecturing
+            // of the code to postpone sending of orders after printing.
+            //
+            // But since the print dialog also blocks the other asynchronous calls, the
+            // button enabling in the setTimeout() is blocked until the printing dialog is 
+            // closed. But the timeout has to be big enough or else it doesn't work
+            // 2 seconds is the same as the default timeout for sending orders and so the dialog
+            // should have appeared before the timeout... so yeah that's not ultra reliable. 
+
+            finish_button.set_disabled(true);   
+            setTimeout(function(){
+                finish_button.set_disabled(false);
+            }, 2000);
         },
         print: function() {
             window.print();
@@ -869,22 +900,33 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
             this.set_numpad_state(this.pos_widget.numpad.state);
             
-            this.back_button = this.add_action_button({
-                    label: 'Back',
+            this.add_action_button({
+                    label: _t('Back'),
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
                         self.pos_widget.screen_selector.set_current_screen(self.back_screen);
                     },
                 });
-            
-            this.validate_button = this.add_action_button({
-                    label: 'Validate',
+
+            this.add_action_button({
+                    label: _t('Validate'),
                     name: 'validation',
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
                     click: function(){
                         self.validateCurrentOrder();
                     },
                 });
+           
+            if(this.pos.iface_invoicing){
+                this.add_action_button({
+                        label: 'Invoice',
+                        name: 'invoice',
+                        icon: '/point_of_sale/static/src/img/icons/png48/invoice.png',
+                        click: function(){
+                            self.validateCurrentOrder({invoice: true});
+                        },
+                    });
+            }
 
             this.updatePaymentSummary();
             this.line_refocus();
@@ -897,15 +939,44 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         back: function() {
             this.pos_widget.screen_selector.set_current_screen(self.back_screen);
         },
-        validateCurrentOrder: function() {
+        validateCurrentOrder: function(options) {
+            var self = this;
+            options = options || {};
+
             var currentOrder = this.pos.get('selectedOrder');
 
-            this.pos.push_order(currentOrder.exportAsJSON()) 
-            if(this.pos.iface_print_via_proxy){
-                this.pos.proxy.print_receipt(currentOrder.export_for_printing());
-                this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
+
+            if(options.invoice){
+                // deactivate the validation button while we try to send the order
+                this.pos_widget.action_bar.set_button_disabled('validation',true);
+                this.pos_widget.action_bar.set_button_disabled('invoice',true);
+
+                var invoiced = this.pos.push_and_invoice_order(currentOrder);
+
+                invoiced.fail(function(error){
+                    if(error === 'error-no-client'){
+                        self.pos_widget.screen_selector.show_popup('error-no-client');
+                    }else{
+                        self.pos_widget.screen_selector.show_popup('error-invoice-transfer');
+                    }
+                    self.pos_widget.action_bar.set_button_disabled('validation',false);
+                    self.pos_widget.action_bar.set_button_disabled('invoice',false);
+                });
+
+                invoiced.done(function(){
+                    self.pos_widget.action_bar.set_button_disabled('validation',false);
+                    self.pos_widget.action_bar.set_button_disabled('invoice',false);
+                    self.pos.get('selectedOrder').destroy();
+                });
+
             }else{
-                this.pos_widget.screen_selector.set_current_screen(this.next_screen);
+                this.pos.push_order(currentOrder) 
+                if(this.pos.iface_print_via_proxy){
+                    this.pos.proxy.print_receipt(currentOrder.export_for_printing());
+                    this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
+                }else{
+                    this.pos_widget.screen_selector.set_current_screen(this.next_screen);
+                }
             }
         },
         bindPaymentLineEvents: function() {
@@ -984,6 +1055,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.000001);
+                this.pos_widget.action_bar.set_button_disabled('invoice', 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 a533f0a8ee6..af0ff2ab746 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -1,5 +1,6 @@
 function openerp_pos_widgets(instance, module){ //module is instance.point_of_sale
-    var QWeb = instance.web.qweb;
+    var QWeb = instance.web.qweb,
+	_t = instance.web._t;
 
     // The ImageCache is used to hide the latency of the application cache on-disk access in chrome 
     // that causes annoying flickering on product pictures. Why the hell a simple access to
@@ -751,6 +752,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 }
             });
             this.$('.button.reset_weight').click(function(){
+                self.$('input.weight').val('');
                 self.pos.proxy.debug_reset_weight();
             });
             this.$('.button.custom_ean').click(function(){
@@ -837,6 +839,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             instance.web.blockUI(); 
 
             this.pos = new module.PosModel(this.session);
+            this.pos.pos_widget = this;
             this.pos_widget = this; //So that pos_widget's childs have pos_widget set automatically
 
             this.numpad_visible = true;
@@ -951,6 +954,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.error_negative_price_popup = new module.ErrorNegativePricePopupWidget(this, {});
             this.error_negative_price_popup.appendTo($('.point-of-sale'));
 
+            this.error_no_client_popup = new module.ErrorNoClientPopupWidget(this, {});
+            this.error_no_client_popup.appendTo($('.point-of-sale'));
+
+            this.error_invoice_transfer_popup = new module.ErrorInvoiceTransferPopupWidget(this, {});
+            this.error_invoice_transfer_popup.appendTo($('.point-of-sale'));
+
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
@@ -980,13 +989,13 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.onscreen_keyboard.appendTo($(".point-of-sale #content")); 
 
             this.close_button = new module.HeaderButtonWidget(this,{
-                label:'Close',
+                label: _t('Close'),
                 action: function(){ self.try_close(); },
             });
             this.close_button.appendTo(this.$('#rightheader'));
 
             this.client_button = new module.HeaderButtonWidget(this,{
-                label:'Self-Checkout',
+                label: _t('Self-Checkout'),
                 action: function(){ self.screen_selector.set_user_mode('client'); },
             });
             this.client_button.appendTo(this.$('#rightheader'));
@@ -1012,6 +1021,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     'error-session': this.error_session_popup,
                     'error-negative-price': this.error_negative_price_popup,
                     'choose-receipt': this.choose_receipt_popup,
+                    'error-no-client': this.error_no_client_popup,
+                    'error-invoice-transfer': this.error_invoice_transfer_popup,
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 3da76ec12d8..e28ea1c06b0 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -336,11 +336,11 @@
         <div class="modal-dialog">
             <div class="popup popup-help">
                 <p class="message">The scanned product was not recognized<br /> Please wait, a cashier is on the way</p>
-            </div>
-        </div>
-        <div class="footer">
-            <div class="button">
-                Ok
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
             </div>
         </div>
     </t>
@@ -361,6 +361,33 @@
         </div>
     </t>
 
+    <t t-name="ErrorNoClientPopupWidget">
+        <div class="modal-dialog">
+            <div class="popup popup-help">
+                <p class="message">An anonymous order cannot be invoiced</p>
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="ErrorInvoiceTransferPopupWidget">
+        <div class="modal-dialog">
+            <div class="popup popup-help">
+                <p class="message">The Order could not be sent to the server for invoicing. Invoices cannot be generated
+                    in offline mode. Please check your internet connection and try again.</p>
+                <div class="footer">
+                    <div class="button">
+                        Ok
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
     <t t-name="ErrorPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
@@ -538,7 +565,6 @@
         <button class="paypad-button" t-att-cash-register-id="widget.cashRegister.get('id')">
             <t t-esc="widget.cashRegister.get('journal').name"/>
         </button>
-        <br />
     </t>
 
     <t t-name="OrderButtonWidget">
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 97ffad805b7..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)
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index f0624948ed5..92bb6721f08 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -112,7 +112,7 @@ class pos_return(osv.osv_memory):
                 source_stock_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
                 cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
                             "WHERE w.lot_stock_id=s.id AND w.id=%s ",
-                            (order_id.shop_id.warehouse_id.id,))
+                            (order_id.warehouse_id.id,))
                 res = cr.fetchone()
                 location_id = res and res[0] or None
                 new_picking = picking_obj.copy(cr, uid, order_id.picking_id.id, {'name':'%s (return)' % order_id.name,
@@ -205,7 +205,7 @@ class add_product(osv.osv_memory):
                 stock_dest_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
                 cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
                             "WHERE w.lot_stock_id=s.id AND w.id=%s ",
-                            (order_id.shop_id.warehouse_id.id,))
+                            (order_id.warehouse_id.id,))
                 res=cr.fetchone()
                 location_id=res and res[0] or None
                 prod_id=prod_obj.browse(cr, uid, prod, context=context)
@@ -268,7 +268,7 @@ class add_product(osv.osv_memory):
             stock_dest_id = property_obj.get(cr, uid, 'property_stock_customer', 'res.partner', context=context).id
             cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
                         " WHERE w.lot_stock_id=s.id AND w.id=%s ",
-                        (order_id.shop_id.warehouse_id.id,))
+                        (order_id.warehouse_id.id,))
             res=cr.fetchone()
             location_id=res and res[0] or None
 
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index 39e7c564831..3d6e314d033 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -85,6 +85,7 @@ class pos_session_opening(osv.osv_memory):
         session_ids = proxy.search(cr, uid, [
             ('state', '!=', 'closed'),
             ('config_id', '=', config_id),
+            ('user_id', '=', uid),
         ], context=context)
         if session_ids:
             session = proxy.browse(cr, uid, session_ids[0], context=context)
diff --git a/addons/portal/i18n/th.po b/addons/portal/i18n/th.po
new file mode 100644
index 00000000000..ee42af496ca
--- /dev/null
+++ b/addons/portal/i18n/th.po
@@ -0,0 +1,512 @@
+# 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-06-20 13:55+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-06-21 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "Mako"
+msgstr "Mako"
+
+#. 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 "Messaging"
+
+#. 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 ""
+"<p>\n"
+"                    <b>เยี่ยมยอด!</b> คุณอ่านข้อความหมดแล้ว\n"
+"                </p><p>\n"
+"                   <b>ขอความร่วมมือ</b> ภาษาไทยสำหรับ OpenERP นั้น "
+"ยังไม่สมบรูณ์และถูกต้อง \n"
+"                   <p> เลือกหมวด Translations เพื่อแนะนำการแปลได้ที่ </p>\n"
+"\n"
+"                   https://launchpad.net/openobject-addons : business "
+"application modules\n"
+"                   https://launchpad.net/openobject-server   : the "
+"framework\n"
+"                   https://launchpad.net/openerp-web             : web "
+"modules and frontend\n"
+"                </p>\n"
+"            "
+
+#. 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/static/src/img/icon.png b/addons/portal/static/description/icon.png
similarity index 100%
rename from addons/portal/static/src/img/icon.png
rename to addons/portal/static/description/icon.png
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index dc3211d0a71..3ec2850b4aa 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -223,7 +223,7 @@ class wizard_user(osv.osv_memory):
         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
diff --git a/addons/portal_anonymous/i18n/en_AU.po b/addons/portal_anonymous/i18n/en_AU.po
new file mode 100644
index 00000000000..feb30ee1137
--- /dev/null
+++ b/addons/portal_anonymous/i18n/en_AU.po
@@ -0,0 +1,25 @@
+# English (Australia) 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-24 01:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Australia) <en_AU@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-25 05:14+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr "Login"
diff --git a/addons/portal_anonymous/i18n/th.po b/addons/portal_anonymous/i18n/th.po
new file mode 100644
index 00000000000..80e81054b23
--- /dev/null
+++ b/addons/portal_anonymous/i18n/th.po
@@ -0,0 +1,25 @@
+# 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-06-20 14:03+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-06-21 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\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_anonymous/i18n/zh_CN.po b/addons/portal_anonymous/i18n/zh_CN.po
new file mode 100644
index 00000000000..53ca3f03a6a
--- /dev/null
+++ b/addons/portal_anonymous/i18n/zh_CN.po
@@ -0,0 +1,25 @@
+# Chinese (Simplified) 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-07-03 15:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-07-04 05:12+0000\n"
+"X-Generator: Launchpad (build 16692)\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/bs.po b/addons/portal_crm/i18n/bs.po
new file mode 100644
index 00000000000..0e91dd772da
--- /dev/null
+++ b/addons/portal_crm/i18n/bs.po
@@ -0,0 +1,546 @@
+# Bosnian 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-08-06 08:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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-08-07 04:46+0000\n"
+"X-Generator: Launchpad (build 16721)\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_crm/i18n/th.po b/addons/portal_crm/i18n/th.po
new file mode 100644
index 00000000000..247e487bcd5
--- /dev/null
+++ b/addons/portal_crm/i18n/th.po
@@ -0,0 +1,546 @@
+# 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-06-20 14:52+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-06-21 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\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/__init__.py b/addons/portal_event/__init__.py
index 60fb460545a..71376240d03 100644
--- a/addons/portal_event/__init__.py
+++ b/addons/portal_event/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-TODAY OpenERP SA (<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
@@ -18,5 +18,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import event
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
index f97ad81efd9..05d84875647 100644
--- a/addons/portal_event/__openerp__.py
+++ b/addons/portal_event/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-TODAY OpenERP SA (<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
@@ -30,11 +30,13 @@ This module adds event menu and features to your portal if event and portal are
 ==========================================================================================
     """,
     'author': 'OpenERP SA',
-    'depends': ['event','portal'],
+    'depends': [
+        'event',
+        'portal',
+    ],
     'data': [
-        'event_view.xml',
-        'security/portal_security.xml',
         'portal_event_view.xml',
+        'security/portal_security.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
diff --git a/addons/portal_event/event.py b/addons/portal_event/event.py
deleted file mode 100644
index 45026da4eba..00000000000
--- a/addons/portal_event/event.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-
-class event_event(osv.osv):
-    _description = 'Portal event'
-    _inherit = 'event.event'
-
-    """
-    ``visibility``: defines if the event appears on the portal's event page
-                    - 'public' means the event will appear for everyone (anonymous)
-                    - 'private' means the event won't appear
-    """
-    _columns = {
-        'visibility': fields.selection([('public', 'Public'),('private', 'Private')],
-            string='Visibility', help='Event\'s visibility in the portal\'s contact page'),
-    }
-    _defaults = {
-        'visibility': 'private',
-    }
diff --git a/addons/portal_event/event_view.xml b/addons/portal_event/event_view.xml
deleted file mode 100644
index 3dec56fa526..00000000000
--- a/addons/portal_event/event_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- add visibility field to the event form view -->
-        <record id="view_event_form_portal" model="ir.ui.view">
-            <field name="name">portal.event.form</field>
-            <field name="model">event.event</field>
-            <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[last()]" position="after">
-                    <page string="Portal Settings" groups="base.group_user">
-                        <group>
-                            <field name="visibility"/>
-                        </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 926e4fdd0f2..6177ae5944e 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -2,17 +2,21 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="portal_event_rule" model="ir.rule">
-            <field name="name">Portal Visible Events</field>
-            <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">['|', ('visibility', '=', 'public'), ('message_follower_ids','in', [user.partner_id.id])]</field>
+        <record model="ir.rule" id="event_event_portal_anonymous_rule">
+            <field name="name">Event: portal and anonymous users: public only</field>
+            <field name="model_id" ref="event.model_event_event"/>
+            <field name="domain_force">['|',
+                                            ('visibility', '=', 'public'),
+                                            ('message_follower_ids', 'in', [user.partner_id.id])
+                                        ]
+            </field>
             <field name="groups" eval="[(4, ref('portal.group_portal')), (4, ref('portal.group_anonymous'))]"/>
         </record>
 
-        <record id="portal_registration_rule" model="ir.rule">
-            <field name="name">Portal Personal Registrations</field>
-            <field ref="event.model_event_registration" name="model_id"/>
-            <field name="domain_force">[('user_id','=',user.id)]</field>
+        <record model="ir.rule" id="event_registration_portal_anonymous_rule">
+            <field name="name">Event/Registration: portal and anonymous users: personal only</field>
+            <field name="model_id" ref="event.model_event_registration"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal')), (4, ref('portal.group_anonymous'))]"/>
         </record>
 
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index eca13258ff9..7b038747c60 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -37,7 +37,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" eval="False"/>
             <field name="arch" type="xml">
-                <kanban>
+                <kanban  create="false">
                     <field name="last_login"/>
                     <templates>
                         <t t-name="kanban-box">
diff --git a/addons/portal_hr_employees/i18n/th.po b/addons/portal_hr_employees/i18n/th.po
new file mode 100644
index 00000000000..c6f7ad2cacf
--- /dev/null
+++ b/addons/portal_hr_employees/i18n/th.po
@@ -0,0 +1,95 @@
+# 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-06-20 13:57+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-06-21 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\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/__openerp__.py b/addons/portal_project/__openerp__.py
index d502d278c38..8d24b4a2c84 100644
--- a/addons/portal_project/__openerp__.py
+++ b/addons/portal_project/__openerp__.py
@@ -30,12 +30,13 @@ This module adds project menu and features (tasks) to your portal if project and
 ======================================================================================================
     """,
     'author': 'OpenERP SA',
-    'depends': ['project','portal'],
+    'depends': ['project', 'portal'],
     'data': [
         'security/portal_security.xml',
         'security/ir.model.access.csv',
         'portal_project_view.xml',
     ],
+    'demo': [],
     'installable': True,
     'auto_install': True,
     'category': 'Hidden',
diff --git a/addons/portal_project/project.py b/addons/portal_project/project.py
index fb783c8a531..71eb00914e0 100644
--- a/addons/portal_project/project.py
+++ b/addons/portal_project/project.py
@@ -30,7 +30,7 @@ class portal_project(osv.Model):
         """ 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'))
+        selection.insert((idx + 1), ('portal', 'Customer related project: visible through portal'))
         return selection
         # return [('public', 'All Users'),
         #         ('portal', 'Portal Users and Employees'),
diff --git a/addons/portal_project/tests/test_access_rights.py b/addons/portal_project/tests/test_access_rights.py
index a7d56cb3895..1b98a140b68 100644
--- a/addons/portal_project/tests/test_access_rights.py
+++ b/addons/portal_project/tests/test_access_rights.py
@@ -19,35 +19,17 @@
 #
 ##############################################################################
 
+from openerp.addons.project.tests.test_project_base import TestProjectBase
 from openerp.osv.orm import except_orm
-from openerp.tests import common
 from openerp.tools import mute_logger
 
 
-class TestPortalProject(common.TransactionCase):
+class TestPortalProjectBase(TestProjectBase):
 
     def setUp(self):
-        super(TestPortalProject, self).setUp()
+        super(TestPortalProjectBase, 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
@@ -56,62 +38,39 @@ class TestPortalProject(common.TransactionCase):
         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 users to use through the various tests
+        self.user_portal_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_anonymous_id = self.res_users.create(cr, uid, {
+            'name': 'Donovan Anonymous',
+            'login': 'donovan',
+            'alias_name': 'donovan',
+            'groups_id': [(6, 0, [self.group_anonymous_id])]
+        })
 
         # Test 'Pigs' project
-        self.project_pigs_id = self.project_project.create(cr, uid,
-            {'name': 'Pigs', 'privacy_visibility': 'public'},
-            {'mail_create_nolog': True})
+        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})
+        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_projectuser_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_portal_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_anonymous_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
 
+
+class TestPortalProject(TestPortalProjectBase):
     @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 """
@@ -122,53 +81,47 @@ class TestPortalProject(common.TransactionCase):
         # ----------------------------------------
 
         # Do: Alfred reads project -> ok (employee ok public)
-        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_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')
+                         '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'])
+        self.project_task.read(cr, self.user_projectuser_id, task_ids, ['name'])
         # Test: all project tasks writable
-        self.project_task.write(cr, self.user_alfred_id, task_ids, {'description': 'TestDescription'})
+        self.project_task.write(cr, self.user_projectuser_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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_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)])
+        self.assertRaises(except_orm, self.project_task.search, cr, self.user_none_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'])
+        self.assertRaises(except_orm, self.project_task.read, cr, self.user_none_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'})
+        self.assertRaises(except_orm, self.project_task.write, cr, self.user_none_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'])
+        self.project_project.read(cr, self.user_portal_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_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')
+                         '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'])
+        self.project_task.read(cr, self.user_portal_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'})
+        self.assertRaises(except_orm, self.project_task.write, cr, self.user_portal_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'])
+        self.project_project.read(cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_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')
+                         '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'])
+        self.project_task.read(cr, self.user_anonymous_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'})
+        self.assertRaises(except_orm, self.project_task.write, cr, self.user_anonymous_id, task_ids, {'description': 'TestDescription'})
 
         # ----------------------------------------
         # CASE2: portal project
@@ -176,39 +129,36 @@ class TestPortalProject(common.TransactionCase):
         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'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_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')
+                         '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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_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)])
+        self.assertRaises(except_orm, self.project_task.search, cr, self.user_none_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])
+        self.project_task.message_subscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id])
 
         # Do: Chell reads project -> ok (portal ok public)
-        self.project_project.read(cr, self.user_chell_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_portal_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)])
+        task_ids = self.project_task.search(cr, self.user_portal_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')
+                         '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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_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])
+        self.project_task.message_unsubscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id])
 
         # ----------------------------------------
         # CASE3: employee project
@@ -216,29 +166,26 @@ class TestPortalProject(common.TransactionCase):
         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'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: all project tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_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')
+                         '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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_portal_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)])
+        task_ids = self.project_task.search(cr, self.user_portal_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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_id, [('project_id', '=', pigs_id)])
         self.assertFalse(task_ids, 'access rights: anonymous user should not see tasks of an employees project')
 
         # ----------------------------------------
@@ -247,54 +194,49 @@ class TestPortalProject(common.TransactionCase):
         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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_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')
+                         '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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_none_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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_portal_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_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')
+                         '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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
         # Test: no project task visible
-        task_ids = self.project_task.search(cr, self.user_donovan_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_anonymous_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])
+        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_projectuser_id, self.user_portal_id, self.user_anonymous_id])
+        self.project_task.message_subscribe_users(cr, self.user_projectuser_id, [self.task_1_id, self.task_3_id], [self.user_portal_id, self.user_projectuser_id])
 
         # Do: Alfred reads project -> ok (follower ok followers)
-        self.project_project.read(cr, self.user_alfred_id, pigs_id, ['name'])
+        self.project_project.read(cr, self.user_projectuser_id, pigs_id, ['name'])
         # Test: followed + assigned tasks visible
-        task_ids = self.project_task.search(cr, self.user_alfred_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_projectuser_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')
+                         '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'])
+        self.project_project.read(cr, self.user_portal_id, pigs_id, ['name'])
         # Test: followed + assigned tasks visible
-        task_ids = self.project_task.search(cr, self.user_chell_id, [('project_id', '=', pigs_id)])
+        task_ids = self.project_task.search(cr, self.user_portal_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')
+                         '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'])
+        self.assertRaises(except_orm, self.project_project.read, cr, self.user_anonymous_id, pigs_id, ['name'])
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 2750edf300f..c4f1e0aca57 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -26,7 +26,7 @@
                                         </div>
                                         <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
                                         <div class="oe_text_right">
-                                            <h1><field name="state" readonly="1"/></h1>
+                                            <h1><field name="stage_id" readonly="1"/></h1>
                                         </div>
                                     </div>
                                     <div>
diff --git a/addons/portal_project_issue/tests/test_access_rights.py b/addons/portal_project_issue/tests/test_access_rights.py
index 28d337a4965..a7721b489a0 100644
--- a/addons/portal_project_issue/tests/test_access_rights.py
+++ b/addons/portal_project_issue/tests/test_access_rights.py
@@ -19,40 +19,36 @@
 #
 ##############################################################################
 
-from openerp.addons.portal_project.tests.test_access_rights import TestPortalProject
+from openerp.addons.portal_project.tests.test_access_rights import TestPortalProjectBase
 from openerp.osv.orm import except_orm
 from openerp.tools import mute_logger
 
 
-class TestPortalIssueProject(TestPortalProject):
+class TestPortalProjectBase(TestPortalProjectBase):
 
     def setUp(self):
-        super(TestPortalIssueProject, self).setUp()
+        super(TestPortalProjectBase, 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})
+        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_projectuser_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_portal_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_anonymous_id, 'project_id': self.project_pigs_id}, {'mail_create_nolog': True})
 
+
+class TestPortalIssue(TestPortalProjectBase):
     @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 """
@@ -64,42 +60,38 @@ class TestPortalIssueProject(TestPortalProject):
 
         # 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)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_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')
+                         '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'])
+        self.project_issue.read(cr, self.user_projectuser_id, issue_ids, ['name'])
         # Test: all project issues writable
-        self.project_issue.write(cr, self.user_alfred_id, issue_ids, {'description': 'TestDescription'})
+        self.project_issue.write(cr, self.user_projectuser_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)])
+        self.assertRaises(except_orm, self.project_issue.search, cr, self.user_none_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'])
+        self.assertRaises(except_orm, self.project_issue.read, cr, self.user_none_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'})
+        self.assertRaises(except_orm, self.project_issue.write, cr, self.user_none_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)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_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')
+                         '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'])
+        self.project_issue.read(cr, self.user_portal_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'})
+        self.assertRaises(except_orm, self.project_issue.write, cr, self.user_portal_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)])
+        issue_ids = self.project_issue.search(cr, self.user_anonymous_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')
+                         'access rights: project user cannot see all issues of a public project')
 
         # ----------------------------------------
         # CASE2: portal project
@@ -108,27 +100,26 @@ class TestPortalIssueProject(TestPortalProject):
 
         # 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)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_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')
+                         '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)])
+        self.assertRaises(except_orm, self.project_issue.search, cr, self.user_none_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])
+        self.project_issue.message_subscribe_users(cr, self.user_projectuser_id, [self.issue_1_id, self.issue_3_id], [self.user_portal_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)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_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')
+                         '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])
+        self.project_issue.message_unsubscribe_users(cr, self.user_projectuser_id, [self.issue_1_id, self.issue_3_id], [self.user_portal_id])
 
         # ----------------------------------------
         # CASE3: employee project
@@ -137,14 +128,14 @@ class TestPortalIssueProject(TestPortalProject):
 
         # 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)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_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')
+                         '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)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_id, [('project_id', '=', pigs_id)])
         self.assertFalse(issue_ids, 'access rights: portal user should not see issues of an employees project, even if assigned')
 
         # ----------------------------------------
@@ -154,32 +145,32 @@ class TestPortalIssueProject(TestPortalProject):
 
         # 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)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_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')
+                         '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)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_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')
+                         '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])
+        self.project_project.message_subscribe_users(cr, uid, [pigs_id], [self.user_projectuser_id, self.user_portal_id, self.user_anonymous_id])
+        self.project_issue.message_subscribe_users(cr, self.user_projectuser_id, [self.issue_1_id, self.issue_3_id], [self.user_portal_id, self.user_projectuser_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)])
+        issue_ids = self.project_issue.search(cr, self.user_projectuser_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')
+                         '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)])
+        issue_ids = self.project_issue.search(cr, self.user_portal_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')
+                         'access rights: employee user should not see followed + assigned issues of a follower project')
diff --git a/addons/portal_sale/security/ir.model.access.csv b/addons/portal_sale/security/ir.model.access.csv
index c73be67e8c9..37e27c54d36 100644
--- a/addons/portal_sale/security/ir.model.access.csv
+++ b/addons/portal_sale/security/ir.model.access.csv
@@ -11,7 +11,6 @@ access_account_move,account.move,account.model_account_move,portal.group_portal,
 access_account_move_line,account.move.line,account.model_account_move_line,portal.group_portal,1,0,0,0
 access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,portal.group_portal,1,0,0,0
 access_account_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,portal.group_portal,1,0,0,0
-access_sale_shop,sale.shop,sale.model_sale_shop,portal.group_portal,1,0,0,0
 access_product_list,product.pricelist,product.model_product_pricelist,portal.group_portal,1,0,0,0
 access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
 access_account_tax,account.tax,account.model_account_tax,portal.group_portal,1,0,0,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_data.xml b/addons/procurement/procurement_data.xml
index 6a83d525c68..52503e76c44 100644
--- a/addons/procurement/procurement_data.xml
+++ b/addons/procurement/procurement_data.xml
@@ -12,7 +12,7 @@
             <field eval="False" name="doall"/>
             <field eval="'procurement.order'" name="model"/>
             <field eval="'run_scheduler'" name="function"/>
-            <field eval="'(False,)'" name="args"/>
+            <field eval="'(False,True)'" name="args"/>
         </record>
         
         <record id="sequence_mrp_op_type" model="ir.sequence.type">
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 76432157555..a196937619f 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -256,7 +256,7 @@
             <field name="search_view_id" ref="warehouse_orderpoint_search" />
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to add a reordering rules.
+                Click to add a reordering rule.
               </p><p>You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or request for 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.</p>
             </field>
         </record>
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 7c9d5ec3290..6f326ccf1c5 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -36,6 +36,8 @@ class procurement_order(osv.osv):
         ''' Runs through scheduler.
         @param use_new_cursor: False or the dbname
         '''
+        if use_new_cursor:
+            use_new_cursor = cr.dbname
         self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
         self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
                 use_new_cursor=use_new_cursor, context=context)
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 9228fcc323b..e611e0e2a30 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
                     <p class="oe_gray">
-                        Fill is this for to launch a procurement request for this
+                        Use this assistant to generate a procurement request for this
                         product. According to the product configuration, this may
                         trigger a draft purchase order, a manufacturing order or
                         a new task.
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index bd28e914c5e..470e1c0632b 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/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:06+0000\n"
-"PO-Revision-Date: 2012-11-27 09:28+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-07-28 11:18+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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-07-29 05:25+0000\n"
+"X-Generator: Launchpad (build 16700)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -513,7 +513,7 @@ msgstr "标准耳机"
 #. module: product
 #: model:product.uom,name:product.product_uom_day
 msgid "Day(s)"
-msgstr ""
+msgstr "天"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -800,7 +800,7 @@ msgstr "结束日期"
 #. module: product
 #: model:product.uom,name:product.product_uom_litre
 msgid "Liter(s)"
-msgstr ""
+msgstr "升"
 
 #. module: product
 #: view:product.price_list:0
@@ -843,7 +843,7 @@ msgstr "价格表"
 #. module: product
 #: model:product.uom,name:product.product_uom_hour
 msgid "Hour(s)"
-msgstr ""
+msgstr "小时"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1114,7 +1114,7 @@ msgstr "右父项"
 #. module: product
 #: field:product.product,price:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1192,7 +1192,7 @@ msgstr "显示产品列表的顺序号"
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen(s)"
-msgstr ""
+msgstr "打"
 
 #. module: product
 #: field:product.uom,factor:0
@@ -1338,7 +1338,7 @@ msgstr "指定一个产品分类 ，规则只被应用在与这个分类以及
 #. module: product
 #: view:product.product:0
 msgid "Inventory"
-msgstr "盘点"
+msgstr "库存"
 
 #. module: product
 #: field:product.product,seller_info_id:0
@@ -1346,7 +1346,7 @@ msgid "Supplier Info"
 msgstr "供应商信息"
 
 #. module: product
-#: code:addons/product/product.py:729
+#: code:addons/product/product.py:732
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -1891,7 +1891,7 @@ msgstr "消息"
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "Unit(s)"
-msgstr ""
+msgstr "件"
 
 #. module: product
 #: code:addons/product/product.py:176
@@ -2341,7 +2341,7 @@ msgstr "序列"
 msgid ""
 "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."
-msgstr ""
+msgstr "生成该产品的平均延时天数。在多级BoM的情况下，部件的制造提前期将被累加"
 
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
@@ -2364,6 +2364,8 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"单击以创建一个新的计量单位\n"
+"            "
 
 #. module: product
 #: model:product.template,name:product.product_product_11_product_template
@@ -2444,7 +2446,7 @@ msgid "15” LCD Monitor"
 msgstr "15” LCD 显示器"
 
 #. module: product
-#: code:addons/product/pricelist.py:376
+#: code:addons/product/pricelist.py:379
 #: field:product.pricelist.item,base_pricelist_id:0
 #, python-format
 msgid "Other Pricelist"
diff --git a/addons/product/partner.py b/addons/product/partner.py
index fbfee76d0b2..d6b615ed88a 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -27,12 +27,10 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'property_product_pricelist': fields.property(
-            'product.pricelist',
             type='many2one', 
             relation='product.pricelist', 
             domain=[('type','=','sale')],
             string="Sale Pricelist", 
-            view_load=True,
             help="This pricelist will be used, instead of the default one, for sales to the current partner"),
     }
 
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 5117da6044e..95332cf0f32 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -8,8 +8,8 @@
             <field name="arch" type="xml">
                 <page string="Sales &amp; Purchases" position="inside">
                     <group>
-                        <group name="pricelists" groups="product.group_sale_pricelist" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
-                            <field name="property_product_pricelist"/>
+                        <group name="pricelists" attrs="{'invisible': [('is_company','=',False),('parent_id','!=',False)]}">
+                            <field name="property_product_pricelist" groups="product.group_sale_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>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 6fc926980dd..649b721eb46 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -376,11 +376,26 @@ class product_pricelist_item(osv.osv):
         result.append((-2, _('Supplier Prices on the product form')))
         return result
 
+# Added default function to fetch the Price type Based on Pricelist type.
+    def _get_default_base(self, cr, uid, fields, context=None):
+        product_price_type_obj = self.pool.get('product.price.type')
+        if fields.get('type') == 'purchase':
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field', '=', 'standard_price')], context=context)
+        elif fields.get('type') == 'sale':
+            product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context=context)
+        else:
+            return -1
+        if not product_price_type_ids:
+            return False
+        else:
+            pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+            return pricetype.id
+
     _name = "product.pricelist.item"
     _description = "Pricelist item"
     _order = "sequence, min_quantity desc"
     _defaults = {
-        'base': lambda *a: -1,
+        'base': _get_default_base,
         'min_quantity': lambda *a: 0,
         'sequence': lambda *a: 5,
         'price_discount': lambda *a: 0,
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index a1b996b891b..784a14228d5 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -152,7 +152,7 @@
                         <field name="currency_id" groups="base.group_multi_currency"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
-                    <field name="version_id">
+                    <field name="version_id" context="{'type':type}">
                         <form string="Pricelist Version" version="7.0">
                             <group col="4">
                                 <field name="name"/>
@@ -160,7 +160,7 @@
                                 <field name="date_start"/>
                                 <field name="date_end"/>
                             </group>
-                            <field name="items_id"/>
+                            <field name="items_id" context="{'type':type}"/>
                         </form>
                         <tree string="Pricelist Version">
                             <field name="name"/>
diff --git a/addons/product/product.py b/addons/product/product.py
index 656812bebbb..6e1128985aa 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -321,7 +321,7 @@ class product_template(osv.osv):
         'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
         'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
-            help='Sepcify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure.'),
+            help='Specify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure.'),
         'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
             help='Coefficient to convert default Unit of Measure to Unit of Sale\n'
             ' uos = uom * coeff'),
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 49362e380f4..91d78722d14 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -5,7 +5,7 @@
     Resource: product.uom.categ
     -->
         <record id="product_category_all" model="product.category">
-            <field name="name">All products</field>
+            <field name="name">All</field>
         </record>
         <record id="product_category_1" model="product.category">
             <field name="parent_id" ref="product_category_all"/>
diff --git a/addons/product/report/product_label.xsl b/addons/product/report/product_label.xsl
index 5dbb2d64a28..30fe282b0c9 100644
--- a/addons/product/report/product_label.xsl
+++ b/addons/product/report/product_label.xsl
@@ -60,6 +60,8 @@
 		</xsl:if>
 	</xsl:template>
 
+    <xsl:param name="pmaxChars" as="xs:integer" select="80"/>
+
 	<xsl:template match="lot-line" mode="story">
             <blockTable style="mytable" colWidths="2.8cm,5.4cm">
                 <tr>
@@ -75,7 +77,7 @@
                         <barCode><xsl:value-of select="ean13" /></barCode> 
                     </td>
                     <td>
-                        <para style="nospace"><xsl:value-of select="product"/></para><xsl:text>, </xsl:text>
+                        <para style="nospace"><xsl:value-of select="substring(product, 1, pmaxChars)"/></para><xsl:text>, </xsl:text>
                         <para style="nospace"><xsl:value-of select="variant"/></para>
                     </td>
                 </tr>
diff --git a/addons/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 88f528693df..fb4aac965d6 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <group name="procurement" position="inside">
                     <group string="Manufacturer">
-                        <field name="manufacturer" />
+                        <field name="manufacturer" context="{'default_supplier':True, 'default_customer':False}"/>
                         <field name="manufacturer_pname"/>
                         <field name="manufacturer_pref"/>
                     </group>
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 4f8a7b0b9cc..a2f0a41847f 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -98,10 +98,10 @@ class sale_order_line(osv.osv):
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
-        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit,currency_id, context=context, company_id=company_id)
+    def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom_id, qty, name, type, partner_id, fposition_id, price_unit,currency_id, context=context, company_id=company_id)
 
-        def get_real_price(res_dict, product_id, qty, uom, pricelist):
+        def get_real_price(res_dict, product_id, qty, uom_id, pricelist):
             item_obj = self.pool.get('product.pricelist.item')
             price_type_obj = self.pool.get('product.price.type')
             product_obj = self.pool.get('product.product')
@@ -119,7 +119,7 @@ class account_invoice_line(osv.osv):
             product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
 
             factor = 1.0
-            if uom and uom != product.uom_id.id:
+            if uom_id and uom_id != product.uom_id.id:
                 product_uom_obj = self.pool.get('product.uom')
                 uom_data = product_uom_obj.browse(cr, uid,  product.uom_id.id)
                 factor = uom_data.factor
@@ -137,18 +137,18 @@ class account_invoice_line(osv.osv):
                     pricelist =partner_obj.browse(cr, uid, partner_id).property_product_pricelist_purchase.id
                     if not pricelist:
                         raise osv.except_osv(_('No Purchase Pricelist Found!'),_("You must first define a pricelist on the supplier form!"))
-                    price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom})
+                    price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom_id})
                     price_unit = price_unit_res[pricelist]
-                    real_price = get_real_price(price_unit_res, product.id, qty, uom, pricelist)
+                    real_price = get_real_price(price_unit_res, product.id, qty, uom_id, pricelist)
             else:
                 if partner_id:
                     pricelist = partner_obj.browse(cr, uid, partner_id).property_product_pricelist.id
                     if not pricelist:
                         raise osv.except_osv(_('No Sale Pricelist Found!'),_("You must first define a pricelist on the customer form!"))
-                    price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom})
+                    price_unit_res = pricelist_obj.price_get(cr, uid, [pricelist], product.id, qty or 1.0, partner_id, {'uom': uom_id})
                     price_unit = price_unit_res[pricelist]
 
-                    real_price = get_real_price(price_unit_res, product.id, qty, uom, pricelist)
+                    real_price = get_real_price(price_unit_res, product.id, qty, uom_id, pricelist)
             if pricelist:
                 pricelists=pricelist_obj.read(cr,uid,[pricelist],['visible_discount'])
                 if(len(pricelists)>0 and pricelists[0]['visible_discount'] and real_price != 0):
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index c0a516cf555..f5ba24c41cb 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -40,7 +40,6 @@
     ],
     'depends': [
         'base_setup',
-        'base_status',
         'product',
         'analytic',
         'board',
@@ -66,7 +65,6 @@ Dashboard / Reports for Project Management will include:
     'data': [
         'security/project_security.xml',
         'wizard/project_task_delegate_view.xml',
-        'wizard/project_task_reevaluate_view.xml',
         'security/ir.model.access.csv',
         'project_data.xml',
         'project_view.xml',
@@ -79,9 +77,6 @@ Dashboard / Reports for Project Management will include:
     ],
     'demo': ['project_demo.xml'],
     'test': [
-        'test/project_demo.yml',
-        'test/project_process.yml',
-        'test/task_process.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 931c661d211..3a14f7b6274 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -16,7 +16,6 @@
                     <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -26,7 +25,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
+            <field name="domain">[('user_id', '=', uid), ('stage_id.fold', '!=', True)]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
 
diff --git a/addons/project/doc/changelog.rst b/addons/project/doc/changelog.rst
new file mode 100644
index 00000000000..ba5b242f1c0
--- /dev/null
+++ b/addons/project/doc/changelog.rst
@@ -0,0 +1,16 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- Stage/state update
+
+  - ``project.task``: removed inheritance from ``base_stage`` class and removed
+    ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
+    modification. Updated reports.
+  - ``project.task.type``: removed ``state`` field.
+
+- Removed ``project.task.reevaluate`` wizard.
diff --git a/addons/project/doc/index.rst b/addons/project/doc/index.rst
new file mode 100644
index 00000000000..118b8e7006b
--- /dev/null
+++ b/addons/project/doc/index.rst
@@ -0,0 +1,22 @@
+=====================
+Project DevDoc
+=====================
+
+Project module documentation
+===================================
+
+Documentation topics
+''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/project/doc/stage_status.rst b/addons/project/doc/stage_status.rst
new file mode 100644
index 00000000000..cc2a64c2fbf
--- /dev/null
+++ b/addons/project/doc/stage_status.rst
@@ -0,0 +1,55 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+Stage
++++++
+
+This revision removed the concept of state on project.task objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
+
+ - ``project.task`` now use only stages. However a convention still exists about
+   'New' stage. A task is consdered as ``new`` when it has the following
+   properties:
+
+   - ``stage_id and stage_id.sequence = 1``
+
+ - ``project.task.type`` do not have any ``state`` field anymore. 
+ - ``project.task.report`` do not have any ``state`` field anymore. 
+
+By default a newly created task is in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+
+Stage analysis
+++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``project.task.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
++++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
+++++++++
+
+The following subtypes are triggered on ``project.task``:
+
+ - ``mt_task_new``: new tasks. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
+ - ``mt_task_stage``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
+ - ``mt_task_assigned``: user assigned. condition: ``obj.user_id and obj.user_id.id``
+ - ``mt_task_blocked``: kanban state blocked. Condition: ``obj.kanban_state == 'blocked'``
+
+
+Those subtypes are also available on the ``project.project`` model and are used
+for the auto subscription.
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index b0618c0233d..242bca1b9c0 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.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-12-14 14:12+0000\n"
-"Last-Translator: sum1201 <Unknown>\n"
+"PO-Revision-Date: 2013-08-13 04:04+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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:57+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-08-14 04:54+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
 
 #. module: project
 #: view:project.project:0
 msgid "Email Interface"
-msgstr "Email 接口"
+msgstr "电子邮件接口"
 
 #. module: project
 #: help:account.analytic.account,use_tasks:0
@@ -38,7 +38,7 @@ msgstr "进度"
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr "委派任务"
+msgstr "委派的任务"
 
 #. module: project
 #: view:project.project:0
@@ -58,18 +58,18 @@ msgstr "阶段名称"
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr "设为未决"
+msgstr "设置为等待状态"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr "新的基于模板的项目"
+msgstr "基于该模板新建项目"
 
 #. module: project
 #: view:report.project.task.user:0
 #: field:report.project.task.user,day:0
 msgid "Day"
-msgstr "天数"
+msgstr "日"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_merge
@@ -82,7 +82,7 @@ msgid "Start Task"
 msgstr "开始任务"
 
 #. module: project
-#: code:addons/project/project.py:932
+#: code:addons/project/project.py:944
 #, python-format
 msgid "Warning !"
 msgstr "警告！"
@@ -91,7 +91,7 @@ msgstr "警告！"
 #: help:project.project,message_unread:0
 #: help:project.task,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "如果要求你关注新消息，勾选此项"
+msgstr "如果选中此项，你需要注意新的消息。"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -101,12 +101,12 @@ msgstr "完成任务"
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr "任务完成"
+msgstr "任务已经完成"
 
 #. module: project
 #: view:res.partner:0
 msgid "False"
-msgstr "否"
+msgstr "错误的"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -121,7 +121,7 @@ msgstr "辅助核算科目"
 #. module: project
 #: field:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Manage time estimation on tasks"
-msgstr "估计管理任务的时间"
+msgstr "管理任务的估计时间"
 
 #. module: project
 #: help:project.project,message_summary:0
@@ -129,11 +129,11 @@ msgstr "估计管理任务的时间"
 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格式。"
+msgstr "保存对话概要信息，这些概要信息将为直接以HTML格式插入到看板视图。"
 
 #. module: project
-#: code:addons/project/project.py:432
-#: code:addons/project/project.py:1318
+#: code:addons/project/project.py:444
+#: code:addons/project/project.py:1332
 #, python-format
 msgid "Warning!"
 msgstr "警告!"
@@ -163,12 +163,12 @@ msgstr "重设项目"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr "进行中任务"
+msgstr "进行中的任务"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
-msgstr "结束任务和全部要做任务的百分比"
+msgstr "已结束任务和未结束任务的百分比。"
 
 #. module: project
 #: model:ir.actions.client,name:project.action_client_project_menu
@@ -224,7 +224,7 @@ msgstr "分配给"
 #: model:mail.message.subtype,name:project.mt_project_task_closed
 #: model:mail.message.subtype,name:project.mt_task_closed
 msgid "Task Done"
-msgstr ""
+msgstr "已完成的任务"
 
 #. module: project
 #: view:project.project:0
@@ -265,7 +265,7 @@ msgstr "任务分派"
 #: model:mail.message.subtype,name:project.mt_project_task_started
 #: model:mail.message.subtype,name:project.mt_task_started
 msgid "Task Started"
-msgstr ""
+msgstr "已开始的任务"
 
 #. module: project
 #: view:project.task:0
@@ -383,7 +383,7 @@ msgid "Assigned to"
 msgstr "指派到"
 
 #. module: project
-#: code:addons/project/project.py:1021
+#: code:addons/project/project.py:1033
 #, python-format
 msgid "Delegated User should be specified"
 msgstr "应该制定委派用户"
@@ -433,7 +433,7 @@ msgstr "使用集成的协作记事簿任务"
 #: model:mail.message.subtype,name:project.mt_project_task_blocked
 #: model:mail.message.subtype,name:project.mt_task_blocked
 msgid "Task Blocked"
-msgstr ""
+msgstr "延期的任务"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -453,12 +453,12 @@ msgstr "oe_kanban_text_red"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_blocked
 msgid "Task blocked"
-msgstr ""
+msgstr "延期的任务"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
-msgstr "代表"
+msgstr "任务委派"
 
 #. module: project
 #: field:project.task,create_date:0
@@ -636,6 +636,15 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                  创建一个新项目\n"
+"                </p><p>\n"
+"                  "
+"项目是组织活动，计划任务，跟踪问题，记录人力资源成本的组织形式。项目可以分为内部项目（研发活动，加快销售进度），私有项目或者客户参与的项目。\n"
+"                </p><p>\n"
+"                内部用户以项目成员的方式参与到项目中，也可以邀请客户加入到项目中分享项目活动。\n"
+"                </p>\n"
+"            "
 
 #. module: project
 #: view:project.config.settings:0
@@ -647,7 +656,7 @@ msgstr "计划"
 #: field:project.task,date_deadline:0
 #: field:report.project.task.user,date_deadline:0
 msgid "Deadline"
-msgstr "最后期限"
+msgstr "计划完成日期"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -740,7 +749,7 @@ msgstr "待处理任务草稿"
 #. module: project
 #: field:project.project,alias_model:0
 msgid "Alias Model"
-msgstr ""
+msgstr "别名模型"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -845,7 +854,7 @@ msgstr "增加筛选条件"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks_config
 msgid "GTD"
-msgstr ""
+msgstr "GTD"
 
 #. module: project
 #: help:project.task,state:0
@@ -866,7 +875,7 @@ msgstr "公司"
 #. module: project
 #: field:project.task.type,fold:0
 msgid "Folded by Default"
-msgstr ""
+msgstr "默认折叠"
 
 #. module: project
 #: field:project.task.history,date:0
@@ -1137,7 +1146,7 @@ msgstr "您的文档的状态将自动更改选定的阶段。例如，如果某
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr "其它信息"
 
 #. module: project
 #: view:project.task:0
@@ -1195,9 +1204,9 @@ 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
+#: code:addons/project/project.py:368
+#: code:addons/project/project.py:389
+#: code:addons/project/project.py:721
 #, python-format
 msgid "%s (copy)"
 msgstr "%s (副本)"
@@ -1205,7 +1214,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
@@ -1397,7 +1406,7 @@ msgid ""
 msgstr "做任务的估计时间.通常由项目经理在任务草稿阶段设定"
 
 #. module: project
-#: code:addons/project/project.py:220
+#: code:addons/project/project.py:230
 #, python-format
 msgid "Attachments"
 msgstr "附件"
@@ -1447,7 +1456,7 @@ msgstr "剩余的小时数"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "任务阶段已改变"
 
 #. module: project
 #: constraint:project.task:0
@@ -1479,7 +1488,7 @@ msgstr "总小时数"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "项目配置"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1524,7 +1533,7 @@ msgid "Overpassed Tasks"
 msgstr "拖期任务"
 
 #. module: project
-#: code:addons/project/project.py:932
+#: code:addons/project/project.py:944
 #, python-format
 msgid ""
 "Child task still open.\n"
@@ -1556,7 +1565,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
@@ -1585,7 +1594,7 @@ msgid "CHECK: "
 msgstr "CHECK: "
 
 #. module: project
-#: code:addons/project/project.py:432
+#: code:addons/project/project.py:444
 #, python-format
 msgid "You must assign members on the project '%s' !"
 msgstr "您必须为项目“%s”指定成员！"
@@ -1697,6 +1706,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建新任务。\n"
+"              </p><p>\n"
+"OpenERP 系统的任务管理允许你为了更高效地完成工作而管理任务管道。你可以跟踪任务进度、与他人讨论任务、附加文档附件等。\n"
+"              </p>\n"
+"            "
 
 #. module: project
 #: field:project.task,date_end:0
@@ -1717,7 +1732,7 @@ 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
@@ -1811,7 +1826,7 @@ msgid "Starting Date"
 msgstr "开始日期"
 
 #. module: project
-#: code:addons/project/project.py:398
+#: code:addons/project/project.py:410
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_projects
 #: view:project.project:0
@@ -1972,7 +1987,7 @@ msgid "Reevaluation Task"
 msgstr "任务重估"
 
 #. module: project
-#: code:addons/project/project.py:1318
+#: code:addons/project/project.py:1332
 #, python-format
 msgid "Please delete the project linked with this account first."
 msgstr "请删除与此科目关联的项目"
@@ -1981,7 +1996,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
@@ -2004,7 +2019,7 @@ msgstr "准备好下一个阶段"
 #. module: project
 #: field:project.task.type,case_default:0
 msgid "Default for New Projects"
-msgstr ""
+msgstr "默认用于新项目"
 
 #. module: project
 #: view:project.task:0
@@ -2042,11 +2057,13 @@ msgid ""
 "resource allocation.\n"
 "                This installs the module project_long_term."
 msgstr ""
+"用于长期项目管理的模块，能够跟踪计划、排程和资源控制。\n"
+"                将会安装模块“project_long_term”。"
 
 #. 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
@@ -2074,6 +2091,8 @@ msgid ""
 "Provides timesheet support for the issues/bugs management in project.\n"
 "                This installs the module project_issue_sheet."
 msgstr ""
+"为项目中的问题/错误管理提供时间表支持。\n"
+"                将安装模块“project_issue_sheet”。"
 
 #. module: project
 #: selection:project.project,privacy_visibility:0
diff --git a/addons/project/project.py b/addons/project/project.py
index e907e4b3652..db2052224f9 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -25,13 +25,10 @@ import time
 
 from openerp import SUPERUSER_ID
 from openerp import tools
+from openerp.addons.resource.faces import task as Task
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
-from openerp.addons.base_status.base_stage import base_stage
-from openerp.addons.resource.faces import task as Task
-
-_TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
 
 class project_task_type(osv.osv):
     _name = 'project.task.type'
@@ -44,33 +41,18 @@ class project_task_type(osv.osv):
         'case_default': fields.boolean('Default for New Projects',
                         help="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."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
-        'state': fields.selection(_TASK_STATE, 'Related Status', required=True,
-                        help="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."),
         'fold': fields.boolean('Folded by Default',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
-    def _get_default_project_id(self, cr, uid, ctx={}):
-        proj = ctx.get('default_project_id', False)
-        if type(proj) is int:
-            return [proj]
-        return proj
+
     _defaults = {
         'sequence': 1,
-        'state': 'open',
         'fold': False,
         'case_default': False,
-        'project_ids': _get_default_project_id
+        'project_ids': lambda self, cr, uid, ctx=None: self.pool['project.task']._get_default_project_id(cr, uid, context=ctx),
     }
     _order = 'sequence'
 
-def short_name(name):
-        """Keep first word(s) of name to make it small enough
-           but distinctive"""
-        if not name: return name
-        # keep 7 chars + end of the last word
-        keep_words = name[:7].strip().split()
-        return ' '.join(name.split()[:len(keep_words)])
 
 class project(osv.osv):
     _name = "project.project"
@@ -99,9 +81,9 @@ class project(osv.osv):
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         partner_obj = self.pool.get('res.partner')
-        if not part:
-            return {'value':{}}
         val = {}
+        if not part:
+            return {'value': val}
         if 'pricelist_id' in self.fields_get(cr, uid, context=context):
             pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
             pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
@@ -152,11 +134,13 @@ class project(osv.osv):
         cr.execute("""
             SELECT project_id, COALESCE(SUM(planned_hours), 0.0),
                 COALESCE(SUM(total_hours), 0.0), COALESCE(SUM(effective_hours), 0.0)
-            FROM project_task WHERE project_id IN %s AND state <> 'cancelled'
+            FROM project_task
+            LEFT JOIN project_task_type ON project_task.stage_id = project_task_type.id
+            WHERE project_task.project_id IN %s AND project_task_type.fold = False
             GROUP BY project_id
             """, (tuple(child_parent.keys()),))
         # aggregate results into res
-        res = dict([(id, {'planned_hours':0.0,'total_hours':0.0,'effective_hours':0.0}) for id in ids])
+        res = dict([(id, {'planned_hours':0.0, 'total_hours':0.0, 'effective_hours':0.0}) for id in ids])
         for id, planned, total, effective in cr.fetchall():
             # add the values specific to id to all parent projects of id in the result
             while id:
@@ -182,10 +166,10 @@ class project(osv.osv):
                                      _('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.'))
             elif proj.alias_id:
                 alias_ids.append(proj.alias_id.id)
-        res =  super(project, self).unlink(cr, uid, ids, context=context)
+        res = super(project, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
-    
+
     def _get_attached_docs(self, cr, uid, ids, field_name, arg, context):
         res = {}
         attachment = self.pool.get('ir.attachment')
@@ -196,7 +180,7 @@ class project(osv.osv):
             task_attachments = attachment.search(cr, uid, [('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)], context=context, count=True)
             res[id] = (project_attachments or 0) + (task_attachments or 0)
         return res
-        
+
     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
         if context is None:
             context = {}
@@ -209,22 +193,21 @@ class project(osv.osv):
         return res
 
     def _get_alias_models(self, cr, uid, context=None):
-        """Overriden in project_issue to offer more options"""
+        """ 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')]
+        return [('public', 'Public project'),
+                ('employees', 'Internal project: all employees can access'),
+                ('followers', 'Private project: 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 = [
-             '|', 
+             '|',
              '&', ('res_model', '=', 'project.project'), ('res_id', 'in', ids),
-             '&', ('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)
-		]
+             '&', ('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)]
         res_id = ids and ids[0] or False
         return {
             'name': _('Attachments'),
@@ -237,6 +220,7 @@ class project(osv.osv):
             'limit': 80,
             'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)
         }
+
     # 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)
@@ -253,22 +237,22 @@ class project(osv.osv):
         'planned_hours': fields.function(_progress_rate, multi="progress", string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'effective_hours': fields.function(_progress_rate, multi="progress", string='Time Spent', help="Sum of spent hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'total_hours': fields.function(_progress_rate, multi="progress", string='Total Time', help="Sum of total hours of all tasks related to this project and its child projects.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'progress_rate': fields.function(_progress_rate, multi="progress", string='Progress', type='float', group_operator="avg", help="Percent of tasks closed according to the total of tasks todo.",
             store = {
                 'project.project': (_get_project_and_parents, ['tasks', 'parent_id', 'child_ids'], 10),
-                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'state'], 20),
+                'project.task': (_get_projects_from_tasks, ['planned_hours', 'remaining_hours', 'work_ids', 'stage_id'], 20),
             }),
         'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report", states={'close':[('readonly',True)]} ),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -323,26 +307,19 @@ class project(osv.osv):
     ]
 
     def set_template(self, cr, uid, ids, context=None):
-        res = self.setActive(cr, uid, ids, value=False, context=context)
-        return res
+        return self.setActive(cr, uid, ids, value=False, context=context)
 
     def set_done(self, cr, uid, ids, context=None):
-        task_obj = self.pool.get('project.task')
-        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', 'not in', ('cancelled', 'done'))])
-        task_obj.case_close(cr, uid, task_ids, context=context)
-        return self.write(cr, uid, ids, {'state':'close'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'close'}, context=context)
 
     def set_cancel(self, cr, uid, ids, context=None):
-        task_obj = self.pool.get('project.task')
-        task_ids = task_obj.search(cr, uid, [('project_id', 'in', ids), ('state', '!=', 'done')])
-        task_obj.case_cancel(cr, uid, task_ids, context=context)
-        return self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
 
     def set_pending(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'pending'}, context=context)
 
     def set_open(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'open'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
     def reset_project(self, cr, uid, ids, context=None):
         return self.setActive(cr, uid, ids, value=True, context=context)
@@ -370,13 +347,11 @@ class project(osv.osv):
         default['state'] = 'open'
         default['line_ids'] = []
         default['tasks'] = []
-        default.pop('alias_name', None)
-        default.pop('alias_id', None)
         proj = self.browse(cr, uid, id, context=context)
         if not default.get('name', False):
             default.update(name=_("%s (copy)") % (proj.name))
         res = super(project, self).copy(cr, uid, id, default, context)
-        self.map_tasks(cr,uid,id,res,context)
+        self.map_tasks(cr, uid, id, res, context=context)
         return res
 
     def duplicate_template(self, cr, uid, ids, context=None):
@@ -450,7 +425,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')
 
@@ -461,8 +436,6 @@ class project(osv.osv):
             if project.user_id and (project.user_id.id not in u_ids):
                 u_ids.append(project.user_id.id)
             for task in project.tasks:
-                if task.state in ('done','cancelled'):
-                    continue
                 if task.user_id and (task.user_id.id not in u_ids):
                     u_ids.append(task.user_id.id)
             calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
@@ -527,7 +500,7 @@ def Project():
         for project in projects:
             project_gantt = getattr(projects_gantt, 'Project_%d' % (project.id,))
             for task in project.tasks:
-                if task.state in ('done','cancelled'):
+                if task.stage_id and task.stage_id.fold:
                     continue
 
                 p = getattr(project_gantt, 'Task_%d' % (task.id,))
@@ -542,28 +515,20 @@ def Project():
                     }, context=context)
         return True
 
-    # ------------------------------------------------
-    # OpenChatter methods and notifications
-    # ------------------------------------------------
-
     def create(self, cr, uid, vals, context=None):
-        if context is None: context = {}
-        # Prevent double project creation when 'use_tasks' is checked!
-        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):
-            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': alias_name or "project+"+short_name(vals['name'])},
-                          model_name=vals.get('alias_model', 'project.task'),
-                          context=context)
-            vals['alias_id'] = alias_id
-        if vals.get('type', False) not in ('template','contract'):
+        if context is None:
+            context = {}
+        # Prevent double project creation when 'use_tasks' is checked + alias management
+        create_context = dict(context, project_creation_in_progress=True,
+                              alias_model_name=vals.get('alias_model', 'project.task'),
+                              alias_parent_model_name=self._name)
+
+        if vals.get('type', False) not in ('template', 'contract'):
             vals['type'] = 'contract'
-        project_id = super(project, self).create(cr, uid, vals, context)
-        mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)
+
+        project_id = super(project, self).create(cr, uid, vals, context=create_context)
+        project_rec = self.browse(cr, uid, project_id, context=context)
+        self.pool.get('mail.alias').write(cr, uid, [project_rec.alias_id.id], {'alias_parent_thread_id': project_id, 'alias_defaults': {'project_id': project_id}}, context)
         return project_id
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -573,26 +538,35 @@ def Project():
             vals.update(alias_model_id=model_ids[0])
         return super(project, self).write(cr, uid, ids, vals, context=context)
 
-class task(base_stage, osv.osv):
+
+class task(osv.osv):
     _name = "project.task"
     _description = "Task"
     _date_name = "date_start"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
+    _mail_post_access = 'read'
     _track = {
-        'state': {
-            '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', 'draft', 'done', 'open'],
+            'project.mt_task_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
+            'project.mt_task_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id.sequence != 1,
         },
-        'kanban_state': {  # kanban state: tracked, but only block subtype
-            'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
+        'user_id': {
+            'project.mt_task_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
+        },
+        'kanban_state': {
+            'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
     }
 
+    def _get_default_partner(self, cr, uid, context=None):
+        project_id = self._get_default_project_id(cr, uid, context)
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return project.partner_id.id
+        return False
+
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
         return (self._resolve_project_id_from_context(cr, uid, context=context) or False)
@@ -600,14 +574,15 @@ class task(base_stage, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('sequence', '=', '1')], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
             context key, or None if it cannot be resolved to a single
             project.
         """
-        if context is None: context = {}
+        if context is None:
+            context = {}
         if type(context.get('default_project_id')) in (int, long):
             return context['default_project_id']
         if isinstance(context.get('default_project_id'), basestring):
@@ -676,27 +651,32 @@ class task(base_stage, osv.osv):
             res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
                 res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
-            if task.state in ('done','cancelled'):
+            # TDE CHECK: if task.state in ('done','cancelled'):
+            if task.stage_id and task.stage_id.fold:
                 res[task.id]['progress'] = 100.0
         return res
 
     def onchange_remaining(self, cr, uid, ids, remaining=0.0, planned=0.0):
         if remaining and not planned:
-            return {'value':{'planned_hours': remaining}}
+            return {'value': {'planned_hours': remaining}}
         return {}
 
     def onchange_planned(self, cr, uid, ids, planned=0.0, effective=0.0):
-        return {'value':{'remaining_hours': planned - effective}}
+        return {'value': {'remaining_hours': planned - effective}}
 
-    def onchange_project(self, cr, uid, id, project_id):
-        if not project_id:
-            return {}
-        data = self.pool.get('project.project').browse(cr, uid, [project_id])
-        partner_id=data and data[0].partner_id
-        if partner_id:
-            return {'value':{'partner_id':partner_id.id}}
+    def onchange_project(self, cr, uid, id, project_id, context=None):
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return {'value': {'partner_id': project.partner_id.id}}
         return {}
 
+    def onchange_user_id(self, cr, uid, ids, user_id, context=None):
+        vals = {}
+        if user_id:
+            vals['date_start'] = fields.datetime.now()
+        return {'value': vals}
+
     def duplicate_task(self, cr, uid, map_ids, context=None):
         for new in map_ids.values():
             task = self.browse(cr, uid, new, context)
@@ -754,13 +734,6 @@ class task(base_stage, osv.osv):
         '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="[('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.\
-                      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\'.'),
         'categ_ids': fields.many2many('project.category', string='Tags'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
                                          track_visibility='onchange',
@@ -769,10 +742,12 @@ class task(base_stage, osv.osv):
                                               " * 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",
                                          readonly=True, required=False),
-        'create_date': fields.datetime('Create Date', readonly=True,select=True),
+        'create_date': fields.datetime('Create Date', readonly=True, select=True),
+        'write_date': fields.datetime('Last Modification Date', readonly=True, select=True), #not displayed in the view but it might be useful with base_action_rule module (and it needs to be defined first for that)
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
         'date_deadline': fields.date('Deadline',select=True),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
         'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select="1", track_visibility='onchange'),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
@@ -789,7 +764,7 @@ class task(base_stage, osv.osv):
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'progress': fields.function(_hours_get, string='Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
+        'progress': fields.function(_hours_get, string='Working Time Progress (%)', multi='hours', group_operator="avg", help="If the task has a progress of 99.99% you should close the task if it's finished or reevaluate the time",
             store = {
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
@@ -812,13 +787,15 @@ class task(base_stage, osv.osv):
     _defaults = {
         'stage_id': _get_default_stage_id,
         'project_id': _get_default_project_id,
+        'date_last_stage_update': lambda *a: fields.datetime.now(),
         'kanban_state': 'normal',
         'priority': '2',
         'progress': 0,
         'sequence': 10,
         'active': True,
-        'user_id': lambda obj, cr, uid, context: uid,
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c),
+        'user_id': lambda obj, cr, uid, ctx=None: uid,
+        'company_id': lambda self, cr, uid, ctx=None: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=ctx),
+        'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx),
     }
     _order = "priority, sequence, date_start, name, id"
 
@@ -938,7 +915,7 @@ class task(base_stage, osv.osv):
                 section_ids.append(task.project_id.id)
         search_domain = []
         if section_ids:
-            search_domain = [('|')] * (len(section_ids)-1)
+            search_domain = [('|')] * (len(section_ids) - 1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
         search_domain += list(domain)
@@ -955,82 +932,10 @@ class task(base_stage, osv.osv):
         for task in tasks:
             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."))
+                    if child.stage_id and not child.stage_id.fold:
+                        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):
-        """ This action closes the task
-        """
-        task_id = len(ids) and ids[0] or False
-        self._check_child_task(cr, uid, ids, context=context)
-        if not task_id: return False
-        return self.do_close(cr, uid, [task_id], context=context)
-
-    def do_close(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_close. """
-        return self.case_close(cr, uid, ids, context=context)
-
-    def case_close(self, cr, uid, ids, context=None):
-        """ Closes Task """
-        if not isinstance(ids, list): ids = [ids]
-        for task in self.browse(cr, uid, ids, context=context):
-            vals = {}
-            project = task.project_id
-            for parent_id in task.parent_ids:
-                if parent_id.state in ('pending','draft'):
-                    reopen = True
-                    for child in parent_id.child_ids:
-                        if child.id != task.id and child.state not in ('done','cancelled'):
-                            reopen = False
-                    if reopen:
-                        self.do_reopen(cr, uid, [parent_id.id], context=context)
-            # close task
-            vals['remaining_hours'] = 0.0
-            if not task.date_end:
-                vals['date_end'] = fields.datetime.now()
-            self.case_set(cr, uid, [task.id], 'done', vals, context=context)
-        return True
-
-    def do_reopen(self, cr, uid, ids, context=None):
-        for task in self.browse(cr, uid, ids, context=context):
-            project = task.project_id
-            self.case_set(cr, uid, [task.id], 'open', {}, context=context)
-        return True
-
-    def do_cancel(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_cancel. """
-        return self.case_cancel(cr, uid, ids, context=context)
-
-    def case_cancel(self, cr, uid, ids, context=None):
-        tasks = self.browse(cr, uid, ids, context=context)
-        self._check_child_task(cr, uid, ids, context=context)
-        for task in tasks:
-            self.case_set(cr, uid, [task.id], 'cancelled', {'remaining_hours': 0.0}, context=context)
-        return True
-
-    def do_open(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_open. """
-        return self.case_open(cr, uid, ids, context=context)
-
-    def case_open(self, cr, uid, ids, context=None):
-        if not isinstance(ids,list): ids = [ids]
-        return self.case_set(cr, uid, ids, 'open', {'date_start': fields.datetime.now()}, context=context)
-
-    def do_draft(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_draft. """
-        return self.case_draft(cr, uid, ids, context=context)
-
-    def case_draft(self, cr, uid, ids, context=None):
-        return self.case_set(cr, uid, ids, 'draft', {}, context=context)
-
-    def do_pending(self, cr, uid, ids, context=None):
-        """ Compatibility when changing to case_pending. """
-        return self.case_pending(cr, uid, ids, context=context)
-
-    def case_pending(self, cr, uid, ids, context=None):
-        return self.case_set(cr, uid, ids, 'pending', {}, context=context)
-
     def _delegate_task_attachments(self, cr, uid, task_id, delegated_task_id, context=None):
         attachment = self.pool.get('ir.attachment')
         attachment_ids = attachment.search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', task_id)], context=context)
@@ -1051,6 +956,7 @@ class task(base_stage, osv.osv):
             delegated_task_id = self.copy(cr, uid, task.id, {
                 'name': delegate_data['name'],
                 'project_id': delegate_data['project_id'] and delegate_data['project_id'][0] or False,
+                'stage_id': delegate_data.get('stage_id') and delegate_data.get('stage_id')[0] or False,
                 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False,
                 'planned_hours': delegate_data['planned_hours'] or 0.0,
                 'parent_ids': [(6, 0, [task.id])],
@@ -1065,16 +971,12 @@ class task(base_stage, osv.osv):
                 'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
                 'name': newname,
             }, context=context)
-            if delegate_data['state'] == 'pending':
-                self.do_pending(cr, uid, [task.id], context=context)
-            elif delegate_data['state'] == 'done':
-                self.do_close(cr, uid, [task.id], context=context)
             delegated_tasks[task.id] = delegated_task_id
         return delegated_tasks
 
     def set_remaining_time(self, cr, uid, ids, remaining_time=1.0, context=None):
         for task in self.browse(cr, uid, ids, context=context):
-            if (task.state=='draft') or (task.planned_hours==0.0):
+            if (task.stage_id and task.stage_id.sequence == 1) or (task.planned_hours == 0.0):
                 self.write(cr, uid, [task.id], {'planned_hours': remaining_time}, context=context)
         self.write(cr, uid, ids, {'remaining_hours': remaining_time}, context=context)
         return True
@@ -1109,50 +1011,56 @@ class task(base_stage, osv.osv):
                 'planned_hours': task.planned_hours,
                 'kanban_state': task.kanban_state,
                 'type_id': task.stage_id.id,
-                'state': task.state,
                 'user_id': task.user_id.id
 
             }, context=context)
         return True
 
+    # ------------------------------------------------
+    # CRUD overrides
+    # ------------------------------------------------
+
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('project_id'):
-                ctx['default_project_id'] = vals['project_id']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
+
+        # for default stage
+        if vals.get('project_id') and not context.get('default_project_id'):
+            context['default_project_id'] = vals.get('project_id')
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
+
         # 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
 
-    # Overridden to reset the kanban_state to normal whenever
-    # the stage (stage_id) of the task changes.
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        if vals.get('project_id'):
-            project_id = self.pool.get('project.project').browse(cr, uid, vals.get('project_id'), context=context)
-            if project_id:
-                vals.setdefault('message_follower_ids', [])
-                vals['message_follower_ids'] += [(6, 0,[follower.id]) for follower in project_id.message_follower_ids]
+
+        # stage change: update date_last_stage_update
+        if 'stage_id' in vals:
+            vals['date_last_stage_update'] = fields.datetime.now()
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
+
+        # Overridden to reset the kanban_state to normal whenever
+        # the stage (stage_id) of the task changes.
         if vals and not 'kanban_state' in vals and 'stage_id' in vals:
             new_stage = vals.get('stage_id')
             vals_reset_kstate = dict(vals, kanban_state='normal')
             for t in self.browse(cr, uid, ids, context=context):
-                #TO FIX:Kanban view doesn't raise warning
-                #stages = [stage.id for stage in t.project_id.type_ids]
-                #if new_stage not in stages:
-                    #raise osv.except_osv(_('Warning!'), _('Stage is not defined in the project.'))
                 write_vals = vals_reset_kstate if t.stage_id != new_stage else vals
                 super(task, self).write(cr, uid, [t.id], write_vals, context=context)
             result = True
         else:
             result = super(task, self).write(cr, uid, ids, vals, context=context)
-        if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals):
+
+        if any(item in vals for item in ['stage_id', 'remaining_hours', 'user_id', 'kanban_state']):
             self._store_history(cr, uid, ids, context=context)
         return result
 
@@ -1168,7 +1076,7 @@ class task(base_stage, osv.osv):
         result = ""
         ident = ' '*ident
         for task in tasks:
-            if task.state in ('done','cancelled'):
+            if task.stage_id and task.stage_id.fold:
                 continue
             result += '''
 %sdef Task_%s():
@@ -1199,17 +1107,6 @@ 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 = {}
@@ -1238,24 +1135,10 @@ class task(base_stage, osv.osv):
                         update_vals[field] = float(res.group(2).lower())
                     except (ValueError, TypeError):
                         pass
-                elif match.lower() == 'state' \
-                        and res.group(2).lower() in ['cancel','close','draft','open','pending']:
-                    act = 'do_%s' % res.group(2).lower()
         if act:
             getattr(self,act)(cr, uid, ids, context=context)
         return super(task,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
-    def project_task_reevaluate(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').has_group(cr, uid, 'project.group_time_work_estimation_tasks'):
-            return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'project.task.reevaluate',
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-        return self.do_reopen(cr, uid, ids, context=context)
-
 class project_work(osv.osv):
     _name = "project.task.work"
     _description = "Project Task Work"
@@ -1376,7 +1259,7 @@ class project_task_history(osv.osv):
     def _get_date(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for history in self.browse(cr, uid, ids, context=context):
-            if history.state in ('done','cancelled'):
+            if history.type_id and history.type_id.fold:
                 result[history.id] = history.date
                 continue
             cr.execute('''select
@@ -1410,14 +1293,13 @@ class project_task_history(osv.osv):
     _columns = {
         'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True),
         'type_id': fields.many2one('project.task.type', 'Stage'),
-        'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'Status'),
-        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', required=False),
+        'kanban_state': fields.selection([('normal', 'Normal'), ('blocked', 'Blocked'), ('done', 'Ready for next stage')], 'Kanban State', required=False),
         'date': fields.date('Date', select=True),
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
             'project.task.history': (_get_related_date, None, 20)
         }),
-        'remaining_hours': fields.float('Remaining Time', digits=(16,2)),
-        'planned_hours': fields.float('Planned Time', digits=(16,2)),
+        'remaining_hours': fields.float('Remaining Time', digits=(16, 2)),
+        'planned_hours': fields.float('Planned Time', digits=(16, 2)),
         'user_id': fields.many2one('res.users', 'Responsible'),
     }
     _defaults = {
@@ -1447,7 +1329,7 @@ class project_task_history_cumulative(osv.osv):
                 SELECT
                     h.id AS history_id,
                     h.date+generate_series(0, CAST((coalesce(h.end_date, DATE 'tomorrow')::date - h.date) AS integer)-1) AS date,
-                    h.task_id, h.type_id, h.user_id, h.kanban_state, h.state,
+                    h.task_id, h.type_id, h.user_id, h.kanban_state,
                     greatest(h.remaining_hours, 1) AS remaining_hours, greatest(h.planned_hours, 1) AS planned_hours,
                     t.project_id
                 FROM
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index 7bf1a623a2c..0f48dfe9a2b 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -30,51 +30,43 @@
         <record id="project_tt_analysis" model="project.task.type">
             <field name="sequence">1</field>
             <field name="name">Analysis</field>
-            <field name="state">draft</field>
-            <field name="case_default" eval="False"/>
+            <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_specification" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">10</field>
             <field name="name">Specification</field>
-            <field name="state">pending</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_design" model="project.task.type">
-            <field name="sequence">2</field>
+            <field name="sequence">11</field>
             <field name="name">Design</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_development" model="project.task.type">
-            <field name="sequence">3</field>
+            <field name="sequence">12</field>
             <field name="name">Development</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_testing" model="project.task.type">
-            <field name="sequence">4</field>
+            <field name="sequence">13</field>
             <field name="name">Testing</field>
-            <field name="state">open</field>
             <field name="case_default" eval="True"/>
         </record>
         <record id="project_tt_merge" model="project.task.type">
-            <field name="sequence">5</field>
+            <field name="sequence">14</field>
             <field name="name">Merge</field>
-            <field name="state">open</field>
             <field name="case_default" eval="False"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_deployment" model="project.task.type">
-            <field name="sequence">100</field>
+            <field name="sequence">20</field>
             <field name="name">Done</field>
-            <field name="state">done</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
         <record id="project_tt_cancel" model="project.task.type">
-            <field name="sequence">200</field>
+            <field name="sequence">30</field>
             <field name="name">Cancelled</field>
-            <field name="state">cancelled</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
@@ -86,11 +78,11 @@
             <field name="default" eval="False"/>
             <field name="description">Task created</field>
         </record>
-        <record id="mt_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
+        <record id="mt_task_assigned" model="mail.message.subtype">
+            <field name="name">Task Assigned</field>
             <field name="res_model">project.task</field>
             <field name="default" eval="False"/>
-            <field name="description">Task started</field>
+            <field name="description">Task Assigned</field>
         </record>
         <record id="mt_task_blocked" model="mail.message.subtype">
             <field name="name">Task Blocked</field>
@@ -98,12 +90,6 @@
             <field name="default" eval="False"/>
             <field name="description">Task blocked</field>
         </record>
-        <record id="mt_task_closed" model="mail.message.subtype">
-            <field name="name">Task Done</field>
-            <field name="res_model">project.task</field>
-            <field name="default" eval="False"/>
-            <field name="description">Task closed</field>
-        </record>
         <record id="mt_task_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.task</field>
@@ -118,11 +104,11 @@
             <field name="parent_id" eval="ref('mt_task_new')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_task_started" model="mail.message.subtype">
-            <field name="name">Task Started</field>
+        <record id="mt_project_task_assigned" model="mail.message.subtype">
+            <field name="name">Task Assigned</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_task_started')"/>
+            <field name="parent_id" eval="ref('mt_task_assigned')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_task_blocked" model="mail.message.subtype">
@@ -131,12 +117,6 @@
             <field name="parent_id" eval="ref('mt_task_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_task_closed" model="mail.message.subtype">
-            <field name="name">Task Done</field>
-            <field name="res_model">project.project</field>
-            <field name="parent_id" eval="ref('mt_task_closed')"/>
-            <field name="relation_field">project_id</field>
-        </record>
         <record id="mt_project_task_stage" model="mail.message.subtype">
             <field name="name">Task Stage Changed</field>
             <field name="res_model">project.project</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index b7dcc2bdb83..12e373642fd 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -46,9 +46,12 @@
         <record id="project_project_2" model="project.project">
             <field name="name">Research &amp; Development</field>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="privacy_visibility">public</field>
+            <field name="privacy_visibility">followers</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
+            <field name="message_follower_ids" eval="[(6, 0, [
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
         </record>
 
         <!-- We assign after so that default values applies -->
@@ -75,6 +78,7 @@
             <field name="parent_id" ref="all_projects_account"/>
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
+            <field name="privacy_visibility">followers</field>
             <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'))]"/>
@@ -221,7 +225,6 @@
                     ref('project.project_category_04')])]"/>
             <field name="stage_id" ref="project_tt_merge"/>
         </record>
-        <function model="project.task" name="do_close" eval="[ref('project_task_11')], {'install_mode': True}"/>
 
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
@@ -233,7 +236,6 @@
             <field name="stage_id" ref="project_tt_merge"/>
             <field name="color">6</field>
         </record>
-        <function model="project.task" name="do_close" eval="[ref('project_task_12')], {'install_mode': True}"/>
 
         <record id="project_task_13" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -244,7 +246,6 @@
             <field name="name">Design Use Cases</field>
             <field name="stage_id" ref="project_tt_analysis"/>
         </record>
-        <function model="project.task" name="do_pending" eval="[ref('project_task_13')], {'install_mode': True}"/>
 
         <record id="project_task_14" model="project.task">
             <field name="planned_hours" eval="12.0"/>
@@ -278,7 +279,6 @@
             <field name="name">Set target for all deparments</field>
              <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_16')], {'install_mode': True}"/>
 
         <record id="project_task_17" model="project.task">
             <field name="planned_hours" eval="34.0"/>
@@ -289,7 +289,6 @@
             <field name="name">Integration of core components</field>
             <field name="stage_id" ref="project_tt_testing"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_17')], {'install_mode': True}"/>
 
         <record id="project_task_18" model="project.task">
             <field name="planned_hours" eval="16.0"/>
@@ -311,7 +310,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_03')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_19')], {'install_mode': True}"/>
 
         <record id="project_task_20" model="project.task">
             <field name="planned_hours">42.0</field>
@@ -321,7 +319,6 @@
             <field name="project_id" ref="project.project_project_4"/>
             <field name="name">Create new components</field>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_20')], {'install_mode': True}"/>
 
         <record id="project_task_21" model="project.task">
             <field name="planned_hours">14.0</field>
@@ -333,7 +330,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_04')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_21')], {'install_mode': True}"/>
 
         <record id="project_task_22" model="project.task">
             <field name="planned_hours">12.0</field>
@@ -367,7 +363,6 @@
             <field name="categ_ids" eval="[(6, 0, [
                     ref('project_category_01')])]"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_24')], {'install_mode': True}"/>
 
         <record id="project_task_25" model="project.task">
             <field name="sequence">20</field>
@@ -378,7 +373,6 @@
             <field name="name">Data importation + Doc</field>
             <field name="stage_id" ref="project_tt_development"/>
         </record>
-        <function model="project.task" name="do_open" eval="[ref('project_task_25')], {'install_mode': True}"/>
 
         <record id="project_task_26" model="project.task">
             <field name="sequence">20</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index eb042e5f0c7..37836b0e07a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -18,28 +18,26 @@
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
                     <field name="categ_ids"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
+                    <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                     <separator/>
-                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
                     <separator/>
-                    <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
-                    <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress 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="My project" string="Project" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-check"/>
-                    <separator/>
-                    <filter string="My Tasks" domain="[('user_id','=',uid)]"  help="My Tasks" icon="terp-personal"/>
-                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="Deadlines" context="{'deadline_visible': False}" domain="[('date_deadline','&lt;&gt;',False)]"
-                        help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
+                        help="Show only tasks having a deadline"/>
+                    <field name="partner_id"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
+                    <field name="stage_id" domain="[]"/>
                     <group expand="0" string="Group By...">
                         <filter string="Users" name="group_user_id" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
                         <filter string="Project" name="group_project_id" icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Last Stage Update" icon="terp-go-month" domain="[]" context="{'group_by':'date_last_stage_update'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
-                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
+                        <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
                     </group>
                 </search>
@@ -89,17 +87,6 @@
                         <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"/>
@@ -112,17 +99,31 @@
                     </div>
                     <group>
                         <group>
-                            <field name="privacy_visibility"/>
                             <field name="user_id" string="Project Manager" 
-                                attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
-                                context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
-                        </group>
-                        <group>
+                                    attrs="{'readonly':[('state','in',['close', 'cancelled'])]}" 
+                                    context="{'default_groups_ref': ['base.group_user', 'project.group_project_manager']}"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                            <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
-                                To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
+                            <span></span>
+                            <p attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                                To invoice or setup invoicing and renewal options, go to the related contract:
+                                <field name="analytic_account_id" readonly="1" required="0" class="oe_inline" nolabel="1"/>.
                             </p>
                         </group>
+                        <group name="group_alias"
+                                attrs="{'invisible': [('alias_domain', '=', False)]}">
+                            <label for="alias_name" string="Email Alias"/>
+                            <div name="alias_def">
+                                <field name="alias_id" class="oe_read_only oe_inline"
+                                        string="Email Alias" required="0"/>
+                                <div class="oe_edit_only oe_inline" name="edit_alias" style="display: inline;" >
+                                    <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </div>
+                            </div>
+                            <label for="alias_model" string="Incoming Emails create"/>
+                            <field name="alias_model" class="oe_inline" nolabel="1"/>
+                            <field name="alias_contact" class="oe_inline"
+                                    string="Accept Emails From"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Team" name="team">
@@ -134,6 +135,7 @@
                                             <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">
+                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.id.value)" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                     <div class="oe_module_desc">
                                                         <field name="name"/>
                                                     </div>
@@ -145,20 +147,22 @@
                             </field>
                         </page>
                         <page string="Other Info">
-                            <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"/>
-                                    <field name="resource_calendar_id"/>
-                                </group>
-                                <group string="Miscellaneous" name="misc">
-                                    <field name="date_start"/>
-                                    <field name="date" string="End Date"/>
-                                    <field name="priority" groups="base.group_no_one"/>
-                                    <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id" groups="base.group_multi_currency" required="1"/>
-                                    <field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
-                                </group>
+                            <group string="Administration">
+                                <field name="privacy_visibility" widget="radio"/>
+                                <field name="planned_hours" widget="float_time"
+                                        groups="project.group_time_work_estimation_tasks"/>
+                                <field name="effective_hours" widget="float_time"
+                                        groups="project.group_time_work_estimation_tasks"/>
+                                <field name="resource_calendar_id"
+                                        groups="project.group_time_work_estimation_tasks"/>
+                            </group>
+                            <group string="Miscellaneous" name="misc">
+                                <field name="date_start"/>
+                                <field name="date" string="End Date"/>
+                                <field name="priority" groups="base.group_no_one"/>
+                                <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
+                                <field name="currency_id" groups="base.group_multi_currency" required="1"/>
+                                <field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
                             </group>
                         </page>
                         <page string="Project Stages" attrs="{'invisible': [('use_tasks', '=', False)]}" name="project_stages">
@@ -252,7 +256,7 @@
                                 <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>
+                                        <span class="oe_e oe_e_alias">%%</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"> 
@@ -365,18 +369,6 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <!--
-                        <button name="do_open" string="Start Task" type="object"
-                                states="draft,pending" class="oe_highlight"/>
-                        <button name="do_draft" string="Draft" type="object"
-                                states="cancel,done"/>
-                        -->
-                        <button name="project_task_reevaluate" string="Reactivate" type="object"
-                                states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
-                        <button name="action_close" string="Done" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
-                        <button name="do_cancel" string="Cancel Task" type="object"
-                                states="draft,open,pending" groups="base.group_user"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet string="Task">
@@ -390,8 +382,7 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" 
-                                attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" 
+                            <field name="user_id"
                                 options='{"no_open": True}'
                                 context="{'default_groups_ref': ['base.group_user', 'project.group_project_user']}"/>
                             <field name="planned_hours" widget="float_time"
@@ -399,15 +390,15 @@
                                     on_change="onchange_planned(planned_hours, effective_hours)"/>
                         </group>
                         <group>
-                            <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="date_deadline"/>
                             <field name="categ_ids" widget="many2many_tags"/>
                             <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/>
+                                groups="project.group_time_work_estimation_tasks"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
+                            <field name="description" placeholder="Add a Description..."/>
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
                                     <field name="name"/>
@@ -421,7 +412,7 @@
                                 <field name="effective_hours" widget="float_time"/>
                                 <label for="remaining_hours" string="Remaining" groups="project.group_time_work_estimation_tasks"/>
                                 <div>
-                                    <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','in',('done','cancelled'))]}" groups="project.group_time_work_estimation_tasks"/>
+                                    <field name="remaining_hours" widget="float_time" groups="project.group_time_work_estimation_tasks"/>
                                 </div>
                                 <field name="total_hours" widget="float_time" class="oe_subtotal_footer_separator"/>
                              </group>
@@ -430,7 +421,7 @@
                         </page>
                         <page string="Delegation" groups="project.group_delegate_task">
                             <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                    states="pending,open,draft" groups="project.group_delegate_task"/>
+                                    groups="project.group_delegate_task"/>
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -439,7 +430,6 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -447,12 +437,11 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
+                        <page string="Extra Info">
                             <group col="4">
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
-                                <field name="state" invisible="1"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
@@ -461,6 +450,7 @@
                                     <field name="date_end"/>
                                 </group>
                                 <group>
+                                    <field name="date_last_stage_update" groups="base.group_no_one"/>
                                 </group>
                             </group>
                         </page>
@@ -487,7 +477,6 @@
                     <field name="user_email"/>
                     <field name="description"/>
                     <field name="sequence"/>
-                    <field name="state" groups="base.group_no_one"/>
                     <field name="kanban_state"/>
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
@@ -507,7 +496,6 @@
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
                                         <li><a name="set_remaining_time_10" type="object" class="oe_kanban_button">10</a></li>
-                                        <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/>
@@ -556,7 +544,7 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                <tree fonts="bold:message_unread==True" colors="red:date_deadline and (date_deadline&lt;current_date)" string="Tasks">
                     <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
@@ -569,7 +557,6 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" groups="base.group_no_one"/>
                     <field name="date_end" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -655,7 +642,7 @@
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph,kanban</field>
-            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
+            <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d'))]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
         </record>
@@ -700,7 +687,6 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
@@ -717,7 +703,7 @@
                 <tree string="Task Stage">
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="state"/>
+                    <field name="fold"/>
                 </tree>
             </field>
         </record>
@@ -761,7 +747,9 @@
         </record>
 
         <!-- User Form -->
-        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned Tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
+        <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}"
+                    id="act_res_users_2_project_task_opened" name="Assigned Tasks"
+                    res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
 
         <!-- Tags -->
         <record model="ir.ui.view" id="project_category_search_view">
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 17e059c8de7..9b9490f0b28 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -14,7 +14,6 @@
                     <field name="user_id"/>
                     <field name="remaining_hours"/>
                     <field name="kanban_state"/>
-                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
@@ -40,8 +39,7 @@
                     <field name="date"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
-                    <filter name="open" string="In Progress Tasks" domain="[('state','in',('open','draft'))]"/>
-                    <filter string="Pending Tasks" domain="[('state','=','pending')]" context="{'show_delegated':False}"/>
+                    <filter name="new" string="New" domain="[('type_id.sequence', '=', 1)]"/>
                     <separator/>
                     <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]"/>
                     <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]"/>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 006aae1085c..15b26507ff3 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from openerp import tools
 
+
 class report_project_task_user(osv.osv):
     _name = "report.project.task.user"
     _description = "Tasks by user and project"
@@ -31,10 +32,11 @@ class report_project_task_user(osv.osv):
         'day': fields.char('Day', size=128, readonly=True),
         'year': fields.char('Year', size=64, required=False, readonly=True),
         'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
-        'date_start': fields.date('Starting Date',readonly=True),
+        'date_start': fields.date('Assignation Date', readonly=True),
         'no_of_days': fields.integer('# of Days', size=128, readonly=True),
         'date_end': fields.date('Ending Date', readonly=True),
         'date_deadline': fields.date('Deadline', readonly=True),
+        'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
         'project_id': fields.many2one('project.project', 'Project', readonly=True),
         'hours_planned': fields.float('Planned Hours', readonly=True),
         'hours_effective': fields.float('Effective Hours', readonly=True),
@@ -44,16 +46,17 @@ class report_project_task_user(osv.osv):
         'total_hours': fields.float('Total Hours', readonly=True),
         'closing_days': fields.float('Days to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the task"),
-        'opening_days': fields.float('Days to Open', digits=(16,2), readonly=True, group_operator="avg",
+        'opening_days': fields.float('Days to Assign', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to Open the task"),
         'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
-        'priority' : fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Urgent'),
-('0','Very urgent')], 'Priority', readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
+        'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'), ('1', 'Urgent'), ('0', 'Very urgent')],
+            string='Priority', readonly=True),
+        'month':fields.selection(fields.date.MONTHS, 'Month', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
+        'stage_id': fields.many2one('project.task.type', 'Stage'),
     }
     _order = 'name desc, project_id'
 
@@ -69,19 +72,19 @@ class report_project_task_user(osv.osv):
                     to_char(date_start, 'YYYY-MM-DD') as day,
                     date_trunc('day',t.date_start) as date_start,
                     date_trunc('day',t.date_end) as date_end,
+                    date_trunc('day',t.date_last_stage_update) as date_last_stage_update,
                     to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_deadline,
 --                    sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
                     abs((extract('epoch' from (t.date_end-t.date_start)))/(3600*24))  as no_of_days,
                     t.user_id,
                     progress as progress,
                     t.project_id,
-                    t.state,
                     t.effective_hours as hours_effective,
                     t.priority,
                     t.name as name,
                     t.company_id,
                     t.partner_id,
-                    t.stage_id,
+                    t.stage_id as stage_id,
                     remaining_hours as remaining_hours,
                     total_hours as total_hours,
                     t.delay_hours as hours_delay,
@@ -106,15 +109,12 @@ class report_project_task_user(osv.osv):
                     date_start,
                     date_end,
                     date_deadline,
+                    date_last_stage_update,
                     t.user_id,
                     t.project_id,
-                    t.state,
                     t.priority,
                     name,
                     t.company_id,
                     t.partner_id,
-                    t.stage_id
-
+                    stage_id
         """)
-
-
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index d9650e165ce..d5638e332a4 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -13,11 +13,12 @@
                 <tree string="Tasks Analysis" create="false">
                     <field name="name" invisible="1"/>
                     <field name="project_id" invisible="1"/>
+                    <field name="stage_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_deadline" invisible="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1"/>
                     <field name="date_end" invisible="1"/>
+                    <field name="date_last_stage_update" invisible="1"/>
                     <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="day" invisible="1"/>
@@ -44,7 +45,7 @@
             <field name="arch" type="xml">
                 <graph string="Tasks Analysis" type="bar">
                      <field name="name"/>
-                     <field name="state" group="True"/>
+                     <field name="stage_id" group="True"/>
                      <field name="no_of_days" operator="+"/>
                  </graph>
              </field>
@@ -58,31 +59,29 @@
                     <field name="date_start"/>
                     <field name="date_end"/>
                     <field name="date_deadline"/>
-                    <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help = "New tasks"/>
-                    <filter string="In progress" icon="terp-check" domain="[('state', '=' ,'open')]" help = "In progress tasks"/>
-                    <filter string="Pending" icon="terp-gtk-media-pause" domain="[('state','=','pending')]" help = "Pending tasks"/>
-                    <filter string="Done" icon="terp-dialog-close" name="done" domain="[('state','=','done')]"/>
-                    <separator/>
-                    <filter icon="terp-folder-violet" string="My Projects" help="My Projects" domain="[('project_id.user_id','=',uid)]"/>
-                    <separator/>
-                    <filter icon="terp-personal" string="My Task" help = "My tasks" domain="[('user_id','=',uid)]" />
-                    <filter icon="terp-personal-" string="Non Assigned Tasks to users" help="Non Assigned Tasks to users" domain="[('user_id','=',False)]"/>
+                    <field name="date_last_stage_update"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="stage_id"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/>
+                    <filter string="New" name="new" domain="[('stage_id.sequence', '=', 1)]"/>
+                    <separator/>
+                    <filter string="My Task" domain="[('user_id','=',uid)]" />
                     <group expand="0" string="Extended Filters...">
                         <field name="priority"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <group expand="1" string="Group By...">
-                        <filter string="Project" name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}"/>
-                        <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
-                        <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
-                        <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
-                        <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Creation Date"/>
+                        <filter string="Project" name="project" context="{'group_by':'project_id'}"/>
+                        <filter string="Task" context="{'group_by':'name'}" />
+                        <filter string="Contact" context="{'group_by':'partner_id'}" />
+                        <filter string="Assigned to" name="User" context="{'group_by':'user_id'}" />
+                        <filter string="Company" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                        <filter string="Day" context="{'group_by':'day'}" help="Creation Date"/>
+                        <filter string="Month" context="{'group_by':'month'}" help="Creation Date"/>
+                        <filter string="Year" context="{'group_by':'year'}" help="Creation Date"/>
+                        <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}" help="Last Stage Update"/>
                     </group>
                 </search>
             </field>
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index e4ca63d79d8..e49cacf4f89 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -29,6 +29,14 @@ class res_partner(osv.osv):
         'task_ids': fields.one2many('project.task', 'partner_id', 'Tasks'),
     }
 
+    def copy(self, cr, uid, record_id, default=None, context=None):
+        if default is None:
+            default = {}
+
+        default['task_ids'] = []
+        return super(res_partner, self).copy(
+                cr, uid, record_id, default=default, context=context)
+
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index d668e3c7092..f12189b5163 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -4,28 +4,20 @@
 
          <!--  Partners inherited form -->
         <record id="view_task_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.task.info.inherit</field>
+            <field name="name">res.partner.task.buttons</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="priority" eval="50"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@name='page_history']" position="attributes">
-                    <attribute name="invisible">False</attribute>
-                </xpath>
-                <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_task" string="Tasks">
-                        <field name="task_ids" colspan="4" nolabel="1">
-                            <tree string="Tasks" editable="bottom">
-                                <field name="name"/>
-                                <field name="user_id"/>
-                                <field name="date_deadline"/>
-                                <field name="state" invisible="1"/>
-                                <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                                <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
-                            </tree>
-                        </field>
-                      </group>
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button class="oe_inline" type="action"
+                        name="%(action_view_task)d"
+                        string="Tasks"
+                        context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
+                        groups="project.group_project_user" />
                 </xpath>
             </field>
        </record>
+
    </data>
 </openerp>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index a76faa0fcce..c88fb276fcb 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -19,6 +19,7 @@ access_project_task_history,project.task.history project,project.model_project_t
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_manager,1,0,0,0
 access_project_task_history_cumulative,project.task.history project,project.model_project_task_history_cumulative,project.group_project_user,1,0,0,0
 access_resource_calendar,project.resource_calendar manager,resource.model_resource_calendar,project.group_project_manager,1,0,0,0
+access_resource_calendar_leaves_user,resource.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_project_category,project.project_category,model_project_category,,1,0,0,0
 access_project_category_manager,project.project_category,model_project_category,project.group_project_manager,1,1,1,1
 access_mail_alias,mail.alias,mail.model_mail_alias,project.group_project_manager,1,1,1,1
diff --git a/addons/project/html/Mario-Riva.png b/addons/project/static/description/Mario-Riva.png
similarity index 100%
rename from addons/project/html/Mario-Riva.png
rename to addons/project/static/description/Mario-Riva.png
diff --git a/addons/project/html/Yoshi-Tashiro.png b/addons/project/static/description/Yoshi-Tashiro.png
similarity index 100%
rename from addons/project/html/Yoshi-Tashiro.png
rename to addons/project/static/description/Yoshi-Tashiro.png
diff --git a/addons/project/static/src/img/icon.png b/addons/project/static/description/icon.png
similarity index 100%
rename from addons/project/static/src/img/icon.png
rename to addons/project/static/description/icon.png
diff --git a/addons/project/html/index.html b/addons/project/static/description/index.html
similarity index 97%
rename from addons/project/html/index.html
rename to addons/project/static/description/index.html
index 93f1be8a41d..2a1574c5d68 100644
--- a/addons/project/html/index.html
+++ b/addons/project/static/description/index.html
@@ -17,7 +17,7 @@ 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>
+                <a href="http://www.openerp.com/start?app=project" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/project/html/project_01.png b/addons/project/static/description/project_01.png
similarity index 100%
rename from addons/project/html/project_01.png
rename to addons/project/static/description/project_01.png
diff --git a/addons/project/html/project_calendar.png b/addons/project/static/description/project_calendar.png
similarity index 100%
rename from addons/project/html/project_calendar.png
rename to addons/project/static/description/project_calendar.png
diff --git a/addons/project/html/project_chat.png b/addons/project/static/description/project_chat.png
similarity index 100%
rename from addons/project/html/project_chat.png
rename to addons/project/static/description/project_chat.png
diff --git a/addons/project/html/project_easy.png b/addons/project/static/description/project_easy.png
similarity index 100%
rename from addons/project/html/project_easy.png
rename to addons/project/static/description/project_easy.png
diff --git a/addons/project/html/project_etherpad.png b/addons/project/static/description/project_etherpad.png
similarity index 100%
rename from addons/project/html/project_etherpad.png
rename to addons/project/static/description/project_etherpad.png
diff --git a/addons/project/html/project_gantt.png b/addons/project/static/description/project_gantt.png
similarity index 100%
rename from addons/project/html/project_gantt.png
rename to addons/project/static/description/project_gantt.png
diff --git a/addons/project/html/project_illu_01.png b/addons/project/static/description/project_illu_01.png
similarity index 100%
rename from addons/project/html/project_illu_01.png
rename to addons/project/static/description/project_illu_01.png
diff --git a/addons/project/html/project_kanban.png b/addons/project/static/description/project_kanban.png
similarity index 100%
rename from addons/project/html/project_kanban.png
rename to addons/project/static/description/project_kanban.png
diff --git a/addons/project/html/project_kpi.png b/addons/project/static/description/project_kpi.png
similarity index 100%
rename from addons/project/html/project_kpi.png
rename to addons/project/static/description/project_kpi.png
diff --git a/addons/project/html/project_timesheet.png b/addons/project/static/description/project_timesheet.png
similarity index 100%
rename from addons/project/html/project_timesheet.png
rename to addons/project/static/description/project_timesheet.png
diff --git a/addons/project/test/project_demo.yml b/addons/project/test/project_demo.yml
deleted file mode 100644
index 5f6acbb913e..00000000000
--- a/addons/project/test/project_demo.yml
+++ /dev/null
@@ -1,12 +0,0 @@
--
-  !record {model: project.project, id: project_project_1, view: False}:
-    partner_id: base.res_partner_2
--
-  !record {model: project.task, id: project_task_1, view: False}:
-    remaining_hours: 10.00
--
-  !record {model: project.task, id: project_task_1, view: False}:
-    planned_hours: 10.00
--
-  !record {model: project.task, id: project_task_1, view: False}:
-    project_id: project_project_1
\ No newline at end of file
diff --git a/addons/project/test/project_process.yml b/addons/project/test/project_process.yml
deleted file mode 100644
index c2a5c072e9d..00000000000
--- a/addons/project/test/project_process.yml
+++ /dev/null
@@ -1,70 +0,0 @@
--
-  In order to Test Process of Project Management,
--
-  I create duplicate template.
--
-  !python {model: project.project}: |
-     new_template = self.duplicate_template(cr, uid, [ref("project_project_1")])
-     assert new_template, "duplicate template is not created"
-     template = self.browse(cr, uid, new_template['res_id'], context=context)
-     assert template.state == 'open', "Duplicate template must be in open state."
--
-  I convert template into real Project.
--
-  !python {model: project.project}: |
-     self.reset_project(cr, uid, [ref("project_project_1")])
--
-  I check project details after convert from template.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be active}:
-    - state == "open"
--
-  I put project in pending.
--
-  !python {model: project.project}: |
-    self.set_pending(cr, uid, [ref("project_project_1")])
--
-  I check state after put in pending.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be in pending state}:
-    - state == "pending"
--
-  I re-open the project.
--
-  !python {model: project.project}: |
-      self.set_open(cr, uid, [ref("project_project_1")])
--
-  I check state after reopen.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be open.}:
-    - state == "open"
--
-  I close the project.
--
-  !python {model: project.project}: |
-    self.set_done(cr, uid, [ref("project_project_1")])
--
-  I check state after closed.
--
-  !assert {model: project.project, id: project_project_1, severity: error, string: Project should be close.}:
-    - state == "close"
--
-  I set project into template.
--
-  !python {model: project.project}: |
-    self.set_template(cr, uid, [ref("project_project_1")])
--
-  I schedule tasks of project.
--
-  !python {model: project.project}: |
-    self.schedule_tasks(cr, uid, [ref("project_project_1")], context=context)
--
-  I copy the tasks of project.
--
-  !python {model: project.project}: |
-    self.copy(cr, uid, ref("project_project_1"))
--
-  I cancel Project.
--
-  !python {model: project.project}: |
-    self.set_cancel(cr, uid, [ref("project_project_2")])
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
deleted file mode 100644
index e37b2116714..00000000000
--- a/addons/project/test/task_process.yml
+++ /dev/null
@@ -1,76 +0,0 @@
--
-  I put task in pending due to specification is not clear.
--
-  !python {model: project.task}: |
-    self.do_pending(cr, uid, [ref("project_task_1")])
-    context.update({"active_id": ref("project_task_1")})
--
-  I check state  of task after put in pending.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be in pending state}:
-    - state == "pending"
--
-  !record {model: project.task.delegate, id: delegate_id}:
-    user_id: base.user_demo
-    planned_hours: 12.0
-    planned_hours_me: 2.0
--
-  Now I delegate task to team member.
--
-  !python {model: project.task.delegate}: |
-    self.delegate(cr, uid, [ref("delegate_id")], {"active_id": ref("project_task_1")})
--
-  I check delegated task details.
--
-  !python {model: project.task}: |
-    task = self.browse(cr, uid, ref("project_task_1"), context=context)
-    assert task.planned_hours == 2.0, "Planning hours is not correct after delegated."
-    assert task.state == "pending", "Task should be in Pending after delegated."
--
-  I re-open the task.
--
-  !python {model: project.task}: |
-    self.do_reopen(cr, uid, [ref("project_task_1")])
--
-  I check reopened task details.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be open.}:
-    - state == "open"
--
-  I change the stage of task to next stage.
--
-  !python {model: project.task}: |
-    self.stage_next(cr, uid, [ref("project_task_1")])
--
-  !record {model: project.task.reevaluate, id: reevaluate_id}:
-    remaining_hours : 120
--
-  I reevaluate task with remaining hours.
--
-  !python {model: project.task.reevaluate}: |
-    self.compute_hours(cr, uid, [ref("reevaluate_id")], {"active_id": ref("project_task_1")})
--
-  I check remaining hours after reevaluated task.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task should be reevaluated}:
-    - remaining_hours == 120.0
--
-  I close the task.
--
-  !python {model: project.task}: |
-    self.action_close(cr, uid, [ref("project_task_1")])
--
-  I check state after closed.
--
-  !assert {model: project.task, id: project_task_1, severity: error, string: task is in open state}:
-    - state == "done"
--
-  I change the stage of task to previous stage.
--
-  !python {model: project.task}: |
-    self.stage_previous(cr, uid, [ref("project_task_1")])
--
-  I cancel Task.
--
-  !python {model: project.task}: |
-    self.do_cancel(cr, uid, [ref("project_task_2")])
diff --git a/addons/base_status/__init__.py b/addons/project/tests/__init__.py
similarity index 83%
rename from addons/base_status/__init__.py
rename to addons/project/tests/__init__.py
index e4107f90a37..4d3163d6dc6 100644
--- a/addons/base_status/__init__.py
+++ b/addons/project/tests/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012-today OpenERP SA (<http://openerp.com>)
+#    OpenERP, Open Source Business Applications
+#    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
@@ -19,7 +19,10 @@
 #
 ##############################################################################
 
-import base_state
-import base_stage
+from . import test_project_flow
+
+checks = [
+    test_project_flow,
+]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/tests/test_project_base.py b/addons/project/tests/test_project_base.py
new file mode 100644
index 00000000000..f82561766fe
--- /dev/null
+++ b/addons/project/tests/test_project_base.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    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.addons.mail.tests.test_mail_base import TestMailBase
+
+
+class TestProjectBase(TestMailBase):
+
+    def setUp(self):
+        super(TestProjectBase, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.project_project = self.registry('project.project')
+        self.project_task = self.registry('project.task')
+        self.project_task_delegate = self.registry('project.task.delegate')
+
+        # 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
+
+        # Test partners to use through the various tests
+        self.project_partner_id = self.res_partner.create(cr, uid, {
+            'name': 'Gertrude AgrolaitPartner',
+            'email': 'gertrude.partner@agrolait.com',
+        })
+        self.email_partner_id = self.res_partner.create(cr, uid, {
+            'name': 'Patrick Ratatouille',
+            'email': 'patrick.ratatouille@agrolait.com',
+        })
+
+        # Test users to use through the various tests
+        self.user_projectuser_id = self.res_users.create(cr, uid, {
+            'name': 'Armande ProjectUser',
+            'login': 'Armande',
+            'alias_name': 'armande',
+            'email': 'armande.projectuser@example.com',
+            'groups_id': [(6, 0, [self.group_employee_id, self.group_project_user_id])]
+        })
+        self.user_projectmanager_id = self.res_users.create(cr, uid, {
+            'name': 'Bastien ProjectManager',
+            'login': 'bastien',
+            'alias_name': 'bastien',
+            'email': 'bastien.projectmanager@example.com',
+            'groups_id': [(6, 0, [self.group_employee_id, self.group_project_manager_id])]
+        })
+        self.user_none_id = self.res_users.create(cr, uid, {
+            'name': 'Charlie Avotbonkeur',
+            'login': 'charlie',
+            'alias_name': 'charlie',
+            'email': 'charlie.noone@example.com',
+            'groups_id': [(6, 0, [])]
+        })
+        self.user_projectuser = self.res_users.browse(cr, uid, self.user_projectuser_id)
+        self.user_projectmanager = self.res_users.browse(cr, uid, self.user_projectmanager_id)
+        self.partner_projectuser_id = self.user_projectuser.partner_id.id
+        self.partner_projectmanager_id = self.user_projectmanager.partner_id.id
+
+        # Test 'Pigs' project
+        self.project_pigs_id = self.project_project.create(cr, uid, {
+            'name': 'Pigs',
+            'privacy_visibility': 'public',
+            'alias_name': 'project+pigs',
+            'partner_id': self.partner_raoul_id,
+        }, {'mail_create_nolog': True})
+
+        # Already-existing tasks in Pigs
+        self.task_1_id = self.project_task.create(cr, uid, {
+            'name': 'Pigs UserTask',
+            'user_id': self.user_projectuser_id,
+            'project_id': self.project_pigs_id,
+        }, {'mail_create_nolog': True})
+        self.task_2_id = self.project_task.create(cr, uid, {
+            'name': 'Pigs ManagerTask',
+            'user_id': self.user_projectmanager_id,
+            'project_id': self.project_pigs_id,
+        }, {'mail_create_nolog': True})
diff --git a/addons/project/tests/test_project_flow.py b/addons/project/tests/test_project_flow.py
new file mode 100644
index 00000000000..a037c92d2ae
--- /dev/null
+++ b/addons/project/tests/test_project_flow.py
@@ -0,0 +1,163 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    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.addons.project.tests.test_project_base import TestProjectBase
+from openerp.osv.orm import except_orm
+from openerp.tools import mute_logger
+
+
+EMAIL_TPL = """Return-Path: <whatever-2a840@postmaster.twitter.com>
+X-Original-To: {email_to}
+Delivered-To: {email_to}
+To: {email_to}
+Received: by mail1.openerp.com (Postfix, from userid 10002)
+    id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST)
+Message-ID: {msg_id}
+Date: Tue, 29 Nov 2011 12:43:21 +0530
+From: {email_from}
+MIME-Version: 1.0
+Subject: {subject}
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+
+Hello,
+
+This email should create a new entry in your module. Please check that it
+effectively works.
+
+Thanks,
+
+--
+Raoul Boitempoils
+Integrator at Agrolait"""
+
+
+class TestProjectFlow(TestProjectBase):
+
+    @mute_logger('openerp.addons.base.ir.ir_model', 'openerp.osv.orm')
+    def test_00_project_process(self):
+        """ Testing project management """
+        cr, uid, user_projectuser_id, user_projectmanager_id, project_pigs_id = self.cr, self.uid, self.user_projectuser_id, self.user_projectmanager_id, self.project_pigs_id
+
+        # ProjectUser: set project as template -> raise
+        self.assertRaises(except_orm, self.project_project.set_template, cr, user_projectuser_id, [project_pigs_id])
+
+        # Other tests are done using a ProjectManager
+        project = self.project_project.browse(cr, user_projectmanager_id, project_pigs_id)
+        self.assertNotEqual(project.state, 'template', 'project: incorrect state, should not be a template')
+
+        # Set test project as template
+        self.project_project.set_template(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'template', 'project: set_template: project state should be template')
+        self.assertEqual(len(project.tasks), 0, 'project: set_template: project tasks should have been set inactive')
+
+        # Duplicate template
+        new_template_act = self.project_project.duplicate_template(cr, user_projectmanager_id, [project_pigs_id])
+        new_project = self.project_project.browse(cr, user_projectmanager_id, new_template_act['res_id'])
+        self.assertEqual(new_project.state, 'open', 'project: incorrect duplicate_template')
+        self.assertEqual(len(new_project.tasks), 2, 'project: duplicating a project template should duplicate its tasks')
+
+        # Convert into real project
+        self.project_project.reset_project(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'open', 'project: resetted project should be in open state')
+        self.assertEqual(len(project.tasks), 2, 'project: reset_project: project tasks should have been set active')
+
+        # Put as pending
+        self.project_project.set_pending(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'pending', 'project: should be in pending state')
+
+        # Re-open
+        self.project_project.set_open(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'open', 'project: reopened project should be in open state')
+
+        # Close project
+        self.project_project.set_done(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+        self.assertEqual(project.state, 'close', 'project: closed project should be in close state')
+
+        # Re-open
+        self.project_project.set_open(cr, user_projectmanager_id, [project_pigs_id])
+        project.refresh()
+
+        # Re-convert into a template and schedule tasks
+        self.project_project.set_template(cr, user_projectmanager_id, [project_pigs_id])
+        self.project_project.schedule_tasks(cr, user_projectmanager_id, [project_pigs_id])
+
+        # Copy the project
+        new_project_id = self.project_project.copy(cr, user_projectmanager_id, project_pigs_id)
+        new_project = self.project_project.browse(cr, user_projectmanager_id, new_project_id)
+        self.assertEqual(len(new_project.tasks), 2, 'project: copied project should have copied task')
+
+        # Cancel the project
+        self.project_project.set_cancel(cr, user_projectmanager_id, [project_pigs_id])
+        self.assertEqual(project.state, 'cancelled', 'project: cancelled project should be in cancel state')
+
+    def test_10_task_process(self):
+        """ Testing task creation and management """
+        cr, uid, user_projectuser_id, user_projectmanager_id, project_pigs_id = self.cr, self.uid, self.user_projectuser_id, self.user_projectmanager_id, self.project_pigs_id
+
+        def format_and_process(template, email_to='project+pigs@mydomain.com, other@gmail.com', subject='Frogs',
+                               email_from='Patrick Ratatouille <patrick.ratatouille@agrolait.com>',
+                               msg_id='<1198923581.41972151344608186760.JavaMail@agrolait.com>'):
+            self.assertEqual(self.project_task.search(cr, uid, [('name', '=', subject)]), [])
+            mail = template.format(email_to=email_to, subject=subject, email_from=email_from, msg_id=msg_id)
+            self.mail_thread.message_process(cr, uid, None, mail)
+            return self.project_task.search(cr, uid, [('name', '=', subject)])
+
+        # Do: incoming mail from an unknown partner on an alias creates a new task 'Frogs'
+        frogs = format_and_process(EMAIL_TPL)
+
+        # Test: one task created by mailgateway administrator
+        self.assertEqual(len(frogs), 1, 'project: message_process: a new project.task should have been created')
+        task = self.project_task.browse(cr, user_projectuser_id, frogs[0])
+        res = self.project_task.perm_read(cr, uid, [task.id], details=False)
+        self.assertEqual(res[0].get('create_uid'), uid,
+                         'project: message_process: task should have been created by uid as alias_user_id is False on the alias')
+        # Test: messages
+        self.assertEqual(len(task.message_ids), 3,
+                         'project: message_process: newly created task should have 2 messages: creation and email')
+        self.assertEqual(task.message_ids[2].subtype_id.name, 'Task Created',
+                         'project: message_process: first message of new task should have Task Created subtype')
+        self.assertEqual(task.message_ids[1].subtype_id.name, 'Task Assigned',
+                         'project: message_process: first message of new task should have Task Created subtype')
+        self.assertEqual(task.message_ids[0].author_id.id, self.email_partner_id,
+                         'project: message_process: second message should be the one from Agrolait (partner failed)')
+        self.assertEqual(task.message_ids[0].subject, 'Frogs',
+                         'project: message_process: second message should be the one from Agrolait (subject failed)')
+        # Test: task content
+        self.assertEqual(task.name, 'Frogs', 'project_task: name should be the email subject')
+        self.assertEqual(task.project_id.id, self.project_pigs_id, 'project_task: incorrect project')
+        self.assertEqual(task.stage_id.sequence, 1, 'project_task: should have a stage with sequence=1')
+
+        # Open the delegation wizard
+        delegate_id = self.project_task_delegate.create(cr, user_projectuser_id, {
+            'user_id': user_projectuser_id,
+            'planned_hours': 12.0,
+            'planned_hours_me': 2.0,
+        }, {'active_id': task.id})
+        self.project_task_delegate.delegate(cr, user_projectuser_id, [delegate_id], {'active_id': task.id})
+
+        # Check delegation details
+        task.refresh()
+        self.assertEqual(task.planned_hours, 2, 'project_task_delegate: planned hours is not correct after delegation')
diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py
index 7a9a734b2bd..24017d9cbe8 100644
--- a/addons/project/wizard/__init__.py
+++ b/addons/project/wizard/__init__.py
@@ -20,7 +20,5 @@
 ##############################################################################
 
 import project_task_delegate
-import project_task_reevaluate
 
 # 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
deleted file mode 100644
index eeb8cccc5d2..00000000000
--- a/addons/project/wizard/project_task_reevaluate.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from lxml import etree
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-class project_task_reevaluate(osv.osv_memory):
-    _name = 'project.task.reevaluate'
-
-    def _get_remaining(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        active_id = context.get('active_id', False)
-        res = False
-        if active_id:
-            res = self.pool.get('project.task').browse(cr, uid, active_id, context=context).remaining_hours
-        return res
-
-    _columns = {
-        'remaining_hours' : fields.float('Remaining Hours', digits=(16,2), help="Put here the remaining hours required to close the task."),
-    }
-
-    _defaults = {
-        'remaining_hours': _get_remaining,
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(project_task_reevaluate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
-        users_pool = self.pool.get('res.users')
-        time_mode = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
-        time_mode_name = time_mode and time_mode.name or 'Hours'
-        if time_mode_name in ['Hours','Hour']:
-            return res
-
-        eview = etree.fromstring(res['arch'])
-
-        def _check_rec(eview):
-            if eview.attrib.get('widget','') == 'float_time':
-                eview.set('widget','float')
-            for child in eview:
-                _check_rec(child)
-            return True
-
-        _check_rec(eview)
-
-        res['arch'] = etree.tostring(eview)
-
-        for field in res['fields']:
-            if 'Hours' in res['fields'][field]['string']:
-                res['fields'][field]['string'] = res['fields'][field]['string'].replace('Hours',time_mode_name)
-        return res
-
-    def compute_hours(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        data = self.browse(cr, uid, ids, context=context)[0]
-        task_id = context.get('active_id')
-        if task_id:
-            task_pool = self.pool.get('project.task')
-            task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
-            if context.get('button_reactivate'):
-                task_pool.do_reopen(cr, uid, [task_id], context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
deleted file mode 100644
index 6dfe58e8cfd..00000000000
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    <record id="view_project_task_reevaluate" model="ir.ui.view">
-            <field name="name">Re-evaluate Task</field>
-            <field name="model">project.task.reevaluate</field>
-            <field name="arch" type="xml">
-                <form string="Reevaluate Task" version="7.0">
-                    <separator string="Reevaluation Task"/>
-                    <group>
-                        <field name="remaining_hours" widget="float_time"/>
-                    </group>
-                    <footer>
-                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_project_task_reevaluate" model="ir.actions.act_window">
-            <field name="name">Re-evaluate Task</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">project.task.reevaluate</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
- </data>
-</openerp>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 4bfd5b783c7..8335ae35c93 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -79,7 +79,6 @@
             <field name="remaining_hours" position="after">
                 <field string="Timeframe" name="timebox_id" invisible=" not context.get('gtd', False)"/>
                 <field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/>
-                <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/>
             </field>
         </field>
     </record>
@@ -103,16 +102,17 @@
         <field name="arch" type="xml">
            <search string="My Tasks">
                 <field name="name" string="My Tasks"/>
-                <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"/>
+                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <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"/>
+                <filter string="No Timebox" 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"/>
                     <filter string="Show Deadlines" context="{'deadline_visible': False}" domain="[]" help="Show only tasks having a deadline" icon="terp-gnome-cpu-frequency-applet+"/>
                 </group>
+                <group expand="0" string="Group By...">
+                    <filter string="Stage" name="group_stage_id" context="{'group_by':'stage_id'}"/>
+                    <filter string="Timebox" name="group_timebox_id" context="{'group_by':'timebox_id'}"/>
+                </group>
             </search>
         </field>
     </record>
diff --git a/addons/project_gtd/static/src/img/icon.png b/addons/project_gtd/static/description/icon.png
similarity index 100%
rename from addons/project_gtd/static/src/img/icon.png
rename to addons/project_gtd/static/description/icon.png
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index 36c64cbc224..b477c12567a 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -49,10 +49,10 @@ 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):
+            if (task.stage_id and task.stage_id.fold) or (task.user_id.id <> uid):
                 close.append(task.id)
             else:
                 up.append(task.id)
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 2c5f311c044..723f362ab4c 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -37,7 +37,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'website': 'http://www.openerp.com',
     'images': ['images/issue_analysis.jpeg','images/project_issue.jpeg'],
     'depends': [
-        'base_status',
         'crm',
         'project',
     ],
@@ -55,7 +54,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'test': [
         'test/subscribe_issue.yml',
         'test/issue_process.yml',
-        'test/cancel_issue.yml',
         'test/issue_demo.yml'
     ],
     'installable': True,
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index d7574042c37..6eb48f5572d 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -6,7 +6,7 @@
             <field name="name">Project Issue Board Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree">
                     <field name="id"/>
                     <field name="create_date"/>
                     <field name="name"/>
@@ -16,7 +16,6 @@
                     <field name="version_id" widget="selection"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -28,7 +27,7 @@
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','not in',('cancel','done')),('user_id','=',uid)]</field>
+            <field name="domain">[('user_id', '=', uid)]</field>
            <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
 
diff --git a/addons/project_issue/doc/changelog.rst b/addons/project_issue/doc/changelog.rst
new file mode 100644
index 00000000000..e74516f1600
--- /dev/null
+++ b/addons/project_issue/doc/changelog.rst
@@ -0,0 +1,13 @@
+.. _changelog:
+
+Changelog
+=========
+
+`trunk (saas-2)`
+----------------
+
+- Stage/state update
+
+  - ``project.issue``: removed inheritance from ``base_stage`` class and removed
+    ``state`` field. Added ``date_last_stage_update`` field holding last stage_id
+    modification. Updated reports.
diff --git a/addons/project_issue/doc/index.rst b/addons/project_issue/doc/index.rst
new file mode 100644
index 00000000000..9e12eef2124
--- /dev/null
+++ b/addons/project_issue/doc/index.rst
@@ -0,0 +1,22 @@
+=====================
+Project Issue DevDoc
+=====================
+
+Project Issue module documentation
+===================================
+
+Documentation topics
+''''''''''''''''''''
+
+.. toctree::
+   :maxdepth: 1
+   
+   stage_status.rst
+
+Changelog
+'''''''''
+
+.. toctree::
+   :maxdepth: 1
+
+   changelog.rst
diff --git a/addons/project_issue/doc/stage_status.rst b/addons/project_issue/doc/stage_status.rst
new file mode 100644
index 00000000000..6afd4508cd9
--- /dev/null
+++ b/addons/project_issue/doc/stage_status.rst
@@ -0,0 +1,54 @@
+.. _stage_status:
+
+Stage and Status
+================
+
+.. versionchanged:: 8.0 saas-2 state/stage cleaning
+
+Stage
++++++
+
+This revision removed the concept of state on project.issue objects. The ``state``
+field has been totally removed and replaced by stages, using ``stage_id``. The
+following models are impacted:
+
+ - ``project.issue`` now use only stages. However a convention still exists about
+   'New' stage. An issue is consdered as ``new`` when it has the following
+   properties:
+
+   - ``stage_id and stage_id.sequence = 1``
+
+ - ``project.task.type`` do not have any ``state`` field anymore. 
+ - ``project.issue.report`` do not have any ``state`` field anymore. 
+
+By default a newly created issue is in a new stage. It means that it will
+fetch the stage having ``sequence = 1``. Stage mangement is done using the
+kanban view or the clikable statusbar. It is not done using buttons anymore.
+
+Stage analysis
+++++++++++++++
+
+Stage analysis can be performed using the newly introduced ``date_last_stage_update``
+datetime field. This field is updated everytime ``stage_id`` is updated.
+
+``project.issue.report`` model also uses the ``date_last_stage_update`` field.
+This allows to group and analyse the time spend in the various stages.
+
+Open / Assignation date
++++++++++++++++++++++++
+
+The ``date_open`` field meaning has been updated. It is now set when the ``user_id``
+(responsible) is set. It is therefore the assignation date.
+
+Subtypes
+++++++++
+
+The following subtypes are triggered on ``project.issue``:
+
+ - ``mt_issue_new``: new tasks. Condition: ``obj.stage_id and obj.stage_id.sequence == 1``
+ - ``mt_issue_stage``: stage changed. Condition: ``obj.stage_id and obj.stage_id.sequence != 1``
+ - ``mt_issue_assigned``: user assigned. condition: ``obj.user_id and obj.user_id.id``
+ - ``mt_issue_blocked``: kanban state blocked. Condition: ``obj.kanban_state == 'blocked'``
+
+Those subtypes are also available on the ``project.project`` model and are used
+for the auto subscription.
diff --git a/addons/project_issue/i18n/bs.po b/addons/project_issue/i18n/bs.po
new file mode 100644
index 00000000000..db49b0c586c
--- /dev/null
+++ b/addons/project_issue/i18n/bs.po
@@ -0,0 +1,984 @@
+# Bosnian 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-08-06 17:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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-08-07 04:46+0000\n"
+"X-Generator: Launchpad (build 16721)\n"
+
+#. module: project_issue
+#: model:project.category,name:project_issue.project_issue_category_03
+msgid "Deadly bug"
+msgstr "Ubojita greška"
+
+#. module: project_issue
+#: help:project.config.settings,fetchmail_issue:0
+msgid ""
+"Allows you to configure your incoming mail server, and create issues from "
+"incoming emails."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_open:0
+msgid "Working Hours to Open the Issue"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,opening_date:0
+msgid "Date of Opening"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,progress:0
+msgid "Progress (%)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,kanban_state:0
+msgid ""
+"A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the "
+"next stage"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: project_issue
+#: help:account.analytic.account,use_issues:0
+msgid "Check this field if this project manages issues"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:479
+#, python-format
+msgid ""
+"You cannot escalate this issue.\n"
+"The relevant Project has not configured the Escalation Project!"
+msgstr ""
+
+#. module: project_issue
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,inactivity_days:0
+msgid "Difference in days between last action and current date"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,days_since_creation:0
+msgid "Days since creation date"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,task_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,task_id:0
+msgid "Task"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,inactivity_days:0
+msgid "Days since last action"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_project
+#: view:project.issue:0
+#: field:project.issue,project_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to report a new issue.\n"
+"          </p><p>\n"
+"            The OpenERP issues tacker allows you to efficiantly manage "
+"things\n"
+"            like internal requests, software development bugs, customer\n"
+"            complaints, project troubles, material breakdowns, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: selection:project.issue.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,description:0
+msgid "Private Note"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,date_closed:0
+msgid "Date of Closing"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_open:0
+msgid "Avg. Working Hours to Open"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,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_issue
+#: help:project.project,project_escalation_id:0
+msgid ""
+"If any issue is escalated from the current Project, it will be listed under "
+"the project selected here."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.action_project_issue_report
+msgid ""
+"This report on the project issues allows you to analyse the quality of your "
+"support or after-sales services. You can track the issues per age. You can "
+"analyse the time required to open or close an issue, the number of email to "
+"exchange and the time spent on average by issues."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Edit..."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Responsible"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Statistics"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:366
+#, python-format
+msgid "Project issue <b>converted</b> to task."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,priority:0
+#: view:project.issue.report:0
+#: field:project.issue.report,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,version_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,version_id:0
+msgid "Version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "New"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
+msgid "Issue Categories"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,channel_id:0
+#: field:project.issue.report,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:388
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Unassigned Issues"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,create_date:0
+#: view:project.issue.report:0
+#: field:project.issue.report,creation_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
+msgid "Versions"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "To Do Issues"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_version
+msgid "project.issue.version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.config.settings,fetchmail_issue:0
+msgid "Create issues from an incoming email account "
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+msgid "Done"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
+msgid "Categories"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,stage_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+#: view:project.issue.report:0
+msgid "Issues Analysis"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:516
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
+msgid "My Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,partner_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Delete"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:371
+#, python-format
+msgid "Tasks"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,nbr:0
+msgid "# of Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Issue Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: model:project.category,name:project_issue.project_issue_category_01
+msgid "Little problem"
+msgstr ""
+
+#. module: project_issue
+#: view:project.project:0
+msgid "creates"
+msgstr ""
+
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.feature_request_categ
+msgid "Feature Requests"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Project:"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Open Features"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_next:0
+msgid "Next Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Number of Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,channel_id:0
+msgid "Communication channel."
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,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: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_closed:0
+#: selection:project.issue.report,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,state:0
+#: view:project.issue.report:0
+#: selection:project.issue.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,state:0
+#: field:project.issue.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "#Project Issues"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,kanban_state:0
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,issue_count:0
+msgid "unknown"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Category:"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "New Issues"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,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_issue
+#: field:project.issue,active:0
+#: field:project.issue.version,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: project_issue
+#: code:addons/project_issue/project_issue.py:479
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+msgid "Search"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,days_since_creation:0
+msgid "Difference in days between creation date and current date"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Tree"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date:0
+msgid "Date"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,user_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,user_id:0
+msgid "Assigned to"
+msgstr ""
+
+#. module: project_issue
+#: view:project.config.settings:0
+msgid "Configure"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Current Features"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.version:0
+msgid "Issue Version"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.version,name:0
+msgid "Version Number"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Cancel"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: project_issue
+#: field:account.analytic.account,use_issues:0
+#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
+#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:project_issue.menu_project_confi
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_track
+#: view:project.issue:0
+#: view:project.project:0
+msgid "Issues"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+msgid "To Do"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue
+#: view:project.issue.report:0
+msgid "Project Issue"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,section_id:0
+msgid "Sale Team"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: view:project.issue.report:0
+#: field:project.issue.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: field:project.issue,name:0
+#: view:project.project:0
+msgid "Issue"
+msgstr ""
+
+#. module: project_issue
+#: model:project.category,name:project_issue.project_issue_category_02
+msgid "PBCK"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature Tracker Search"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_config_settings
+msgid "project.config.settings"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,email:0
+msgid "# Emails"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "Feature description"
+msgstr ""
+
+#. module: project_issue
+#: field:project.project,project_escalation_id:0
+msgid "Project Escalation"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_version_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to add a new version.\n"
+"              </p><p>\n"
+"                Define here the different versions of your products on "
+"which\n"
+"                you can work on issues.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                             Define "
+"Responsible user and Email account for mail gateway."
+msgstr ""
+
+#. module: project_issue
+#: view:board.board:0
+msgid "My Issues"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_open:0
+msgid "Number of Days to open the project issue."
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "⇒ Escalate"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+msgid "References"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,working_hours_close:0
+msgid "Working Hours to Close the Issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,id:0
+msgid "ID"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
+#. module: project_issue
+#: model:ir.model,name:project_issue.model_project_issue_report
+msgid "project.issue.report"
+msgstr ""
+
+#. module: project_issue
+#: help:project.issue.report,delay_close:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue.report,working_hours_close:0
+msgid "Avg. Working Hours to Close"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: project_issue
+#: selection:project.issue,priority:0
+#: selection:project.issue.report,priority:0
+msgid "High"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue.report:0
+#: field:project.issue.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: project_issue
+#: field:project.issue,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 8bcac4581c3..f23f6b6a286 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -19,19 +19,16 @@
 #
 ##############################################################################
 
-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, orm
-from openerp.tools.translate import _
-import binascii
-import time
-from openerp import tools
-from openerp.tools import html2plaintext
 
-class project_issue_version(osv.osv):
+from openerp import SUPERUSER_ID
+from openerp import tools
+from openerp.addons.crm import crm
+from openerp.osv import fields, osv, orm
+from openerp.tools import html2plaintext
+from openerp.tools.translate import _
+
+class project_issue_version(osv.Model):
     _name = "project.issue.version"
     _order = "name desc"
     _columns = {
@@ -42,37 +39,33 @@ class project_issue_version(osv.osv):
         'active': 1,
     }
 
-class project_issue(base_stage, osv.osv):
+class project_issue(osv.Model):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
 
+    _mail_post_access = 'read'
     _track = {
-        'state': {
-            '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', 'draft', 'done', 'open'],
+            'project_issue.mt_issue_new': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence == 1,
+            'project_issue.mt_issue_stage': lambda self, cr, uid, obj, ctx=None: obj.stage_id and obj.stage_id.sequence != 1,
+        },
+        'user_id': {
+            'project_issue.mt_issue_assigned': lambda self, cr, uid, obj, ctx=None: obj.user_id and obj.user_id.id,
         },
         'kanban_state': {
-            'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj['kanban_state'] == 'blocked',
+            'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
         },
     }
 
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('project_id'):
-                ctx['default_project_id'] = vals['project_id']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
-        # 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_partner(self, cr, uid, context=None):
+        project_id = self._get_default_project_id(cr, uid, context)
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return project.partner_id.id
+        return False
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """
@@ -81,7 +74,7 @@ class project_issue(base_stage, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('state', '=', 'draft')], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('sequence', '=', 1)], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
@@ -215,6 +208,10 @@ class project_issue(base_stage, osv.osv):
         return res
 
     def on_change_project(self, cr, uid, ids, project_id, context=None):
+        if project_id:
+            project = self.pool.get('project.project').browse(cr, uid, project_id, context=context)
+            if project and project.partner_id:
+                return {'value': {'partner_id': project.partner_id.id}}
         return {}
 
     def _get_issue_task(self, cr, uid, ids, context=None):
@@ -247,13 +244,6 @@ class project_issue(base_stage, osv.osv):
         'partner_id': fields.many2one('res.partner', 'Contact', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Private Note'),
-        '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.\
-                      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\'.'),
         'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
                                          track_visibility='onchange',
                                          help="A Issue's kanban state indicates special situations affecting it:\n"
@@ -267,6 +257,7 @@ class project_issue(base_stage, osv.osv):
         # Project Issue fields
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
+        'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
         'categ_ids': fields.many2many('project.category', string='Tags'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
@@ -302,13 +293,12 @@ class project_issue(base_stage, osv.osv):
 
     _defaults = {
         'active': 1,
-        'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
-        'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
-        'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'kanban_state': 'normal',
+        'date_last_stage_update': fields.datetime.now(),
+        'user_id': lambda obj, cr, uid, context: uid,
     }
 
     _group_by_full = {
@@ -361,7 +351,7 @@ class project_issue(base_stage, osv.osv):
             })
             vals = {
                 'task_id': new_task_id,
-                'stage_id': self.stage_find(cr, uid, [bug], bug.project_id.id, [('state', '=', 'pending')], context=context),
+                'stage_id': self.stage_find(cr, uid, [bug], bug.project_id.id, [('sequence', '=', 1)], context=context),
             }
             message = _("Project issue <b>converted</b> to task.")
             self.message_post(cr, uid, [bug.id], body=message, context=context)
@@ -389,19 +379,25 @@ class project_issue(base_stage, osv.osv):
         return super(project_issue, self).copy(cr, uid, id, default=default,
                 context=context)
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if vals.get('project_id') and not context.get('default_project_id'):
+            context['default_project_id'] = vals.get('project_id')
+
+        # 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 write(self, cr, uid, ids, vals, context=None):
-    
-        #Update last action date every time the user changes the stage
+        # stage change: update date_last_stage_update
         if 'stage_id' in vals:
-            vals['date_action_last'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
-            state = self.pool.get('project.task.type').browse(cr, uid, vals['stage_id'], context=context).state
-            for issue in self.browse(cr, uid, ids, context=context):
-                # Change from draft to not draft EXCEPT cancelled: The issue has been opened -> set the opening date
-                if issue.state == 'draft' and state not in ('draft', 'cancelled'):
-                    vals['date_open'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
-                # Change from not done to done: The issue has been closed -> set the closing date
-                if issue.state != 'done' and state == 'done':
-                    vals['date_closed'] = time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            vals['date_last_stage_update'] = fields.datetime.now()
+            if 'kanban_state' not in vals:
+                vals['kanban_state'] = 'normal'
+        # user_id change: update date_start
+        if vals.get('user_id'):
+            vals['date_start'] = fields.datetime.now()
 
         return super(project_issue, self).write(cr, uid, ids, vals, context)
 
@@ -411,13 +407,6 @@ class project_issue(base_stage, osv.osv):
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
         return {'value': {'user_id': task.user_id.id, }}
 
-    def case_reset(self, cr, uid, ids, context=None):
-        """Resets case as draft
-        """
-        res = super(project_issue, self).case_reset(cr, uid, ids, context)
-        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')
@@ -466,11 +455,6 @@ class project_issue(base_stage, osv.osv):
             return stage_ids[0]
         return False
 
-    def case_cancel(self, cr, uid, ids, context=None):
-        """ Cancels case """
-        self.case_set(cr, uid, ids, 'cancelled', {'active': True}, context=context)
-        return True
-
     def case_escalate(self, cr, uid, ids, context=None):
         cases = self.browse(cr, uid, ids)
         for case in cases:
@@ -483,7 +467,6 @@ class project_issue(base_stage, osv.osv):
                     self.pool.get('project.task').write(cr, uid, [case.task_id.id], {'project_id': data['project_id'], 'user_id': False})
             else:
                 raise osv.except_osv(_('Warning!'), _('You cannot escalate this issue.\nThe relevant Project has not configured the Escalation Project!'))
-            self.case_set(cr, uid, ids, 'draft', data, context=context)
         return True
 
     # -------------------------------------------------------
@@ -495,17 +478,6 @@ 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)
         try:
@@ -523,21 +495,19 @@ class project_issue(base_stage, osv.osv):
             through message_process.
             This override updates the document according to the email.
         """
-        if custom_values is None: custom_values = {}
-        if context is None: context = {}
+        if custom_values is None:
+            custom_values = {}
+        if context is None:
+            context = {}
         context['state_to'] = 'draft'
-
-        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
-
         defaults = {
             'name':  msg.get('subject') or _("No Subject"),
-            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'partner_id': msg.get('author_id', False),
             'user_id': False,
         }
-        if  msg.get('priority'):
+        if msg.get('priority'):
             defaults['priority'] = msg.get('priority')
 
         defaults.update(custom_values)
@@ -578,8 +548,8 @@ 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, SUPERUSER_ID, thread_id, {'date_action_last': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)}, context=context)
+        if thread_id and subtype:
+            self.write(cr, SUPERUSER_ID, thread_id, {'date_action_last': fields.datetime.now()}, context=context)
         return res
 
 
@@ -593,7 +563,7 @@ class project(osv.Model):
         res = dict.fromkeys(ids, 0)
         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
         for issue in self.pool.get('project.issue').browse(cr, uid, issue_ids, context):
-            if issue.state not in ('done', 'cancelled'):
+            if issue.stage_id and not issue.stage_id.fold:
                 res[issue.project_id.id] += 1
         return res
 
@@ -653,6 +623,14 @@ class project_project(osv.Model):
         elif vals.get('use_issues') and not vals.get('use_tasks'):
             vals['alias_model'] = 'project.issue'
 
+    def on_change_use_tasks_or_issues(self, cr, uid, ids, use_tasks, use_issues, context=None):
+        values = {}
+        if use_tasks and not use_issues:
+            values['alias_model'] = 'project.task'
+        elif not use_tasks and use_issues:
+            values['alias_model'] = 'project.issues'
+        return {'value': values}
+
     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)
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index 2e43ca69193..25a336d4094 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -35,11 +35,11 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="default" eval="False"/>
             <field name="description">Issue created</field>
         </record>
-        <record id="mt_issue_started" model="mail.message.subtype">
-            <field name="name">Issue Started</field>
+        <record id="mt_issue_assigned" model="mail.message.subtype">
+            <field name="name">Issue Assigned</field>
             <field name="res_model">project.issue</field>
             <field name="default" eval="False"/>
-            <field name="description">Issue started</field>
+            <field name="description">Issue assigned</field>
         </record>
         <record id="mt_issue_blocked" model="mail.message.subtype">
             <field name="name">Issue Blocked</field>
@@ -47,12 +47,6 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="default" eval="False"/>
             <field name="description">Issue blocked</field>
         </record>
-        <record id="mt_issue_closed" model="mail.message.subtype">
-            <field name="name">Issue Closed</field>
-            <field name="res_model">project.issue</field>
-            <field name="default" eval="False"/>
-            <field name="description">Issue closed</field>
-        </record>
         <record id="mt_issue_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.issue</field>
@@ -67,11 +61,11 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="parent_id" eval="ref('mt_issue_new')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_issue_started" model="mail.message.subtype">
-            <field name="name">Issue Started</field>
+        <record id="mt_project_issue_assigned" model="mail.message.subtype">
+            <field name="name">Issue Assigned</field>
             <field name="res_model">project.project</field>
             <field name="default" eval="False"/>
-            <field name="parent_id" eval="ref('mt_issue_started')"/>
+            <field name="parent_id" eval="ref('mt_issue_assigned')"/>
             <field name="relation_field">project_id</field>
         </record>
         <record id="mt_project_issue_blocked" model="mail.message.subtype">
@@ -80,12 +74,6 @@ Access all issues from the top Project menu, and access the issues of a specific
             <field name="parent_id" eval="ref('mt_issue_blocked')"/>
             <field name="relation_field">project_id</field>
         </record>
-        <record id="mt_project_issue_closed" model="mail.message.subtype">
-            <field name="name">Issue Closed</field>
-            <field name="res_model">project.project</field>
-            <field name="parent_id" eval="ref('mt_issue_closed')"/>
-            <field name="relation_field">project_id</field>
-        </record>
         <record id="mt_project_issue_stage" model="mail.message.subtype">
             <field name="name">Issue Stage Changed</field>
             <field name="res_model">project.project</field>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 46caba0021e..1fbea33f3df 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -48,12 +48,6 @@
             <field name="arch" type="xml">
                 <form string="Issue" version="7.0">
                 <header>
-                    <button name="case_close" string="Done" type="object"
-                            states="open" groups="base.group_user"/>
-                    <button name="case_close" string="Done" type="object"
-                            states="draft,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Cancel Issue" type="object"
-                            states="draft,open,pending" groups="base.group_user"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Issue">
@@ -76,7 +70,7 @@
                             <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" class="oe_link"
                                         groups="base.group_user"/>
                             </div>
                         </group>
@@ -106,7 +100,6 @@
                             </group>
                             <group string="Status" groups="base.group_no_one">
                                 <field name="active"/>
-                                <field name="state" string="Status"/>
                             </group>
                         </page>
                     </notebook>
@@ -123,7 +116,7 @@
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True">
                     <field name="message_unread" invisible="1"/>
                     <field name="id"/>
                     <field name="name"/>
@@ -135,7 +128,6 @@
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -149,17 +141,16 @@
                 <search string="Issue Tracker Search">
                     <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)]"/>
+                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id', '=', False)]"/>
+                    <filter string="New" name="draft" domain="[('stage_id.sequence', '=', 1)]"/>
                     <separator/>
-                    <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-"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <field name="user_id"/>
                     <field name="project_id"/>
                     <field name="categ_ids"/>
-                    <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
+                    <field name="stage_id" domain="[]"/>
                     <group expand="0" string="Group By..." >
                         <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'}"/>
@@ -269,7 +260,7 @@
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True">
                     <field name="id"/>
                     <field name="message_unread" invisible="1"/>
                     <field name="name" string="Feature description"/>
@@ -278,27 +269,10 @@
                     <field name="version_id"/>
                     <field name="user_id"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
         </record>
 
-        <record id="view_project_feature_filter" model="ir.ui.view">
-            <field name="name">Project Issue - Feature Tracker Search</field>
-            <field name="model">project.issue</field>
-            <field name="arch" type="xml">
-                <search string="Feature Tracker Search">
-                    <field name="name" string="Feature description"/>
-                    <field name="date"/>
-                    <field name="state" groups="base.group_no_one"/>
-                    <filter icon="terp-check" domain="[('state','in',('open','draft'))]" help="Current Features" name="current_feature"/>
-                    <filter icon="terp-camera_test" domain="[('state','=','open')]" help="Open Features"/>
-                    <field name="user_id"/>
-                    <field name="project_id" string="Project"/>
-                </search>
-            </field>
-        </record>
-
         <record id="act_project_project_2_project_issue_all" model="ir.actions.act_window">
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
@@ -325,7 +299,8 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//div[@name="options_active"]' position='inside'>
-                    <field name="use_issues" class="oe_inline"/>
+                    <field name="use_issues" class="oe_inline"
+                            on_change="on_change_use_tasks_or_issues(use_tasks, use_issues)"/>
                     <label for="use_issues"/>
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
@@ -334,21 +309,12 @@
                 <xpath expr='//page[@name="project_stages"]' position="attributes">
                     <attribute name="attrs">{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}</attribute>
                 </xpath>
+                <xpath expr='//field[@name="use_tasks"]' position="attributes">
+                    <attribute name="attrs">{'on_change': 'on_change_use_tasks_or_issues(use_tasks, use_issues)'}</attribute>
+                </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                 </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>
 
@@ -384,16 +350,33 @@
             </field>
         </record>
 
+        <record id="action_view_issues" model="ir.actions.act_window">
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="name">Issues</field>
+            <field name="view_mode">kanban,tree,form,calendar,graph</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>
+
         <!-- res.partner -->
         <record model="ir.ui.view" id="res_partner_issues_button_view">
             <field name="name">res.partner.issues.button.view</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="priority" eval="10"/>
+            <field name="priority" eval="50"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
-                    <button type="action" string="Issues" attrs="{'invisible': [('customer', '=', False)]}"
-                        name="%(act_project_project_2_project_issue_all)d" context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}" groups="project.group_project_user"/>
+                    <button class="oe_inline" type="action" string="Issues"
+                        attrs="{'invisible': [('customer', '=', False)]}"
+                        name="%(action_view_issues)d"
+                        context="{'search_default_partner_id': active_id, 'default_partner_id': active_id}"
+                        groups="project.group_project_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index 5cca0ff8689..5f59b51f290 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -20,17 +20,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv
 from openerp import tools
 from openerp.addons.crm import crm
 
-AVAILABLE_STATES = [
-    ('draft','Draft'),
-    ('open','Open'),
-    ('cancel', 'Cancelled'),
-    ('done', 'Closed'),
-    ('pending','Pending')
-]
 class project_issue_report(osv.osv):
     _name = "project.issue.report"
     _auto = False
@@ -38,18 +31,13 @@ class project_issue_report(osv.osv):
     _columns = {
         'name': fields.char('Year', size=64, required=False, readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Sale Team', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
-        'month':fields.selection([('01', 'January'), ('02', 'February'), \
-                                  ('03', 'March'), ('04', 'April'),\
-                                  ('05', 'May'), ('06', 'June'), \
-                                  ('07', 'July'), ('08', 'August'),\
-                                  ('09', 'September'), ('10', 'October'),\
-                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'month':fields.selection(fields.date.MONTHS, 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'opening_date': fields.date('Date of Opening', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
         'date_closed': fields.date('Date of Closing', readonly=True),
+        'date_last_stage_update': fields.date('Last Stage Update', readonly=True),
         'stage_id': fields.many2one('project.task.type', 'Stage'),
         'nbr': fields.integer('# of Issues', readonly=True),
         'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True, group_operator="avg"),
@@ -80,7 +68,7 @@ class project_issue_report(osv.osv):
                     to_char(c.create_date, 'YYYY-MM-DD') as day,
                     to_char(c.date_open, 'YYYY-MM-DD') as opening_date,
                     to_char(c.create_date, 'YYYY-MM-DD') as creation_date,
-                    c.state,
+                    date_trunc('day',c.date_last_stage_update) as date_last_stage_update,
                     c.user_id,
                     c.working_hours_open,
                     c.working_hours_close,
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index a885dcd8a7f..f9ca7168841 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -20,7 +20,7 @@
                     <field name="partner_id" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                     <field name="date_closed" invisible="1"/>
-                    <field name="state" invisible="1"/>
+                    <field name="date_last_stage_update" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="nbr" string="#Project Issues" sum="#Number of Project Issues"/>
                     <field name="delay_open" avg="Avg Opening Delay"/>
@@ -36,9 +36,9 @@
             <field name="model">project.issue.report</field>
             <field name="arch" type="xml">
                 <graph orientation="horizontal" string="Project Issue" type="bar">
-                    <field name="state"/>
                     <field name="nbr" operator="+"/>
-                    <field group="True" name="user_id"/>
+                    <field name="user_id" group="True"/>
+                    <field name="stage_id" group="True"/>
                 </graph>
             </field>
         </record>
@@ -49,14 +49,15 @@
             <field name="arch" type="xml">
                 <search string="Search">
                     <field name="creation_date"/>
-                    <filter  icon="terp-camera_test" string="New" domain="[('state','=','draft')]"/>
-                    <filter  icon="terp-check" string="To Do" domain="[('state','=','open')]"/>
-                    <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]"/>
-                    <filter icon="terp-dialog-close" string="Done" domain="[('state','=','done')]"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
                     <field name="partner_id" filter_domain="[('partner_id', 'child_of', self)]"/>
                     <field name="version_id"/>
+                    <field name="stage_id"/>
+                    <filter string="Unassigned" name="unassigned" domain="[('user_id','=',False)]"/>
+                    <filter string="New" name="new" domain="[('stage_id.sequence', '=', 1)]"/>
+                    <filter string="Done" name="done" domain="[('stage_id.fold', '=', True)]"
+                            help="Tasks beloging to a folded stage"/>
                     <group  expand="1" string="Group By...">
                         <filter string="Assigned to" name="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
@@ -70,6 +71,7 @@
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                         <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'name'}" help="Creation Date"/>
+                        <filter string="Last Stage Update" context="{'group_by':'date_last_stage_update'}"/>
                    </group>
                </search>
             </field>
diff --git a/addons/project_issue/static/src/img/icon.png b/addons/project_issue/static/description/icon.png
similarity index 100%
rename from addons/project_issue/static/src/img/icon.png
rename to addons/project_issue/static/description/icon.png
diff --git a/addons/project_issue/test/cancel_issue.yml b/addons/project_issue/test/cancel_issue.yml
deleted file mode 100644
index 76ffa212638..00000000000
--- a/addons/project_issue/test/cancel_issue.yml
+++ /dev/null
@@ -1,60 +0,0 @@
--
-  In order to test process of issue tracking in OpenERP, I cancel the unqualified Issue.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled' 
--
-  I re-open the Issue.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the state of issue after open it. 
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in open state}:
-    - state == 'open' 
--
-  I put the issue in pending state.
--
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check the state of issue after put it in pending state.
--  
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
-    - state == 'pending'
--
-  I cancel the issue is in pending state.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled'
--
-  I close Issue.
--
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--  
-  I check state of Issue after close.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in done state}:
-    - state == 'done'
--
-  I cancel the issue is in done state.
--
-  !python {model: project.issue}: |
-    self.case_cancel(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check the issue is in cancel state.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue is in cancel state}:
-    - state == 'cancelled'
diff --git a/addons/project_issue/test/issue_process.yml b/addons/project_issue/test/issue_process.yml
index afb68a9b6c2..280df50ebea 100644
--- a/addons/project_issue/test/issue_process.yml
+++ b/addons/project_issue/test/issue_process.yml
@@ -1,23 +1,3 @@
--
-  In order to test process of issue tracking in OpenERP, I Open the Issue.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state of Issue after opened it.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
-    - state == 'open'       
-- 
-  Now I put Issue in pending due to need more information.
-- 
-  !python {model: project.issue}: |
-    self.case_pending(cr, uid, [ref("crm_case_buginaccountsmodule0")])
-- 
-  I check state after put in pending.
--  
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
-    - state == 'pending'
 -
   I send mail to get more details. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
@@ -29,29 +9,9 @@
         new_id = self.create(cr, uid, {'email_from': 'support@mycompany.com','email_to': 'Robert_Adersen@yahoo.com', 'subject': 'Regarding error in account module we nees more details'})
         self.send_mail(cr, uid, [new_id], context=ctx)
     except Exception, e:
-        pass  
--
-  After getting sufficient details, I re-open Issue from pending state.
--
-  !python {model: project.issue}: |
-    self.case_open(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I check state of Issue after re-opened.
--
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in open state}:
-    - state == 'open'   
+        pass
 -
   I create Task for Issue.
 -
   !python {model: project.issue}: |
     self.convert_issue_task(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--
-  I close Issue after resolving it
--
-  !python {model: project.issue}: |
-    self.case_close(cr, uid, [ref("crm_case_buginaccountsmodule0")])
--  
-  I Check state of Issue after closed.
-- 
-  !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in done state}:
-    - state == 'done'
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 4b5ad3f0e44..4f553f15cfe 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/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:06+0000\n"
-"PO-Revision-Date: 2012-11-27 14:57+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2013-07-14 03:57+0000\n"
+"Last-Translator: Alan <shuchuan.wu@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:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-15 04:51+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -41,12 +41,12 @@ msgstr "阶段"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Team Planning"
-msgstr ""
+msgstr "项目团队计划"
 
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr "指定的用户"
+msgstr "已分配的用户"
 
 #. module: project_long_term
 #: view:project.phase:0
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e61af0c6c32..e2f47489b4a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -200,7 +200,7 @@
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
                                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
-                                    <field name="state"/>
+                                    <field name="stage_id"/>
                                   </tree>
                              </field>
                         </page>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 2a00088b8f4..82bfab460cb 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -4,9 +4,6 @@ access_project_user_allocation,project.user.allocation,model_project_user_alloca
 access_project_phase_manager,project.phase manager,model_project_phase,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_resource_resource_user,user.user user,resource.model_resource_resource,project.group_project_user,1,0,0,0
-access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1
 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1
 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1
 access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0
-
-
diff --git a/addons/project_long_term/test/task_process.yml b/addons/project_long_term/test/task_process.yml
index a7065de315f..060abcf43f3 100644
--- a/addons/project_long_term/test/task_process.yml
+++ b/addons/project_long_term/test/task_process.yml
@@ -14,6 +14,6 @@
   !python {model: project.project}: |
     prj = self.browse(cr, uid, [ref("project.project_project_1")])[0]
     for task in prj.tasks:
-        if task.state in ('done','cancelled'):
+        if task.stage_id and task.stage_id.fold:
             continue
         assert task.user_id and task.date_start and task.date_end, "Project tasks not scheduled"
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index bb25b4aae24..d5ed55a8d31 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -22,6 +22,23 @@
 from openerp.osv import fields, osv
 from openerp import netsvc
 
+
+class ProjectTaskStageMrp(osv.Model):
+    """ Override project.task.type model to add a 'closed' boolean field allowing
+        to know that tasks in this stage are considered as closed. Indeed since
+        OpenERP 8.0 status is not present on tasks anymore, only stage_id. """
+    _name = 'project.task.type'
+    _inherit = 'project.task.type'
+
+    _columns = {
+        'closed': fields.boolean('Close', help="Tasks in this stage are considered as closed."),
+    }
+
+    _defaults = {
+        'closed': False,
+    }
+
+
 class project_task(osv.osv):
     _name = "project.task"
     _inherit = "project.task"
@@ -30,21 +47,21 @@ class project_task(osv.osv):
         'sale_line_id': fields.related('procurement_id', 'sale_line_id', type='many2one', relation='sale.order.line', store=True, string='Sales Order Line'),
     }
 
-    def _validate_subflows(self, cr, uid, ids):
+    def _validate_subflows(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         for task in self.browse(cr, uid, ids):
             if task.procurement_id:
                 wf_service.trg_write(uid, 'procurement.order', task.procurement_id.id, cr)
 
-    def do_close(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_task, self).do_close(cr, uid, ids, *args, **kwargs)
-        self._validate_subflows(cr, uid, ids)
+    def write(self, cr, uid, ids, values, context=None):
+        """ When closing tasks, validate subflows. """
+        res = super(project_task, self).write(cr, uid, ids, values, context=context)
+        if values.get('stage_id'):
+            stage = self.pool.get('project.task.type').browse(cr, uid, values.get('stage_id'), context=context)
+            if stage.closed:
+                self._validate_subflows(cr, uid, ids, context=context)
         return res
 
-    def do_cancel(self, cr, uid, ids, *args, **kwargs):
-        res = super(project_task, self).do_cancel(cr, uid, ids, *args, **kwargs)
-        self._validate_subflows(cr, uid, ids)
-        return res
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -52,8 +69,9 @@ class product_product(osv.osv):
         'project_id': fields.many2one('project.project', 'Project', ondelete='set null',)
     }
 
+
 class sale_order(osv.osv):
-    _inherit ='sale.order'
+    _inherit = 'sale.order'
 
     def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
         proc_data = super(sale_order, self)._prepare_order_line_procurement(cr,
@@ -66,11 +84,12 @@ class sale_order(osv.osv):
             return {}
         res_sale = {}
         res = super(sale_order, self)._picked_rate(cr, uid, ids, name, arg, context=context)
-        cr.execute('''select sol.order_id as sale_id, t.state as task_state ,
+        cr.execute('''select sol.order_id as sale_id, stage.closed as task_closed ,
                     t.id as task_id, sum(sol.product_uom_qty) as total
                     from project_task as t
                     left join sale_order_line as sol on sol.id = t.sale_line_id
-                    where sol.order_id in %s group by sol.order_id,t.state,t.id ''',(tuple(ids),))
+                    left join project_task_type as stage on stage.id = t.stage_id
+                    where sol.order_id in %s group by sol.order_id,stage.closed,t.id ''',(tuple(ids),))
         sale_task_data = cr.dictfetchall()
 
         if not sale_task_data:
@@ -90,7 +109,7 @@ class sale_order(osv.osv):
 
         for item in sale_task_data:
             res_sale[item['sale_id']]['total_no_task'] += item['total']
-            if item['task_state'] == 'done':
+            if item['task_closed']:
                 res_sale[item['sale_id']]['number_of_done'] += item['total']
 
         for sale in self.browse(cr, uid, ids, context=context):
diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/project_mrp/project_mrp_demo.xml
index 30d4cfba7ef..a840c0166e7 100644
--- a/addons/project_mrp/project_mrp_demo.xml
+++ b/addons/project_mrp/project_mrp_demo.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    
         <!--Resource: sale.order.line for services type product-->
 
         <record id="line_services" model="sale.order.line">
@@ -14,5 +13,8 @@
             <field name="type">make_to_order</field>
         </record>
 
+        <record id="project.project_tt_deployment" model="project.task.type">
+                <field name="closed" eval="True"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index 881ed9b6b29..f724a3c76b6 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -21,12 +21,22 @@
                 </field>
             </field>
         </record>
+        <record id="task_type_edit_mrp_inherit" model="ir.ui.view">
+            <field name="name">project.task.type.mrp.inherit</field>
+            <field name="model">project.task.type</field>
+            <field name="inherit_id" ref="project.task_type_edit"/>
+            <field name="arch" type="xml">
+                <field name="case_default" position="after">
+                    <field name="closed"/>
+                </field>
+            </field>
+        </record>
         <record id="view_project_mrp_inherit_form2" model="ir.ui.view">
             <field name="name">project.mrp.form.view.inherit</field>
             <field name="model">project.task</field>
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
+                <field name="company_id" position="before">
                     <field name="sale_line_id" string="Order Line"/>
                 </field>
             </field>
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index f4b4a28db46..8a6dc811d9a 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -33,13 +33,13 @@ class procurement_order(osv.osv):
     def action_check_finished(self, cr, uid, ids):
         res = super(procurement_order, self).action_check_finished(cr, uid, ids)
         return res and self.check_task_done(cr, uid, ids)
-    
+
     def check_task_done(self, cr, uid, ids, context=None):
         """ Checks if task is done or not.
         @return: True or False.
         """
         for p in self.browse(cr, uid, ids, context=context):
-            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')):
+            if (p.product_id.type == 'service') and (p.procure_method == 'make_to_order') and p.task_id and (p.task_id.stage_id and not p.task_id.stage_id.closed):
                 return False
         return True
 
diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
index 967461ca30a..b16cce7590d 100644
--- a/addons/project_mrp/test/project_task_procurement.yml
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -36,7 +36,7 @@
   !python {model: project.task}: |
     task_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
     assert task_ids, "Task is not generated for Service Order Line."
-    self.do_close(cr, uid, task_ids, context=context)
+    self.write(cr, uid, task_ids, {'stage_id': ref('project.project_tt_deployment')}, context=context)
 -
   I check procurement of Service Order Line after closed task.
 -
@@ -44,4 +44,4 @@
     procurement_ids = self.search(cr, uid, [('sale_line_id', '=', ref('line_services'))])
     assert procurement_ids, "Procurement is not generated for Service Order Line."
     procurement = self.browse(cr, uid, procurement_ids[0], context=context)
-    assert procurement.state == 'done' , "Procurement should be closed."
+    assert procurement.state == 'done' , "Procurement should be closed."
\ No newline at end of file
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index ffee600f5a7..767cb4893b5 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -79,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
@@ -286,7 +286,7 @@ 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
 
 
diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 3efd133ffb6..7d7566bdd0c 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -66,16 +66,7 @@
     planned_hours: 20.0
     project_id: project_project_timesheetmanagement0
     remaining_hours: 20.0
-    state: draft
     user_id: res_users_hrmanager0
--
-  Open the task
--
-  !python {model: project.task}: |
-    self.do_open(cr, uid, [ref("project_task_getalltimesheetrecords0")], {"lang":
-      "en_US", "active_ids": [ref("project_project_timesheetmanagement0")], "tz":
-      False, "active_model": "project.project", "department_id": False, "project_id":
-      False, "active_id": ref("project_project_timesheetmanagement0"), })
 -
   Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager
 -
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 5e5af0815e3..52c5d798eeb 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -48,12 +48,10 @@ class res_partner(osv.osv):
 
     _columns = {
         'property_product_pricelist_purchase': fields.property(
-          'product.pricelist',
           type='many2one', 
           relation='product.pricelist', 
           domain=[('type','=','purchase')],
           string="Purchase Pricelist", 
-          view_load=True,
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
         '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')
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 7b03861759a..25aeb3d8119 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -8,7 +8,7 @@
             <field name="priority">36</field>
             <field name="arch" type="xml">
                 <field name="property_product_pricelist" position="after">
-                    <field name="property_product_pricelist_purchase" />
+                    <field name="property_product_pricelist_purchase" groups="product.group_purchase_pricelist"/>
                 </field>
             </field>
         </record>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 849e558563a..94a6f9fe7ab 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -162,9 +162,9 @@ class purchase_order(osv.osv):
     ]
     _track = {
         'state': {
-            'purchase.mt_rfq_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'confirmed',
-            'purchase.mt_rfq_approved': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'approved',
-            'purchase.mt_rfq_done': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
+            'purchase.mt_rfq_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state == 'confirmed',
+            'purchase.mt_rfq_approved': lambda self, cr, uid, obj, ctx=None: obj.state == 'approved',
+            'purchase.mt_rfq_done': lambda self, cr, uid, obj, ctx=None: obj.state == 'done',
         },
     }
     _columns = {
@@ -186,7 +186,7 @@ class purchase_order(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse'),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
-        'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency",readonly=True, required=True),
+        'currency_id': fields.many2one('res.currency','Currency', readonly=True, required=True,states={'draft': [('readonly', False)],'sent': [('readonly', False)]}),
         'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
@@ -199,9 +199,9 @@ class purchase_order(osv.osv):
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
             readonly=True, states={'draft':[('readonly',False)], 'sent':[('readonly',False)]},
-            help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
+            help="Based on Purchase Order lines: place individual lines in 'Invoice Control / On Purchase Order lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
-                "Bases on incoming shipments: let you create an invoice when receptions are validated."
+                "Based on incoming shipments: let you create an invoice when receptions are validated."
         ),
         'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, string='Expected Date', type='date', select=True, help="This is computed as the minimum scheduled date of all purchase order lines' products.",
             store = {
@@ -237,6 +237,7 @@ class purchase_order(osv.osv):
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
         'journal_id': _get_journal,
+        'currency_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
     }
     _sql_constraints = [
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
@@ -467,6 +468,20 @@ class purchase_order(osv.osv):
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
         return True
 
+    def _choose_account_from_po_line(self, cr, uid, po_line, context=None):
+        fiscal_obj = self.pool.get('account.fiscal.position')
+        property_obj = self.pool.get('ir.property')
+        if po_line.product_id:
+            acc_id = po_line.product_id.property_account_expense.id
+            if not acc_id:
+                acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
+            if not acc_id:
+                raise osv.except_osv(_('Error!'), _('Define expense account for this company: "%s" (id:%d).') % (po_line.product_id.name, po_line.product_id.id,))
+        else:
+            acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category').id
+        fpos = po_line.order_id.fiscal_position or False
+        return fiscal_obj.map_account(cr, uid, fpos, acc_id)
+
     def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
         """Collects require data from purchase order line that is used to create invoice line
         for that purchase order line
@@ -484,6 +499,7 @@ class purchase_order(osv.osv):
             'uos_id': order_line.product_uom.id or False,
             'invoice_line_tax_id': [(6, 0, [x.id for x in order_line.taxes_id])],
             'account_analytic_id': order_line.account_analytic_id.id or False,
+            'purchase_line_id': order_line.id,
         }
 
     def action_cancel_draft(self, cr, uid, ids, context=None):
@@ -507,8 +523,6 @@ class purchase_order(osv.osv):
         journal_obj = self.pool.get('account.journal')
         inv_obj = self.pool.get('account.invoice')
         inv_line_obj = self.pool.get('account.invoice.line')
-        fiscal_obj = self.pool.get('account.fiscal.position')
-        property_obj = self.pool.get('ir.property')
 
         for order in self.browse(cr, uid, ids, context=context):
             pay_acc_id = order.partner_id.property_account_payable.id
@@ -520,17 +534,7 @@ class purchase_order(osv.osv):
             # generate invoice line correspond to PO line and link that to created invoice (inv_id) and PO line
             inv_lines = []
             for po_line in order.order_line:
-                if po_line.product_id:
-                    acc_id = po_line.product_id.property_account_expense.id
-                    if not acc_id:
-                        acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
-                    if not acc_id:
-                        raise osv.except_osv(_('Error!'), _('Define expense account for this company: "%s" (id:%d).') % (po_line.product_id.name, po_line.product_id.id,))
-                else:
-                    acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category').id
-                fpos = order.fiscal_position or False
-                acc_id = fiscal_obj.map_account(cr, uid, fpos, acc_id)
-
+                acc_id = self._choose_account_from_po_line(cr, uid, po_line, context=context)
                 inv_line_data = self._prepare_inv_line(cr, uid, acc_id, po_line, context=context)
                 inv_line_id = inv_line_obj.create(cr, uid, inv_line_data, context=context)
                 inv_lines.append(inv_line_id)
@@ -544,7 +548,7 @@ class purchase_order(osv.osv):
                 'account_id': pay_acc_id,
                 'type': 'in_invoice',
                 'partner_id': order.partner_id.id,
-                'currency_id': order.pricelist_id.currency_id.id,
+                'currency_id': order.currency_id.id,
                 'journal_id': len(journal_ids) and journal_ids[0] or False,
                 'invoice_line': [(6, 0, inv_lines)],
                 'origin': order.name,
@@ -632,6 +636,7 @@ class purchase_order(osv.osv):
         }
 
     def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None):
+        ''' prepare the stock move data from the PO line '''
         return {
             'name': order_line.name or '',
             'product_id': order_line.product_id.id,
@@ -868,7 +873,7 @@ class purchase_order_line(osv.osv):
         'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner", store=True),
-        'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date")
+        'date_order': fields.related('order_id','date_order',string='Order Date',readonly=True,type="date"),
 
     }
     _defaults = {
@@ -1245,5 +1250,13 @@ class account_invoice(osv.Model):
             purchase_order_obj.message_post(cr, uid, po_ids, body=_("Invoice paid"), context=context)
         return res
 
+class account_invoice_line(osv.Model):
+    """ Override account_invoice_line to add the link to the purchase order line it is related to"""
+    _inherit = 'account.invoice.line'
+    _columns = {
+        'purchase_line_id': fields.many2one('purchase.order.line',
+            'Purchase Order Line', ondelete='set null', select=True,
+            readonly=True),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4432d2b3200..dffe1ed54ff 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -174,8 +174,8 @@
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
                     <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
-                    <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
-                    <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel Order"/>
+                    <button name="action_cancel_draft" states="cancel,confirmed" string="Set to Draft" type="object" />
+                    <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
                 </header>
                 <sheet>
@@ -191,7 +191,7 @@
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" domain="[('supplier','=',True)]"/>
                             <field name="partner_ref"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist" on_change="onchange_pricelist(pricelist_id, context)"/>
-                            <field name="currency_id" invisible='1'/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                             <field name="journal_id" invisible='1'/>
                         </group>
                         <group>
@@ -292,7 +292,7 @@
                     <field name="name" string="Reference"/>
                     <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
-                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
+                    <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','in',('draft','sent'))]" help="Purchase orders that haven't yet been confirmed"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
                     <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/>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index b7b4776d635..cfc97a75aa4 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -95,7 +95,7 @@
     <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">
+    <blockTable colWidths="349.0,90.0,92.0" repeatRows="1" style="Table_Product_Header_Title">
       <tr>
         <td>
           <para style="terp_tblheader_Details"><b>Description</b></para>
@@ -110,7 +110,7 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
-      <blockTable colWidths="371.0,98.0,61.0" style="Table_Product_Line">
+      <blockTable colWidths="349.0,89.0,49.0,43.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
@@ -119,10 +119,10 @@
             <para style="terp_default_Centre_9">[[ formatLang(order_line.date_planned, date = True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">
-                [[ formatLang(order_line.product_qty )]]
-                <i>[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</i>
-            </para>
+            <para style="terp_default_Right_9">[[ formatLang(order_line.product_qty )]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
           </td>
         </tr>
       </blockTable>
diff --git a/addons/purchase/static/src/img/icon.png b/addons/purchase/static/description/icon.png
similarity index 100%
rename from addons/purchase/static/src/img/icon.png
rename to addons/purchase/static/description/icon.png
diff --git a/addons/purchase/html/index.html b/addons/purchase/static/description/index.html
similarity index 97%
rename from addons/purchase/html/index.html
rename to addons/purchase/static/description/index.html
index 67b122ac557..ecf9028ce33 100644
--- a/addons/purchase/html/index.html
+++ b/addons/purchase/static/description/index.html
@@ -17,7 +17,7 @@
 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>
+                <a href="http://www.openerp.com/start?app=purchase" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/purchase/html/purchase_compose.png b/addons/purchase/static/description/purchase_compose.png
similarity index 100%
rename from addons/purchase/html/purchase_compose.png
rename to addons/purchase/static/description/purchase_compose.png
diff --git a/addons/purchase/html/purchase_dashboard.png b/addons/purchase/static/description/purchase_dashboard.png
similarity index 100%
rename from addons/purchase/html/purchase_dashboard.png
rename to addons/purchase/static/description/purchase_dashboard.png
diff --git a/addons/purchase/html/purchase_import.png b/addons/purchase/static/description/purchase_import.png
similarity index 100%
rename from addons/purchase/html/purchase_import.png
rename to addons/purchase/static/description/purchase_import.png
diff --git a/addons/purchase/html/purchase_incoming.png b/addons/purchase/static/description/purchase_incoming.png
similarity index 100%
rename from addons/purchase/html/purchase_incoming.png
rename to addons/purchase/static/description/purchase_incoming.png
diff --git a/addons/purchase/html/purchase_po.png b/addons/purchase/static/description/purchase_po.png
similarity index 100%
rename from addons/purchase/html/purchase_po.png
rename to addons/purchase/static/description/purchase_po.png
diff --git a/addons/purchase/html/purchase_procurement.png b/addons/purchase/static/description/purchase_procurement.png
similarity index 100%
rename from addons/purchase/html/purchase_procurement.png
rename to addons/purchase/static/description/purchase_procurement.png
diff --git a/addons/purchase/html/purchase_product.png b/addons/purchase/static/description/purchase_product.png
similarity index 100%
rename from addons/purchase/html/purchase_product.png
rename to addons/purchase/static/description/purchase_product.png
diff --git a/addons/purchase/html/purchase_product_form.png b/addons/purchase/static/description/purchase_product_form.png
similarity index 100%
rename from addons/purchase/html/purchase_product_form.png
rename to addons/purchase/static/description/purchase_product_form.png
diff --git a/addons/purchase/html/purchase_tender.png b/addons/purchase/static/description/purchase_tender.png
similarity index 100%
rename from addons/purchase/html/purchase_tender.png
rename to addons/purchase/static/description/purchase_tender.png
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index e64c12a2359..be4169c4624 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -70,7 +70,7 @@ class stock_picking(osv.osv):
 
     def get_currency_id(self, cursor, user, picking):
         if picking.purchase_id:
-            return picking.purchase_id.pricelist_id.currency_id.id
+            return picking.purchase_id.currency_id.id
         else:
             return super(stock_picking, self).get_currency_id(cursor, user, picking)
 
@@ -129,7 +129,7 @@ class stock_partial_picking(osv.osv_memory):
     def _product_cost_for_average_update(self, cr, uid, move):
         if move.picking_id.purchase_id:
             return {'cost': move.purchase_line_id.price_unit,
-                    'currency': move.picking_id.purchase_id.pricelist_id.currency_id.id}
+                    'currency': move.picking_id.purchase_id.currency_id.id}
         return super(stock_partial_picking, self)._product_cost_for_average_update(cr, uid, move)
 
 # Redefinition of the new field in order to update the model stock.picking.in in the orm
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 14d1e313e7f..0ba48a63512 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -65,7 +65,9 @@
             <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>
             <field name="search_view_id" ref="stock.view_picking_in_search"/>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
+                Click to create a new incoming shipment.
+              </p><p> 
                 Here you can track all the product receptions of purchase
                 orders where the invoicing is "Based on Incoming Shipments",
                 and for which you have not received a supplier invoice yet.
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index f97d82a8456..33df515164b 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -48,12 +48,11 @@ class purchase_line_invoice(osv.osv_memory):
         if record_ids:
             res = False
             invoices = {}
-            invoice_obj=self.pool.get('account.invoice')
-            purchase_line_obj=self.pool.get('purchase.order.line')
-            property_obj=self.pool.get('ir.property')
-            account_fiscal_obj=self.pool.get('account.fiscal.position')
-            invoice_line_obj=self.pool.get('account.invoice.line')
-            account_jrnl_obj=self.pool.get('account.journal')
+            invoice_obj = self.pool.get('account.invoice')
+            purchase_obj = self.pool.get('purchase.order')
+            purchase_line_obj = self.pool.get('purchase.order.line')
+            invoice_line_obj = self.pool.get('account.invoice.line')
+            account_jrnl_obj = self.pool.get('account.journal')
 
             def multiple_order_invoice_notes(orders):
                 notes = ""
@@ -83,7 +82,7 @@ class purchase_line_invoice(osv.osv_memory):
                     'account_id': a,
                     'partner_id': partner.id,
                     'invoice_line': [(6,0,lines_ids)],
-                    'currency_id' : orders[0].pricelist_id.currency_id.id,
+                    'currency_id' : orders[0].currency_id.id,
                     'comment': multiple_order_invoice_notes(orders),
                     'payment_term': orders[0].payment_term_id.id,
                     'fiscal_position': partner.property_account_position.id
@@ -93,35 +92,14 @@ class purchase_line_invoice(osv.osv_memory):
                     order.write({'invoice_ids': [(4, inv_id)]})
                 return inv_id
 
-            for line in purchase_line_obj.browse(cr,uid,record_ids):
-                if (not line.invoiced) and (line.state not in ('draft','cancel')):
+            for line in purchase_line_obj.browse(cr, uid, record_ids, context=context):
+                if (not line.invoiced) and (line.state not in ('draft', 'cancel')):
                     if not line.partner_id.id in invoices:
                         invoices[line.partner_id.id] = []
-                    if line.product_id:
-                        a = line.product_id.property_account_expense.id
-                        if not a:
-                            a = line.product_id.categ_id.property_account_expense_categ.id
-                        if not a:
-                            raise osv.except_osv(_('Error!'),
-                                    _('Define expense account for this product: "%s" (id:%d).') % \
-                                            (line.product_id.name, line.product_id.id,))
-                    else:
-                        a = property_obj.get(cr, uid,
-                                'property_account_expense_categ', 'product.category',
-                                context=context).id
-                    fpos = line.order_id.fiscal_position or False
-                    a = account_fiscal_obj.map_account(cr, uid, fpos, a)
-                    inv_id = invoice_line_obj.create(cr, uid, {
-                        'name': line.name,
-                        'origin': line.order_id.name,
-                        'account_id': a,
-                        'price_unit': line.price_unit,
-                        'quantity': line.product_qty,
-                        'uos_id': line.product_uom.id,
-                        'product_id': line.product_id.id or False,
-                        'invoice_line_tax_id': [(6, 0, [x.id for x in line.taxes_id])],
-                        'account_analytic_id': line.account_analytic_id and line.account_analytic_id.id or False,
-                    })
+                    acc_id = purchase_obj._choose_account_from_po_line(cr, uid, line, context=context)
+                    inv_line_data = purchase_obj._prepare_inv_line(cr, uid, acc_id, line, context=context)
+                    inv_line_data.update({'origin': line.order_id.name})
+                    inv_id = invoice_line_obj.create(cr, uid, inv_line_data, context=context)
                     purchase_line_obj.write(cr, uid, [line.id], {'invoiced': True, 'invoice_lines': [(4, inv_id)]})
                     invoices[line.partner_id.id].append((line,inv_id))
 
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index c5d32136a7a..df73887cc42 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -37,7 +37,7 @@ class purchase_requisition(osv.osv):
         'date_start': fields.datetime('Requisition Date'),
         'date_end': fields.datetime('Requisition Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive):  On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple):  It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
+        'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nMultiple Requisitions: It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
         'description': fields.text('Description'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index f4035a951de..9440743057a 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -62,8 +62,9 @@ This module requires the ``wkthtmltopdf`` library to render HTML documents as
 PDF. Version 0.9.9 or later is necessary, and can be found at
 http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).
 
-After installing the library on the OpenERP Server machine, you need to set the
-path to the ``wkthtmltopdf`` executable file on each Company.
+After installing the library on the OpenERP Server machine, you may need to set
+the path to the ``wkthtmltopdf`` executable file in a system parameter named
+``webkit_path`` in Settings -> Customization -> Parameters -> System Parameters
 
 If you are experiencing missing header/footer problems on Linux, be sure to
 install a 'static' version of the library. The default ``wkhtmltopdf`` on
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index cea2b4e8329..5a914cfbcf0 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -37,10 +37,10 @@ from webkit_report import WebKitParser
 class ir_actions_report_xml(orm.Model):
     _inherit = 'ir.actions.report.xml'
     _columns = {
-        'webkit_header': fields.property('ir.header_webkit',
+        'webkit_header': fields.property(
             type='many2one', relation='ir.header_webkit',
             string='Webkit Header', help="The header linked to the report",
-            view_load=True, required=True),
+            required=True),
         'webkit_debug': fields.boolean('Webkit debug',
             help="Enable the webkit engine debugger"),
         'report_webkit_data': fields.text('Webkit Template',
diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml
index 1709b360c1d..37260628396 100644
--- a/addons/report_webkit/ir_report_view.xml
+++ b/addons/report_webkit/ir_report_view.xml
@@ -11,8 +11,9 @@
                             <field name="webkit_header"/>
                             <field name="webkit_debug"/>
                             <field name="precise_mode"/>
-                            <separator string="Webkit Template (used if Report File is not found)" colspan="4"/>
-                            <field name="report_webkit_data" colspan="4" nolabel="1"/>
+                        </group>
+                        <group string="Webkit Template (used if Report File is not found)">
+                            <field name="report_webkit_data" nolabel="1"/>
                         </group>
                     </page>
                 </xpath>
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 5e65afaae25..1a642463df9 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -173,7 +173,7 @@ class WebKitParser(report_sxw):
                                  ),
                                 'w'
                             )
-            head_file.write(header)
+            head_file.write(header.encode('utf-8'))
             head_file.close()
             file_to_del.append(head_file.name)
             command.extend(['--header-html', head_file.name])
@@ -184,7 +184,7 @@ class WebKitParser(report_sxw):
                                  ),
                                 'w'
                             )
-            foot_file.write(footer)
+            foot_file.write(footer.encode('utf-8'))
             foot_file.close()
             file_to_del.append(foot_file.name)
             command.extend(['--footer-html', foot_file.name])
@@ -205,7 +205,7 @@ class WebKitParser(report_sxw):
         for html in html_list :
             html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
             count += 1
-            html_file.write(html)
+            html_file.write(html.encode('utf-8'))
             html_file.close()
             file_to_del.append(html_file.name)
             command.append(html_file.name)
@@ -242,8 +242,13 @@ class WebKitParser(report_sxw):
     def translate_call(self, src):
         """Translate String."""
         ir_translation = self.pool['ir.translation']
+        name = self.tmpl and 'addons/' + self.tmpl or None
         res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid,
-                                         None, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src)
+                                         name, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src)
+        if res == src:
+            # no translation defined, fallback on None (backward compatibility)
+            res = ir_translation._get_source(self.parser_instance.cr, self.parser_instance.uid,
+                                             None, 'report', self.parser_instance.localcontext.get('lang', 'en_US'), src)
         if not res :
             return src
         return res
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 58f7789dc07..3c9f83905a9 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -90,7 +90,11 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_resource_calendar_search"/>
-            <field name="help">Define working hours and time table that could be scheduled to your project members</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Define working hours and time table that could be scheduled to your project members
+              </p>
+            </field>
         </record>
 
         <record id="view_resource_calendar_attendance_tree" model="ir.ui.view">
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index 0e90d3aae1d..912ef4fe2d1 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.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-11 08:34+0000\n"
+"PO-Revision-Date: 2013-07-09 07:56+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-16 05:22+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-10 05:26+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
 
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
@@ -129,7 +129,7 @@ msgid "March"
 msgstr "Március"
 
 #. module: sale
-#: code:addons/sale/sale.py:567
+#: code:addons/sale/sale.py:565
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
 msgstr "Először vonja vissza a megrendelés összes számla mellékletét."
@@ -173,7 +173,7 @@ msgstr "Árajánlat megerősítve"
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr "Számlázási hiba"
+msgstr "Számlázási kivétel"
 
 #. module: sale
 #: view:sale.order:0
@@ -183,7 +183,7 @@ msgstr "Árajánlat "
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr "Árajánlat sablon"
+msgstr "Árajánlat tervezet"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -205,7 +205,7 @@ msgstr "Engedélyezi a köteg számlázást a megrendeléseken a naplók alapjá
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Részösszeg"
+msgstr "Nettó érték"
 
 #. module: sale
 #: view:sale.report:0
@@ -259,12 +259,12 @@ msgstr "Lehetővé teszi a megrendelés soraihoz árengedmény alkalmazását"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines that are in 'done' state"
-msgstr "Megrendelés sorai melyek 'elvégezve' állapotúak"
+msgstr "'Elvégzett' állapotú megrendelési sorok"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "Megendelésre"
+msgstr "megrendelésre"
 
 #. module: sale
 #: field:sale.order,message_ids:0
@@ -285,7 +285,7 @@ msgstr "Adók"
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Nettó érték"
+msgstr "Nettó összeg"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
@@ -294,9 +294,9 @@ msgstr "Projekt"
 
 #. module: sale
 #: code:addons/sale/sale.py:185
-#: code:addons/sale/sale.py:368
-#: code:addons/sale/sale.py:509
-#: code:addons/sale/sale.py:600
+#: code:addons/sale/sale.py:363
+#: code:addons/sale/sale.py:504
+#: code:addons/sale/sale.py:598
 #: code:addons/sale/sale.py:763
 #: code:addons/sale/sale.py:780
 #, python-format
@@ -306,7 +306,7 @@ msgstr "Hiba!"
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
-msgstr "Nettó ár:"
+msgstr "Nettó érték :"
 
 #. module: sale
 #: help:sale.order.line,type:0
@@ -315,9 +315,9 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
-"Raktárról: Ha kell, a terméket a raktárról vesszük vagy várunk az alkatrész "
-"feltöltésre.\n"
-"Megrendelve: Ha kell, a terméket megvásároljuk vagy legyártjuk."
+"Raktárról: Ha szükség van rá, a terméket a raktárról vesszük vagy várunk az "
+"alkatrész feltöltésre.\n"
+"Megrendelve: Ha szükség van rá, a terméket megvásároljuk vagy legyártjuk."
 
 #. module: sale
 #: help:sale.config.settings,module_analytic_user_function:0
@@ -344,7 +344,7 @@ msgstr ""
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr "Visszavonva"
+msgstr "Érvénytelenített"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -416,11 +416,11 @@ msgid ""
 msgstr ""
 "Használja mindet a végszámla elkészítéséhez.\n"
 "                Használjon százalékot a teljes mennyiség bizonyos "
-"százalékának szálázásához.\n"
+"százalékának számlázásához.\n"
 "                Használjon fix árat egy bizonyos mennyiség díjbekérőjéhez / "
 "előlegéhez.\n"
 "                Használjon egyes megrendelés sorokat a kiválasztott "
-"megrendelés sorainak számlázásáahoz."
+"megrendelés sorainak számlázásához."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -431,10 +431,10 @@ msgstr "Számlák létrehozása"
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr "ÁFA"
+msgstr "Adó"
 
 #. module: sale
-#: code:addons/sale/sale.py:278
+#: code:addons/sale/sale.py:277
 #: code:addons/sale/sale.py:820
 #: code:addons/sale/sale.py:983
 #, python-format
@@ -456,7 +456,7 @@ msgstr ""
 "elvégzésekkor               egy számla érvényesítésekor (Számla kizárás) "
 "vagy a kiválogatási lista műveletekben (Szállítási kizárás).\n"
 "A 'Ütemezésre várakozás' állapot lesz beállítva, ha a számla megerősített    "
-"                        de vár egy, a megrendelés dátumára futó ütemezésre."
+"                        de vár egy, a megrendelés dátumán futó ütemezésre."
 
 #. module: sale
 #: field:sale.report,date_confirm:0
@@ -467,7 +467,7 @@ msgstr "Megerősítés dátuma"
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr "Sorok száma"
+msgstr "# sorok száma"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -482,7 +482,7 @@ msgstr ""
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"A megrendelés sorrendet adja ha a megrendelési sorok listáját jelzi ki."
+"A megrendelés sorrendet adja a megrendelési sorok listájának kijelzésekor."
 
 #. module: sale
 #: view:sale.report:0
@@ -496,7 +496,7 @@ msgid "Fax :"
 msgstr "Fax:"
 
 #. module: sale
-#: code:addons/sale/sale.py:278
+#: code:addons/sale/sale.py:277
 #, python-format
 msgid ""
 "In order to delete a confirmed sales order, you must cancel it before !"
@@ -507,7 +507,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr "(Frissítés)"
+msgstr "(frissítés)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_partner
@@ -522,8 +522,8 @@ msgid "Contract Features"
 msgstr "Szerződés tulajdonságai"
 
 #. module: sale
-#: code:addons/sale/sale.py:288
-#: code:addons/sale/sale.py:586
+#: code:addons/sale/sale.py:287
+#: code:addons/sale/sale.py:584
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
@@ -533,7 +533,7 @@ msgstr "Szerződés tulajdonságai"
 #: selection:sale.order,state:0
 #, python-format
 msgid "Sales Order"
-msgstr "Értékesítési megbízás"
+msgstr "Vevői megrendelés"
 
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
@@ -543,7 +543,7 @@ msgstr "Megrendelés sorai számlázásának engedélyezése"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Értékesítési megbízási sor"
+msgstr "Vevői megrendelés sor"
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
@@ -553,7 +553,7 @@ msgstr "Előleg összege"
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sales order has at least one invoice."
-msgstr "Ez mutatja, hogy a megrendelének legalább egy számlája van."
+msgstr "Ez mutatja, hogy a megrendelésnek legalább egy számlája van."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -568,7 +568,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr "Egy munkavállalónak különböző funkciója lehet egy szerződésen belül"
+msgstr "Egy alkalmazottnak különböző funkciója lehet egy szerződésen belül"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -583,19 +583,19 @@ msgstr "Alapértelmezett fizetési feltétel"
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr "Megerősítés"
+msgstr "Jóváhagyás"
 
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr "Az időkimutatások alapján készítsen elő számlát"
+msgstr "Az időkimutatások alapján készítsen elő,  számlát"
 
 #. module: sale
 #: code:addons/sale/sale.py:820
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced."
 msgstr ""
-"Nem tud olyan megrendelési sort visszavonni amelyik már számlázva volt."
+"Nem tud olyan vevői megrendelési sort visszavonni amelyik már számlázva volt."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -644,7 +644,7 @@ msgstr "Megrendelés száma"
 #: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr "Megrendelési tételek"
+msgstr "Megrendelés sorok"
 
 #. module: sale
 #: report:sale.order:0
@@ -673,7 +673,7 @@ msgstr "Összérték"
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sales orders."
 msgstr ""
-"Lehetővé teszi az analitikus/elemző könyvelés meghatározását a "
+"Lehetővé teszi az analitikus/elemző könyvelés gyűjtőkód meghatározását a "
 "megrendeléseken."
 
 #. module: sale
@@ -711,7 +711,7 @@ msgstr "Óra"
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr "# megrendelésből"
+msgstr "# megrendelésszámból"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -742,7 +742,7 @@ msgstr "Számlázandó"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr "Az aktuális értékesítési megbízás számlázási címe."
+msgstr "Az aktuális megrendelés számlázási címe."
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -769,7 +769,7 @@ msgstr "Mennyiség"
 #. module: sale
 #: report:sale.order:0
 msgid "Total :"
-msgstr "Bruttó ár:"
+msgstr "Összesen :"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -837,7 +837,7 @@ msgstr "Beállítási hiba!"
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr "Analitikus/elemző könyvelés az értékesítésekhez"
+msgstr "Analitikus/elemző könyvelési gyűjtőkód az értékesítésekhez"
 
 #. module: sale
 #: view:sale.order:0
@@ -889,7 +889,7 @@ msgid "Sales Order done"
 msgstr "Megrendelés elvégezve"
 
 #. module: sale
-#: code:addons/sale/sale.py:369
+#: code:addons/sale/sale.py:364
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
@@ -945,7 +945,7 @@ msgid "Sales Make Invoice"
 msgstr "Számla generálása értékesítésből"
 
 #. module: sale
-#: code:addons/sale/sale.py:308
+#: code:addons/sale/sale.py:307
 #, python-format
 msgid "Pricelist Warning!"
 msgstr "Árlista figyelmeztés!"
@@ -956,7 +956,7 @@ msgid "Discount (%)"
 msgstr "Árengedmény (%)"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_line_invoice.py:107
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1009,7 +1009,7 @@ msgstr "Hónap"
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "Currency"
-msgstr "Valuta"
+msgstr "Pénznem"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1023,7 +1023,7 @@ msgid "Category of Product"
 msgstr "Termékkaterógia"
 
 #. module: sale
-#: code:addons/sale/sale.py:566
+#: code:addons/sale/sale.py:564
 #, python-format
 msgid "Cannot cancel this sales order!"
 msgstr "Nem lehet megszakítani ezt a megrendelést!"
@@ -1080,7 +1080,7 @@ msgid "Open Sale Menu"
 msgstr "Értékesítési menü megnyitása"
 
 #. module: sale
-#: code:addons/sale/sale.py:600
+#: code:addons/sale/sale.py:598
 #, python-format
 msgid "You cannot confirm a sales order which has no line."
 msgstr "Nem tud megerősíteni sor nélküli megrendelést"
@@ -1520,7 +1520,7 @@ msgid "TVA :"
 msgstr "ÁFA:"
 
 #. module: sale
-#: code:addons/sale/sale.py:449
+#: code:addons/sale/sale.py:444
 #, python-format
 msgid "Customer Invoices"
 msgstr "Kimenő számlák"
@@ -1546,7 +1546,7 @@ msgid "Sales"
 msgstr "Értékesítés"
 
 #. module: sale
-#: code:addons/sale/sale.py:309
+#: code:addons/sale/sale.py:308
 #, python-format
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
@@ -1591,7 +1591,8 @@ msgid "Invoice address :"
 msgstr "Számlázási cím:"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: code:addons/sale/wizard/sale_line_invoice.py:121
+#: model:ir.model,name:sale.model_account_invoice
 #: model:process.node,name:sale.process_node_invoice0
 #: view:sale.order:0
 #, python-format
@@ -1678,7 +1679,7 @@ msgid "Shipping address :"
 msgstr "Szállítási cím:"
 
 #. module: sale
-#: code:addons/sale/sale.py:510
+#: code:addons/sale/sale.py:505
 #, python-format
 msgid ""
 "You cannot group sales having different currencies for the same partner."
@@ -2196,8 +2197,9 @@ msgid "Manual In Progress"
 msgstr "Manuális vezérléssel folyamatban"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:110
-#: code:addons/sale/wizard/sale_make_invoice.py:43
+#: code:addons/sale/wizard/sale_line_invoice.py:107
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice.py:55
 #, python-format
 msgid "Warning!"
 msgstr "Figyelem!"
@@ -2466,9 +2468,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Compute"
 #~ msgstr "Számítás"
 
-#~ msgid "Partial Delivery"
-#~ msgstr "Részleges kiszállítás"
-
 #~ msgid "UoM"
 #~ msgstr "ME"
 
@@ -2779,9 +2778,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Előzetes számla megnyitása"
 
-#~ msgid "Sales Management"
-#~ msgstr "Értékesítési menedzsment"
-
 #~ msgid "Deliver"
 #~ msgstr "Szállítás"
 
@@ -2792,9 +2788,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Sale Order Line"
 #~ msgstr "Rendelési tétel"
 
-#~ msgid "Cancel Assignation"
-#~ msgstr "Számla sztornó"
-
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Számla a csomagolási listából"
 
@@ -2850,9 +2843,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Related invoices"
 #~ msgstr "Kapcsolódó számlák"
 
-#~ msgid "Payment Before Delivery"
-#~ msgstr "Fizetés szállítás előtt"
-
 #~ msgid ""
 #~ "This is the list of invoices that have been generated for this sale order. "
 #~ "The same sale order may have been invoiced in several times (by line for "
@@ -2877,6 +2867,9 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Sale Order line"
 #~ msgstr "Rendelési sor"
 
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Szállítás előtti fizetés"
+
 #~ msgid "All at Once"
 #~ msgstr "Egyszerre"
 
@@ -2892,9 +2885,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Notes"
 #~ msgstr "Megjegyzések"
 
-#~ msgid "Lines to Invoice"
-#~ msgstr "Számla sorai"
-
 #~ msgid "All Quotations"
 #~ msgstr "Összes árajánlat"
 
@@ -2922,9 +2912,6 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Picking List"
 #~ msgstr "Kiszedési lista"
 
-#~ msgid "Picking List & Delivery Order"
-#~ msgstr "Kiszedési lista és Szállítás megrendelése"
-
 #~ msgid "Invoicing"
 #~ msgstr "Számlázás"
 
@@ -2950,18 +2937,21 @@ msgstr "A megrendelés megrendelési dátuma"
 #~ msgid "Shipped Qty"
 #~ msgstr "Szállított mennyiség"
 
-#~ msgid "Shipping Default Policy"
-#~ msgstr "Alapértelmezett szállítási politika"
-
 #~ msgid "Close"
 #~ msgstr "Zárás"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Hozzárendelés megszüntetése"
+
 #~ msgid "State"
 #~ msgstr "Állapot"
 
 #~ msgid "Configure"
 #~ msgstr "Beállítás"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Kiszámlázandó sorok"
+
 #~ msgid "Order State"
 #~ msgstr "Megrendelés állapota"
 
@@ -3675,3 +3665,15 @@ msgstr "A megrendelés megrendelési dátuma"
 
 #~ msgid "Invoice Policy"
 #~ msgstr "Számlázási szabály"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Rész-szállítmány"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Alapértelmezett számlázási szabály"
+
+#~ msgid "Sales Management"
+#~ msgstr "Értékesítés kezelés"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Kiválogatási lista & Kézbesítési bizonylat/szállító levél"
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 8449bd83224..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: 2013-06-03 07:54+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-06-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16660)\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
@@ -191,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
@@ -223,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
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 80143379247..d5f07f863b9 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -40,7 +40,6 @@ class sale_report(osv.osv):
         'product_uom_qty': fields.float('# of Qty', readonly=True),
 
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'shop_id': fields.many2one('sale.shop', 'Shop', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Price', readonly=True),
@@ -79,7 +78,6 @@ class sale_report(osv.osv):
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                     s.partner_id as partner_id,
                     s.user_id as user_id,
-                    s.shop_id as shop_id,
                     s.company_id as company_id,
                     extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay,
                     s.state,
@@ -103,7 +101,6 @@ class sale_report(osv.osv):
                     s.date_confirm,
                     s.partner_id,
                     s.user_id,
-                    s.shop_id,
                     s.company_id,
                     s.state,
                     s.pricelist_id,
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 8f725a9eacb..69e9cc5e119 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -13,7 +13,6 @@
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
-                <field name="shop_id" invisible="1"/>
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="partner_id" invisible="1"/>
                 <field name="product_id" invisible="1"/>
@@ -58,7 +57,6 @@
                 <field name="product_id"/>
                 <field name="user_id"/>
                 <group expand="0" string="Extended Filters...">
-                    <field name="shop_id"/>
                     <field name="categ_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </group>
@@ -70,7 +68,6 @@
                     <filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
                     <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                    <filter string="Shop" icon="terp-go-home" context="{'group_by':'shop_id'}"/>
                     <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
                     <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index f00fb6afd19..55bd34009bf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -28,42 +28,17 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FO
 import openerp.addons.decimal_precision as dp
 from openerp import netsvc
 
-class sale_shop(osv.osv):
-    _name = "sale.shop"
-    _description = "Sales Shop"
-    _columns = {
-        'name': fields.char('Shop Name', size=64, required=True),
-        'payment_default_id': fields.many2one('account.payment.term', 'Default Payment Term', required=True),
-        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
-        'project_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
-        'company_id': fields.many2one('res.company', 'Company', required=False),
-    }
-    _defaults = {
-        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.shop', context=c),
-    }
-
-
 class sale_order(osv.osv):
     _name = "sale.order"
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Order"
     _track = {
         'state': {
-            'sale.mt_order_confirmed': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['manual'],
-            'sale.mt_order_sent': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['sent']
+            'sale.mt_order_confirmed': lambda self, cr, uid, obj, ctx=None: obj.state in ['manual'],
+            'sale.mt_order_sent': lambda self, cr, uid, obj, ctx=None: obj.state in ['sent']
         },
     }
 
-    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
-        v = {}
-        if shop_id:
-            shop = self.pool.get('sale.shop').browse(cr, uid, shop_id, context=context)
-            if shop.project_id.id:
-                v['project_id'] = shop.project_id.id
-            if shop.pricelist_id.id:
-                v['pricelist_id'] = shop.pricelist_id.id
-        return {'value': v}
-
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
@@ -176,17 +151,15 @@ class sale_order(osv.osv):
             result[line.order_id.id] = True
         return result.keys()
 
-    def _get_default_shop(self, cr, uid, context=None):
-        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        shop_ids = self.pool.get('sale.shop').search(cr, uid, [('company_id','=',company_id)], context=context)
-        if not shop_ids:
-            raise osv.except_osv(_('Error!'), _('There is no default shop for the current user\'s company!'))
-        return shop_ids[0]
+    def _get_default_company(self, cr, uid, context=None):
+        company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
+        if not company_id:
+            raise osv.except_osv(_('Error!'), _('There is no default company for the current user!'))
+        return company_id
 
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True,
             readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
-        'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this sales order request."),
         'client_order_ref': fields.char('Customer Reference', size=64),
         'state': fields.selection([
@@ -246,16 +219,16 @@ class sale_order(osv.osv):
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities')], 'Invoice on', help="The sales order will automatically create the invoice proposition (draft invoice).", required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
-        'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True,readonly=True)
+        'company_id': fields.many2one('res.company', 'Company'),
     }
     _defaults = {
         'date_order': fields.date.context_today,
         'order_policy': 'manual',
+        'company_id': _get_default_company,
         'state': 'draft',
         'user_id': lambda obj, cr, uid, context: uid,
         'name': lambda obj, cr, uid, context: '/',
         'invoice_quantity': 'order',
-        'shop_id': _get_default_shop,
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
         'note': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.sale_note
@@ -273,7 +246,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)
 
@@ -697,7 +670,7 @@ class sale_order_line(osv.osv):
         '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, 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),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True, readonly=True, states={'draft': [('readonly', False)]}),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.function(_fnct_line_invoiced, string='Invoiced', type='boolean',
             store={
@@ -870,7 +843,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')
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index fc2287cadc0..443895631a9 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -19,20 +19,6 @@
             <field name="object">sale.order</field>
         </record>
 
-        <!-- Resource: sale.shop -->
-        <record id="sale_shop_1" model="sale.shop">
-            <field name="company_id" ref="base.main_company"/>
-            <field name="payment_default_id" ref="account.account_payment_term_net"/>
-            <field name="pricelist_id" ref="product.list0"/>
-
-            <!--  Copy the name of any company. Without demo data this will yield
-                  the main company name, which is correct. With demo data it will
-                  be random, but it does not matter much -->
-            <field model="res.company" name="name" search="[]" use="name"/>
-        </record>
-
-        <function eval="('default',False,'shop_id', [('sale.order', False)], sale_shop_1, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
-
         <!-- notify all employees of module installation -->
         <record model="mail.message" id="module_install_notification">
             <field name="model">mail.group</field>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index eb937199aba..144ea49b75d 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -6,7 +6,6 @@
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="partner_invoice_id" ref="base.res_partner_2"/>
             <field name="partner_shipping_id" ref="base.res_partner_2"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
         </record>
@@ -45,7 +44,6 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_13"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_13"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
@@ -75,7 +73,6 @@
             <field name="partner_id" ref="base.res_partner_14"/>
             <field name="partner_invoice_id" ref="base.res_partner_14"/>
             <field name="partner_shipping_id" ref="base.res_partner_14"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
@@ -105,7 +102,6 @@
             <field name="partner_id" ref="base.res_partner_15"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_25"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_25"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
         </record>
@@ -154,7 +150,6 @@
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="partner_invoice_id" ref="base.res_partner_2"/>
             <field name="partner_shipping_id" ref="base.res_partner_2"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
         </record>
@@ -193,7 +188,6 @@
             <field name="partner_id" ref="base.res_partner_18"/>
             <field name="partner_invoice_id" ref="base.res_partner_18"/>
             <field name="partner_shipping_id" ref="base.res_partner_18"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
         </record>
@@ -261,7 +255,6 @@
             <field name="partner_id" ref="base.res_partner_15"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_25"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_25"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 18a59320d9c..8d7d54d9640 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -3,7 +3,6 @@
     <data>
         <!-- Resource: sale.order -->
         <record id="test_order_1" model="sale.order">
-            <field name="shop_id" ref="sale_shop_1"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
             <field model="res.partner" name="partner_id" search="[]"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d8d038eb002..967350a88ac 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -13,59 +13,6 @@
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
 
-
-        <record id="view_shop_form" model="ir.ui.view">
-            <field name="name">sale.shop</field>
-            <field name="model">sale.shop</field>
-            <field name="arch" type="xml">
-                <form string="Sales Shop" version="7.0">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
-                    <group name="shop">
-                        <group>
-                            <field name="payment_default_id"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist"/>
-                        </group>
-                        <group>
-                            <field name="project_id" groups="analytic.group_analytic_accounting"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        </group>
-                    </group>
-                </form>
-           </field>
-        </record>
-        
-        <record id="view_shop_tree" model="ir.ui.view">
-            <field name="name">sale.shop</field>
-            <field name="model">sale.shop</field>
-            <field name="arch" type="xml">
-                <tree string="Sales Shop">
-                    <field name="name"/>
-                    <field name="pricelist_id" groups="product.group_sale_pricelist"/>
-                    <field name="project_id" groups="analytic.group_analytic_accounting"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_shop_form" model="ir.actions.act_window">
-            <field name="name">Shop</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">sale.shop</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_shop_tree"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to define a new sale shop.
-              </p><p>
-                Each quotation or sales order must be linked to a shop. The
-                shop also defines the warehouse from which the products will be
-                delivered for each particular sales.
-              </p>
-            </field>
-        </record>
-
-
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
             <field name="model">sale.order</field>
@@ -160,7 +107,6 @@
                         </group>
                         <group>
                             <field name="date_order"/>
-                            <field name="shop_id" groups="base.group_no_one" on_change="onchange_shop_id(shop_id, context)" widget="selection"/>
                             <field name="client_order_ref"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="currency_id" invisible="1"/>
@@ -178,13 +124,13 @@
                                         <group>
                                             <field name="state" invisible="1" />
                                             <field name="product_id"
-                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
                                                 groups="base.group_user"
                                                 on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                             <label for="product_uom_qty"/>
                                             <div>
                                                 <field
-                                                    context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                                    context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
                                                     name="product_uom_qty" class="oe_inline"
                                                     on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                                 <field name="product_uom" groups="product.group_uom" class="oe_inline oe_no_button"
@@ -222,12 +168,12 @@
                                     <field name="state" invisible="1"/>
                                     <field name="th_weight" invisible="1"/>
                                     <field name="product_id"
-                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
                                         groups="base.group_user" 
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                     <field name="name"/>
                                     <field name="product_uom_qty"
-                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <field name="product_uom"
                                         on_change="product_uom_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, context)"
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 670c863a022..5fea141bd2b 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,5 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_shop,sale.shop,model_sale_shop,base.group_user,1,0,0,0
 access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0
 access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1
 access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0
@@ -19,7 +18,6 @@ access_res_partner_sale_user,res.partner.sale.user,base.model_res_partner,base.g
 access_res_partner_sale_manager,res.partner.sale.manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
 access_product_template_sale_user,product.template sale use,product.model_product_template,base.group_sale_salesman,1,0,0,0
 access_product_product_sale_user,product.product sale use,product.model_product_product,base.group_sale_salesman,1,0,0,0
-access_sale_shop_manager,account.journal sale order.user,model_sale_shop,base.group_sale_manager,1,1,1,1
 access_account_fiscalyear_user,account.fiscalyear.user,account.model_account_fiscalyear,base.group_sale_salesman,1,0,0,0
 access_account_tax_user,account.tax.user,account.model_account_tax,base.group_sale_salesman,1,0,0,0
 access_ir_attachment_sales,ir.attachment.sales,base.model_ir_attachment,base.group_sale_salesman,1,1,1,0
@@ -29,8 +27,6 @@ access_res_partner_bank_type_field_user,res.partner.bank.type.field.user,base.mo
 access_product_uom_user,product.uom.user,product.model_product_uom,base.group_sale_salesman,1,0,0,0
 access_product_pricelist_sale_user,product.pricelist.sale.user,product.model_product_pricelist,base.group_sale_salesman,1,0,0,0
 access_account_account_salesman,account_account salesman,account.model_account_account,base.group_sale_salesman,1,0,0,0
-access_sale_shop_sale_user,sale.shop.sale.user,model_sale_shop,base.group_sale_salesman,1,0,0,0
-access_sale_shop_sale_manager,sale.shop.sale.manager,model_sale_shop,base.group_sale_manager,1,1,1,1
 access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.model_product_uom_categ,base.group_sale_manager,1,1,1,1
 access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,base.group_sale_manager,1,1,1,1
 access_product_ul_sale_manager,product.ul salemanager,product.model_product_ul,base.group_sale_manager,1,1,1,1
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 49bd0e8716b..710fbdcc207 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -36,6 +36,7 @@
 
     <record id="group_mrp_properties" model="res.groups">
         <field name="name">Properties on lines</field>
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
@@ -78,13 +79,6 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-    <record model="ir.rule" id="sale_shop_comp_rule">
-        <field name="name">Sale Shop multi-company</field>
-        <field name="model_id" ref="model_sale_shop"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
     <!-- Multi - Salesmen sales order assignation rules -->
 
     <record id="sale_order_personal_rule" model="ir.rule">
diff --git a/addons/sale/html/Gunther-Rombouts.png b/addons/sale/static/description/Gunther-Rombouts.png
similarity index 100%
rename from addons/sale/html/Gunther-Rombouts.png
rename to addons/sale/static/description/Gunther-Rombouts.png
diff --git a/addons/sale/html/Philippe-Leruth.png b/addons/sale/static/description/Philippe-Leruth.png
similarity index 100%
rename from addons/sale/html/Philippe-Leruth.png
rename to addons/sale/static/description/Philippe-Leruth.png
diff --git a/addons/sale/static/src/img/icon.png b/addons/sale/static/description/icon.png
similarity index 100%
rename from addons/sale/static/src/img/icon.png
rename to addons/sale/static/description/icon.png
diff --git a/addons/sale/html/index.html b/addons/sale/static/description/index.html
similarity index 98%
rename from addons/sale/html/index.html
rename to addons/sale/static/description/index.html
index 1eb6215db2f..52c84b82f12 100644
--- a/addons/sale/html/index.html
+++ b/addons/sale/static/description/index.html
@@ -17,7 +17,7 @@ you need, easily accessible. Keep track of long term contracts, automate invoici
 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>
+                <a href="http://www.openerp.com/start?app=sale" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/sale/html/sale_invoice.png b/addons/sale/static/description/sale_invoice.png
similarity index 100%
rename from addons/sale/html/sale_invoice.png
rename to addons/sale/static/description/sale_invoice.png
diff --git a/addons/sale/html/sale_sc_00.png b/addons/sale/static/description/sale_sc_00.png
similarity index 100%
rename from addons/sale/html/sale_sc_00.png
rename to addons/sale/static/description/sale_sc_00.png
diff --git a/addons/sale/html/sale_sc_01.png b/addons/sale/static/description/sale_sc_01.png
similarity index 100%
rename from addons/sale/html/sale_sc_01.png
rename to addons/sale/static/description/sale_sc_01.png
diff --git a/addons/sale/html/sale_sc_02.png b/addons/sale/static/description/sale_sc_02.png
similarity index 100%
rename from addons/sale/html/sale_sc_02.png
rename to addons/sale/static/description/sale_sc_02.png
diff --git a/addons/sale/html/sale_sc_03.png b/addons/sale/static/description/sale_sc_03.png
similarity index 100%
rename from addons/sale/html/sale_sc_03.png
rename to addons/sale/static/description/sale_sc_03.png
diff --git a/addons/sale/html/sale_sc_04.png b/addons/sale/static/description/sale_sc_04.png
similarity index 100%
rename from addons/sale/html/sale_sc_04.png
rename to addons/sale/static/description/sale_sc_04.png
diff --git a/addons/sale/html/sale_sc_05.png b/addons/sale/static/description/sale_sc_05.png
similarity index 100%
rename from addons/sale/html/sale_sc_05.png
rename to addons/sale/static/description/sale_sc_05.png
diff --git a/addons/sale/html/sale_sc_06.png b/addons/sale/static/description/sale_sc_06.png
similarity index 100%
rename from addons/sale/html/sale_sc_06.png
rename to addons/sale/static/description/sale_sc_06.png
diff --git a/addons/sale/html/sale_sc_07.png b/addons/sale/static/description/sale_sc_07.png
similarity index 100%
rename from addons/sale/html/sale_sc_07.png
rename to addons/sale/static/description/sale_sc_07.png
diff --git a/addons/sale/html/sale_sc_08.png b/addons/sale/static/description/sale_sc_08.png
similarity index 100%
rename from addons/sale/html/sale_sc_08.png
rename to addons/sale/static/description/sale_sc_08.png
diff --git a/addons/sale/html/sale_sc_10.png b/addons/sale/static/description/sale_sc_10.png
similarity index 100%
rename from addons/sale/html/sale_sc_10.png
rename to addons/sale/static/description/sale_sc_10.png
diff --git a/addons/sale/html/sales_illu_01.png b/addons/sale/static/description/sales_illu_01.png
similarity index 100%
rename from addons/sale/html/sales_illu_01.png
rename to addons/sale/static/description/sales_illu_01.png
diff --git a/addons/sale/html/sales_target.png b/addons/sale/static/description/sales_target.png
similarity index 100%
rename from addons/sale/html/sales_target.png
rename to addons/sale/static/description/sales_target.png
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 70693215be0..6be23e18de5 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -22,7 +22,7 @@
         </record>
 
         <record id="action_view_sale_order_line_make_invoice" model="ir.actions.act_window">
-            <field name="name">Make Invoices</field>
+            <field name="name">Create Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line.make.invoice</field>
             <field name="view_type">form</field>
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 4cb00245ade..c3f1d6cade4 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -31,7 +31,7 @@ class sale_advance_payment_inv(osv.osv_memory):
             [('all', 'Invoice the whole sales order'), ('percentage','Percentage'), ('fixed','Fixed price (deposit)'),
                 ('lines', 'Some order lines')],
             'What do you want to invoice?', required=True,
-            help="""Use All to create the final invoice.
+            help="""Use Invoice the whole sale order to create the final invoice.
                 Use Percentage to invoice a percentage of the total amount.
                 Use Fixed Price to invoice a specific amound in advance.
                 Use Some Order Lines to invoice a selection of the sales order lines."""),
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 522f6b6f0fb..51262343d68 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -38,14 +38,4 @@ class sale_order_line(osv.osv):
         return create_ids
 
 
-class sale_order(osv.osv):
-    _inherit = "sale.order"
-
-    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
-        # Remove the project_id from the result of super() call, if any, as this field is not in the view anymore
-        res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shop_id, context=context)
-        if res.get('value',{}).get('project_id'):
-            del(res['value']['project_id'])
-        return res
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 97c5f4579e0..109f1061ed0 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -96,6 +96,13 @@ class res_users(osv.Model):
         'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
     }
 
+    def __init__(self, pool, cr):
+        init_res = super(res_users, self).__init__(pool, cr)
+        # duplicate list to avoid modifying the original reference
+        self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
+        self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
+        return init_res
+
 
 class sale_crm_lead(osv.Model):
     _inherit = 'crm.lead'
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index ae21934ce61..63ad9fb980e 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/header/button[@name='case_mark_lost']" position="after">
-                        <button states="done" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/>
-                        <button states="draft,open,pending" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
+                        <button attrs="{'invisible': [('probability', '&lt;', 100)]}" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/>
+                        <button attrs="{'invisible': [('probability', '=', 100)]}" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
                     </xpath>
                 </data>
             </field>
@@ -116,7 +116,7 @@
             <field name="arch" type="xml">
             <data>
                     <xpath expr="//field[@name='company_id']" position="before">
-                        <field name="default_section_id"/>
+                        <field name="default_section_id" readonly="0"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/sale_crm/test/sale_crm.yml b/addons/sale_crm/test/sale_crm.yml
index 011fb6ad5a8..21d2cc08195 100644
--- a/addons/sale_crm/test/sale_crm.yml
+++ b/addons/sale_crm/test/sale_crm.yml
@@ -1,14 +1,3 @@
--
-  Make sure the main company has at least one shop.
--
-  !python {model: sale.shop}: |
-    company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
-    shop_ids = self.search(cr, uid, [('company_id', '=', company_id)])
-    if not shop_ids:
-        # take a shop, and assign it to the user's company
-        shop_ids = self.search(cr, uid, [])
-        if shop_ids:
-            self.write(cr, uid, [shop_ids[0]], {'company_id': company_id})
 -
   I open the wizard "Make sales".
 -
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 6bea6286456..829468e684f 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -78,28 +78,30 @@ class crm_make_sale(osv.osv_memory):
                     ['default', 'invoice', 'delivery', 'contact'])
             pricelist = partner.property_product_pricelist.id
             fpos = partner.property_account_position and partner.property_account_position.id or False
+            payment_term = partner.property_payment_term and partner.property_payment_term.id or False
             new_ids = []
             for case in case_obj.browse(cr, uid, data, context=context):
                 if not partner and case.partner_id:
                     partner = case.partner_id
                     fpos = partner.property_account_position and partner.property_account_position.id or False
+                    payment_term = partner.property_payment_term and partner.property_payment_term.id or False
                     partner_addr = partner_obj.address_get(cr, uid, [partner.id],
                             ['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),
                     'section_id': case.section_id and case.section_id.id or False,
                     'categ_ids': [(6, 0, [categ_id.id for categ_id in case.categ_ids])],
-                    'shop_id': make.shop_id.id,
                     'partner_id': partner.id,
                     'pricelist_id': pricelist,
                     'partner_invoice_id': partner_addr['invoice'],
                     'partner_shipping_id': partner_addr['delivery'],
                     'date_order': fields.date.context_today(self,cr,uid,context=context),
                     'fiscal_position': fpos,
+                    'payment_term':payment_term,
                 }
                 if partner.id:
                     vals['user_id'] = partner.user_id and partner.user_id.id or uid
@@ -110,7 +112,7 @@ class crm_make_sale(osv.osv_memory):
                 message = _("Opportunity has been <b>converted</b> to the quotation <em>%s</em>.") % (sale_order.name)
                 case.message_post(body=message)
             if make.close:
-                case_obj.case_close(cr, uid, data)
+                case_obj.case_mark_won(cr, uid, data, context=context)
             if not new_ids:
                 return {'type': 'ir.actions.act_window_close'}
             if len(new_ids)<=1:
@@ -137,18 +139,12 @@ class crm_make_sale(osv.osv_memory):
                 }
             return value
 
-    def _get_shop_id(self, cr, uid, ids, context=None):
-        cmpny_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
-        shop = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', cmpny_id)])
-        return shop and shop[0] or False
 
     _columns = {
-        'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
         'partner_id': fields.many2one('res.partner', 'Customer', required=True, domain=[('customer','=',True)]),
         'close': fields.boolean('Mark Won', help='Check this to close the opportunity after having created the sales order.'),
     }
     _defaults = {
-        'shop_id': _get_shop_id,
         'close': False,
         'partner_id': _selectPartner,
     }
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 2207cf536e2..695f3e919eb 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -10,7 +10,6 @@
             <form string="Convert to Quotation"  version="7.0">
                 <group col="4">
                     <field name="partner_id" required="1"/>
-                    <field name="shop_id" required="1" widget="selection" groups="stock.group_locations"/>
                     <field name="close"/>
                 </group>
                 <footer>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 9e10c826898..73fd5b672f1 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -43,11 +43,9 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'property_invoice_type': fields.property(
-            'sale_journal.invoice.type',
             type = 'many2one',
             relation = 'sale_journal.invoice.type',
             string = "Invoicing Type",
-            view_load = True,
             group_name = "Accounting Properties",
             help = "This invoicing type will be used, by default, to invoice the current partner."),
     }
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 1d6b295b3a1..197f51a9681 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -23,7 +23,6 @@
     partner_invoice_id: base.res_partner_address_7
     partner_shipping_id: base.res_partner_address_7
     pricelist_id: product.list0
-    shop_id: sale.sale_shop_1
 -
   I confirm the sale order
 -
diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml
index 5be5210b623..f0ec2de6efc 100644
--- a/addons/sale_mrp/test/sale_mrp.yml
+++ b/addons/sale_mrp/test/sale_mrp.yml
@@ -83,7 +83,6 @@
     partner_shipping_id: base.res_partner_address_7
     picking_policy: direct
     pricelist_id: product.list0
-    shop_id: sale.sale_shop_1
 -
   I confirm the sale order
 -
diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index a849df295d4..fd20748aa75 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -57,7 +57,6 @@ You can choose flexible invoicing methods:
                    'report/sale_report_view.xml',
                    'process/sale_stock_process.xml',
                    ],
-   'data': ['sale_stock_data.xml'],
    'demo_xml': ['sale_stock_demo.xml'],
     'test': ['test/cancel_order_sale_stock.yml',
              'test/picking_order_policy.yml',
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/report/sale_report.py b/addons/sale_stock/report/sale_report.py
index 63641020d98..0feb3ee2392 100644
--- a/addons/sale_stock/report/sale_report.py
+++ b/addons/sale_stock/report/sale_report.py
@@ -27,6 +27,7 @@ class sale_report(osv.osv):
     _columns = {
         'shipped': fields.boolean('Shipped', readonly=True),
         'shipped_qty_1': fields.integer('Shipped', readonly=True),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',readonly=True),
         'state': fields.selection([
             ('draft', 'Quotation'),
             ('waiting_date', 'Waiting Schedule'),
@@ -57,8 +58,8 @@ class sale_report(osv.osv):
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                     s.partner_id as partner_id,
                     s.user_id as user_id,
-                    s.shop_id as shop_id,
                     s.company_id as company_id,
+                    s.warehouse_id as warehouse_id,
                     extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay,
                     s.state,
                     t.categ_id as categ_id,
@@ -83,7 +84,7 @@ class sale_report(osv.osv):
                     s.date_confirm,
                     s.partner_id,
                     s.user_id,
-                    s.shop_id,
+                    s.warehouse_id,
                     s.company_id,
                     s.state,
                     s.shipped,
diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml
index ae8b12ca168..6642bffcede 100644
--- a/addons/sale_stock/report/sale_report_view.xml
+++ b/addons/sale_stock/report/sale_report_view.xml
@@ -7,9 +7,20 @@
              <field name="inherit_id" ref="sale.view_order_product_tree"/>
              <field name="arch" type="xml">
                  <field name="product_uom_qty" position="after">
+                     <field name="warehouse_id" invisible="1"/>
                      <field name="shipped_qty_1" sum="Shipped"/>
                  </field>
              </field>
          </record>
+        <record id="view_order_product_search_sale_stock_inherit" model="ir.ui.view">
+            <field name="name">sale.report.search.sale.stock</field>
+            <field name="model">sale.report</field>
+            <field name="inherit_id" ref="sale.view_order_product_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group/filter[@string='Status']" position="after">
+                    <filter string="Warehouse" context="{'group_by':'warehouse_id'}"/>
+                </xpath>
+            </field>
+        </record>
      </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index d06b6a81b32..4c3b92f1d33 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -50,9 +50,6 @@ class sale_configuration(osv.osv_memory):
         'group_mrp_properties': fields.boolean('Product properties on order lines',
             implied_group='sale.group_mrp_properties',
             help="Allows you to tag sales order lines with properties."),
-        'group_multiple_shops': fields.boolean("Manage multiple shops",
-            implied_group='stock.group_locations',
-            help="This allows to configure and use multiple shops."),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
     }
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index ad3b91b2a30..93bc8e5980e 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -59,12 +59,6 @@
                              <label for="group_mrp_properties"/>
                          </div>
                      </div>
-                     <xpath expr="//div[@name='module_sale_margin']" position="before">
-                         <div>
-                             <field name="group_multiple_shops" class="oe_inline"/>
-                             <label for="group_multiple_shops"/>
-                         </div>
-                     </xpath>
                      <field name="group_invoice_so_lines" position="replace">
                          <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
                      </field>
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index e71fb92f842..b8f6249d744 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -27,13 +27,6 @@ from openerp.tools.translate import _
 import pytz
 from openerp import SUPERUSER_ID
 
-class sale_shop(osv.osv):
-    _inherit = "sale.shop"
-    _columns = {
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
-    }
-
-
 class sale_order(osv.osv):
     _inherit = "sale.order"
     
@@ -70,9 +63,16 @@ class sale_order(osv.osv):
                 vals.update({'invoice_quantity': 'order'})
             if vals['order_policy'] == 'picking':
                 vals.update({'invoice_quantity': 'procurement'})
-        order =  super(sale_order, self).create(cr, uid, vals, context=context)
+        order = super(sale_order, self).create(cr, uid, vals, context=context)
         return order
 
+    def _get_default_warehouse(self, cr, uid, context=None):
+        company_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
+        warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id', '=', company_id)], context=context)
+        if not warehouse_ids:
+            raise osv.except_osv(_('Error!'), _('There is no warehouse defined for current company.'))
+        return warehouse_ids[0]
+
     # This is False
     def _picked_rate(self, cr, uid, ids, name, arg, context=None):
         if not ids:
@@ -140,11 +140,13 @@ class sale_order(osv.osv):
         'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."),
         'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
         'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', 
                                              help="The sales order will automatically create the invoice proposition (draft invoice).\
                                               You have to choose  if you want your invoice based on ordered ", required=True, readonly=True, states={'draft': [('readonly', False)]}),
     }
     _defaults = {
+             'warehouse_id': _get_default_warehouse,
              'picking_policy': 'direct',
              'order_policy': 'manual',
              'invoice_quantity': 'order',
@@ -162,6 +164,14 @@ class sale_order(osv.osv):
 
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
+    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None):
+        val = {}
+        if warehouse_id:
+            warehouse = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context=context)
+            if warehouse.company_id:
+                val['company_id'] = warehouse.company_id.id
+        return {'value': val}
+
     def action_view_delivery(self, cr, uid, ids, context=None):
         '''
         This function returns an action that display existing delivery orders of given sales order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.
@@ -297,16 +307,17 @@ class sale_order(osv.osv):
                     or line.product_uom_qty,
             'product_uos': (line.product_uos and line.product_uos.id)\
                     or line.product_uom.id,
-            'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
+            'location_id': order.warehouse_id.lot_stock_id.id,
             'procure_method': line.type,
             'move_id': move_id,
             'company_id': order.company_id.id,
             'note': line.name,
+            'property_ids': [(6, 0, [x.id for x in line.property_ids])],
         }
 
     def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
-        location_id = order.shop_id.warehouse_id.lot_stock_id.id
-        output_id = order.shop_id.warehouse_id.lot_output_id.id
+        location_id = order.warehouse_id.lot_stock_id.id
+        output_id = order.warehouse_id.lot_output_id.id
         return {
             'name': line.name,
             'picking_id': picking_id,
@@ -587,9 +598,6 @@ class sale_order_line(osv.osv):
             return res
 
         #update of result obtained in super function
-        res_packing = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
-        res['value'].update(res_packing.get('value', {}))
-        warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
         product_obj = product_obj.browse(cr, uid, product, context=context)
         res['value']['delay'] = (product_obj.sale_delay or 0.0)
         res['value']['type'] = product_obj.procure_method
@@ -602,6 +610,11 @@ class sale_order_line(osv.osv):
                 uom = False
         if not uom2:
             uom2 = product_obj.uom_id
+
+        # Calling product_packaging_change function after updating UoM
+        res_packing = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
+        res['value'].update(res_packing.get('value', {}))
+        warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
         compare_qty = float_compare(product_obj.virtual_available * uom2.factor, qty * product_obj.uom_id.factor, precision_rounding=product_obj.uom_id.rounding)
         if (product_obj.type=='product') and int(compare_qty) == -1 \
           and (product_obj.procure_method=='make_to_stock'):
diff --git a/addons/sale_stock/sale_stock_data.xml b/addons/sale_stock/sale_stock_data.xml
deleted file mode 100644
index bb4944bd87e..00000000000
--- a/addons/sale_stock/sale_stock_data.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-    
-        <!-- Resource: sale.shop -->
-        <record id="sale.sale_shop_1" model="sale.shop">
-            <field name="warehouse_id" ref="stock.warehouse0"/>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/sale_stock/sale_stock_demo.xml b/addons/sale_stock/sale_stock_demo.xml
index 15b1e60b829..2e7b641659d 100644
--- a/addons/sale_stock/sale_stock_demo.xml
+++ b/addons/sale_stock/sale_stock_demo.xml
@@ -3,21 +3,37 @@
     <data noupdate="1">
     
         <record id="sale.sale_order_1" model="sale.order">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
             <field name="order_policy">prepaid</field>
         </record>
-
+        
+        <record id="sale.sale_order_2" model="sale.order">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
+        </record>
+        
+        <record id="sale.sale_order_3" model="sale.order">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
+        </record>
+        
         <record id="sale.sale_order_4" model="sale.order">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
             <field name="order_policy">prepaid</field>
         </record>
 
         <record id="sale.sale_order_5" model="sale.order">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
             <field name="order_policy">picking</field>
         </record>
 
         <record id="sale.sale_order_6" model="sale.order">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
             <field name="order_policy">picking</field>
         </record>
         
+        <record id="sale.sale_order_8" model="sale.order">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
+        </record>
+        
          <!-- Confirm some Sale Orders-->
         <workflow action="order_confirm" model="sale.order" ref="sale.sale_order_1"/>
         <workflow action="order_confirm" model="sale.order" ref="sale.sale_order_5"/>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 9d852405b9e..b66177d374b 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -2,31 +2,6 @@
 <openerp>
     <data>
 
-        <record id="view_sale_shop_form_inherit" model="ir.ui.view">
-            <field name="name">sale.shop.inherit.form</field>
-            <field name="model">sale.shop</field>
-            <field name="inherit_id" ref="sale.view_shop_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='shop']" position="before">
-                     <label for="warehouse_id" class="oe_edit_only"/>
-                     <h2><field name="warehouse_id" required="1"/></h2>
-                </xpath>
-            </field>
-        </record>
-
-         <record id="view_shop_tree_inherit" model="ir.ui.view">
-             <field name="name">sale.shop.sale.stock</field>
-             <field name="model">sale.shop</field>
-             <field name="inherit_id" ref="sale.view_shop_tree"/>
-             <field name="arch" type="xml">
-                 <field name="name" position="after">
-                     <field name="warehouse_id"/>
-                 </field>
-             </field>
-         </record>
-
-        <menuitem action="sale.action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="35" groups="stock.group_locations"/>
-
         <record id="view_order_form_inherit" model="ir.ui.view">
             <field name="name">sale.order.form.sale.stock</field>
             <field name="model">sale.order</field>
@@ -48,17 +23,20 @@
                     <field name="state" position="replace">
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </field>
-                   <field name="shop_id" position="replace">
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
-                   </field>
+                    <field name="company_id" position="replace">
+                        <field name="company_id" readonly="True"/>
+                    </field>
+                    <field name="fiscal_position" position="after">
+                         <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection" groups="stock.group_locations"/>
+                    </field>
                    <field name="product_id" position="replace">
                        <field name="product_id"
-                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
                        groups="base.group_user" 
                        on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
                    </field>
                    <field name="product_uom_qty" position="replace">
-                       <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                       <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}"
                              name="product_uom_qty" class="oe_inline"
                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
                    </field>
@@ -78,7 +56,7 @@
                             groups="sale.group_mrp_properties"/>
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
-                       <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"  />
+                       <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"  />
                    </xpath>
                    <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/div/field[@name='invoice_lines']" position="after">
                        <label for="move_ids"/>
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index afffda1ef21..4a6f3d38f97 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -63,8 +63,8 @@
       assert picking.note == sale_order.note,"Note is not correspond with sale order."
       assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order."
       assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines."
-      location_id = sale_order.shop_id.warehouse_id.lot_stock_id.id
-      output_id = sale_order.shop_id.warehouse_id.lot_output_id.id
+      location_id = sale_order.warehouse_id.lot_stock_id.id
+      output_id = sale_order.warehouse_id.lot_output_id.id
       for move in picking.move_lines:
          order_line = move.sale_line_id
          sale_order_date = self.date_to_datetime(cr, uid, sale_order.date_order, context)
diff --git a/addons/share/i18n/bs.po b/addons/share/i18n/bs.po
new file mode 100644
index 00000000000..7d3a0e10b80
--- /dev/null
+++ b/addons/share/i18n/bs.po
@@ -0,0 +1,629 @@
+# Bosnian 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-08-08 22:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@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-08-09 05:06+0000\n"
+"X-Generator: Launchpad (build 16723)\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:842
+#, python-format
+msgid "Invitation to collaborate about %s"
+msgstr "Poziv za razgovor o %s"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:780
+#, python-format
+msgid ""
+"The share engine has not been able to fetch a record_id for your invitation."
+msgstr ""
+"Sistem za dijeljenje nije bio u mogućnosti da uhvati record_id za vašu "
+"pozivnicu."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Include an Optional Personal Message"
+msgstr "Uključi opcionalnu personalnu poruku"
+
+#. module: share
+#: field:share.wizard,embed_option_title:0
+msgid "Display title"
+msgstr "Prikaži naslov"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access granted!"
+msgstr "Pristup odobren!"
+
+#. module: share
+#: field:share.wizard,record_name:0
+msgid "Record name"
+msgstr "Ime zapisa"
+
+#. module: share
+#: help:share.wizard,message:0
+msgid ""
+"An optional personal message, to be included in the email notification."
+msgstr ""
+"Opcionalna personalna poruka, da bude uključena u email obavještenje."
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Sharing method"
+msgstr "Metoda djeljenja"
+
+#. module: share
+#: field:share.wizard,name:0
+msgid "Share Title"
+msgstr "Djeli naslov"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:877
+#, python-format
+msgid ""
+"The documents are not attached, you can view them online directly on my "
+"OpenERP server at:\n"
+"    %s\n"
+"\n"
+msgstr ""
+"Ovi dokumenti nisu zakačeni, možete ih pregledati online direktno na mom "
+"OpenERP serveru na:\n"
+"    %s\n"
+"\n"
+
+#. module: share
+#: model:ir.module.category,name:share.module_category_share
+msgid "Sharing"
+msgstr "Dijeljeno"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:843
+#: code:addons/share/wizard/share_wizard.py:875
+#, python-format
+msgid ""
+"Hello,\n"
+"\n"
+msgstr ""
+"Pozdrav,\n"
+"\n"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Share Access URL"
+msgstr "Dijeli URL pristupa"
+
+#. 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 "Novi korisnički email"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:887
+#, python-format
+msgid "You may use your current login (%s) and password to view them.\n"
+msgstr ""
+"Možete koristiti vašu trenutnu prijavu (%s) i šifru da ih pregledate..\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:621
+#, python-format
+msgid "(Modified)"
+msgstr "(promjenjeno)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:665
+#, python-format
+msgid "You must be a member of the Share/User group to use the share wizard."
+msgstr ""
+"Morate biti član Dijeli/Korisnik grupe da bi ste koristili čarobnjak "
+"dijeljenja."
+
+#. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr "Ugradi"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:599
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr "Djeljeni filter kreiran od strane korisnika %s (%s) za grupu %s"
+
+#. module: share
+#: field:share.wizard,embed_url:0
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "URL djeljenja"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
+#, 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:571
+#, python-format
+msgid "(Duplicated for modified sharing permissions)"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:669
+#, 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:662
+#, python-format
+msgid "Action and Access Mode are required to create a shared access."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
+#, 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:835
+#: code:addons/share/wizard/share_wizard.py:866
+#, 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:856
+#: code:addons/share/wizard/share_wizard.py:890
+#, 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:657
+#, python-format
+msgid "Sharing access cannot be created."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:780
+#, 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:546
+#, 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:636
+#, 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:658
+#, 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:852
+#: code:addons/share/wizard/share_wizard.py:884
+#, 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:513
+#, python-format
+msgid "Copied access for sharing"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:817
+#, 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:886
+#, 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:844
+#, 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:793
+#, 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:853
+#, 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:876
+#, 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:851
+#: code:addons/share/wizard/share_wizard.py:883
+#: 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:835
+#: code:addons/share/wizard/share_wizard.py:866
+#, 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/static/src/js/share.js b/addons/share/static/src/js/share.js
index da72cea602d..2211295ae60 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -14,7 +14,7 @@ openerp.share = function(session) {
         else rec_name = '';
         session.web.pyeval.eval_domains_and_contexts({
             domains: [domain],
-            contexts: [view.dataset.context]
+            contexts: [Share.get_context()]
         }).done(function (result) {
             Share.create({
                 name: action.name,
@@ -25,7 +25,7 @@ openerp.share = function(session) {
                 view_type: view.fields_view.type,
                 invite: invite || false,
             }).done(function(share_id) {
-                var step1 = Share.call('go_step_1', [[share_id]]).done(function(result) {
+                var step1 = Share.call('go_step_1', [[share_id], Share.get_context()]).done(function(result) {
                     var action = result;
                     self.do_action(action);
                 });
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 68c30949161..22ed7c3e39c 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -833,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:
@@ -864,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 = []
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 407a76e63b7..add3ef9989b 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/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-12-09 05:05+0000\n"
-"Last-Translator: sum1201 <Unknown>\n"
+"PO-Revision-Date: 2013-08-06 09:26+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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:00+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-08-07 04:46+0000\n"
+"X-Generator: Launchpad (build 16721)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -124,8 +124,8 @@ msgid "Product Moves"
 msgstr "产品调拨"
 
 #. module: stock
-#: code:addons/stock/stock.py:2519
-#: code:addons/stock/stock.py:2580
+#: code:addons/stock/stock.py:2524
+#: code:addons/stock/stock.py:2585
 #, python-format
 msgid "Please provide proper quantity."
 msgstr "输入数量不正确"
@@ -251,7 +251,7 @@ msgstr "安排送货单"
 #: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context."
-msgstr ""
+msgstr "Contex中没有 Active ID"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -346,9 +346,9 @@ msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视
 
 #. module: stock
 #: code:addons/stock/stock.py:768
-#: code:addons/stock/stock.py:2475
-#: code:addons/stock/stock.py:2519
-#: code:addons/stock/stock.py:2580
+#: code:addons/stock/stock.py:2473
+#: code:addons/stock/stock.py:2524
+#: code:addons/stock/stock.py:2585
 #: code:addons/stock/wizard/stock_change_product_qty.py:91
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
@@ -476,6 +476,7 @@ msgstr "操作追溯 "
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 #: selection:stock.picking.in,state:0
+#: report:stock.picking.list:0
 #: selection:stock.picking.out,state:0
 msgid "Waiting Availability"
 msgstr "等待可用"
@@ -484,6 +485,7 @@ msgstr "等待可用"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
 #: selection:stock.move,state:0
+#: report:stock.picking.list:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,stock_available:0
 msgid "Available"
@@ -574,7 +576,7 @@ msgstr "实物盘点表草稿"
 msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
 "stock moves that have already been processed (except by the Administrator)."
-msgstr ""
+msgstr "已经被处理过的移库单中，数量，计量单位，产品和库位不能修改（除非是 管理员）"
 
 #. module: stock
 #: help:report.stock.move,type:0
@@ -614,7 +616,7 @@ msgstr "标签"
 #: code:addons/stock/stock.py:1356
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
-msgstr "未交付清单<em>%s</em> 已经被 <b>创建</b>."
+msgstr "延期交货清单<em>%s</em> 已经被 <b>创建</b>."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
@@ -684,7 +686,7 @@ msgstr "入库单"
 #, python-format
 msgid ""
 "Serial number quantity %d of %s is larger than available quantity (%d)!"
-msgstr ""
+msgstr "系列号数量 %d ( %s ) 大于可用数量(%d)!"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -821,7 +823,7 @@ msgstr "6月"
 msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "coming from a Supplier Location"
-msgstr ""
+msgstr "为包含该产品和来自供应商库位的所有移库单 强制指定一个 系列号"
 
 #. module: stock
 #: help:stock.config.settings,group_uos:0
@@ -831,6 +833,8 @@ msgid ""
 "                For instance, you can sell pieces of meat that you invoice "
 "based on their weight."
 msgstr ""
+"允许产品的销售和开票的单位不一致.\n"
+"               例如你可以按块卖，但发票按重量开."
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -866,7 +870,7 @@ msgstr "在进行实时库存核算时，库存调拨处理将自动登入这账
 msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
 "(id: %d)"
-msgstr ""
+msgstr "请为这个产品或者它的类别定义一个出库科目: \"%s\" (id: %d)"
 
 #. module: stock
 #: field:stock.picking,message_summary:0
@@ -895,7 +899,7 @@ msgid "Time"
 msgstr "时间"
 
 #. module: stock
-#: code:addons/stock/product.py:447
+#: code:addons/stock/product.py:449
 #, python-format
 msgid "Future Receptions"
 msgstr "未来的入库"
@@ -948,7 +952,7 @@ msgstr "入库库位"
 msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "production lot has to be shown on the moves or not."
-msgstr ""
+msgstr "这 字段是内部用途。用来决定 生产批号这一列 是否显示在移库单上面"
 
 #. module: stock
 #: selection:product.product,valuation:0
@@ -982,7 +986,7 @@ msgstr "公司间转移的中途库位"
 msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
 "cancel the picking lines."
-msgstr ""
+msgstr "您不能取消已经有部分移库完成的分拣单。您应该取消 分拣单行"
 
 #. module: stock
 #: field:stock.config.settings,decimal_precision:0
@@ -1000,7 +1004,7 @@ msgid "Change Product Quantity"
 msgstr "更改产品数量"
 
 #. module: stock
-#: code:addons/stock/product.py:463
+#: code:addons/stock/product.py:465
 #, python-format
 msgid "Future P&L"
 msgstr "未来的产品和库位"
@@ -1027,13 +1031,13 @@ msgstr "盘点库位"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "你需要为该产品指定一个系列号"
 
 #. module: stock
 #: code:addons/stock/stock.py:2255
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "请为这个产品类型定义一个分类账: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.move:0
@@ -1043,7 +1047,7 @@ msgstr "详情"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Ready to Transfer"
-msgstr ""
+msgstr "准备转移"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -1134,12 +1138,12 @@ msgstr "产品批次"
 #. module: stock
 #: view:stock.picking:0
 msgid "Reverse Transfer"
-msgstr ""
+msgstr "反向转移"
 
 #. module: stock
 #: field:stock.config.settings,group_uos:0
 msgid "Invoice products in a different unit of measure than the sales order"
-msgstr ""
+msgstr "开票产品的计量单位和销售订单不一致。"
 
 #. module: stock
 #: help:stock.location,active:0
@@ -1160,13 +1164,13 @@ msgstr "请在列表视图中选择多个待合并的盘点"
 msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
 "can be returned)!"
-msgstr ""
+msgstr "没有产品被退货（只有完成状态和未完全退货的 行能被退货）！"
 
 #. module: stock
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "Back Orders"
-msgstr "子单"
+msgstr "延期交货"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1208,7 +1212,7 @@ msgstr "生产库位"
 #: code:addons/stock/product.py:121
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)."
-msgstr ""
+msgstr "请在产品分类 \"%s\" (id: %d) 上面定义一个分类账。"
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -1267,17 +1271,17 @@ msgstr "建立者"
 #, python-format
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
-msgstr ""
+msgstr "你正在移动 %.2f  %s ，但该系列号只有 %.2f %s 可用"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Internal Shipment :"
-msgstr ""
+msgstr "内部装运："
 
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Split Inventory Line"
-msgstr ""
+msgstr "拆分存货清单行"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1298,7 +1302,7 @@ msgid "Supplier"
 msgstr "供应商"
 
 #. module: stock
-#: code:addons/stock/stock.py:2859
+#: code:addons/stock/stock.py:2864
 #, python-format
 msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
@@ -1309,7 +1313,7 @@ msgstr "为取消这个盘存，你必须要先取消相关的分录。"
 #: code:addons/stock/product.py:113
 #, python-format
 msgid "Please specify company in Location."
-msgstr ""
+msgstr "请在库位里 指定公司"
 
 #. module: stock
 #: view:stock.move:0
@@ -1321,7 +1325,7 @@ msgstr "库存调拨可用（已准备好）"
 msgid ""
 "Allows you to create and manage your packaging dimensions and types you want "
 "to be maintained in your system."
-msgstr ""
+msgstr "允许创建和管理你要在系统中保留的的包装尺寸和类型。"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1346,7 +1350,7 @@ msgstr "实物盘点"
 #: code:addons/stock/wizard/stock_move.py:214
 #, python-format
 msgid "Processing Error!"
-msgstr ""
+msgstr "处理错误！"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1367,6 +1371,11 @@ msgid ""
 "* Available: When products are reserved, it is set to 'Available'.\n"
 "* Done: When the shipment is processed, the state is 'Done'."
 msgstr ""
+"* 新建: 当移库单被创建还没被确实时。\n"
+"* 等待另外的移库: 当需要等待另外一个移库完成时，出现该状态。例如：链式物流.\n"
+"* 等待可用: 当需求还不能被直接了当地解决时，出现该状态。可能需要等调度程序被运行，有个部件在等待制造等等...\n"
+"* 可用: 当产品已经被保留了，状态就被设置为 可用。\n"
+"* 完成: 当这次装运被处理，状态就是“完成”。"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
@@ -1423,6 +1432,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                创建一个新的凭证。\n"
+"              </p><p>\n"
+"                根据所执行操作的类型 或者 工人/团队 将要执行的操作，库存凭证系统允许你指定每个库存操作对应到指定的凭证。\n"
+"                例如库存凭证可以是：质量控制，分拣单，包装 等等。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1462,7 +1478,7 @@ msgstr "等待其它调拨"
 #: help:stock.change.product.qty,new_quantity:0
 msgid ""
 "This quantity is expressed in the Default Unit of Measure of the product."
-msgstr ""
+msgstr "此数量以该产品的默认计量单位表示"
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1475,7 +1491,7 @@ msgstr "用户在确认分拣时设置期间，字段用于记录产品的成本
 #: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
-msgstr ""
+msgstr "警告： 没有 延期交货清单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1494,7 +1510,7 @@ msgid "To be refunded/invoiced"
 msgstr "已开票或退票"
 
 #. module: stock
-#: code:addons/stock/stock.py:2450
+#: code:addons/stock/stock.py:2448
 #, python-format
 msgid "You can only delete draft moves."
 msgstr "您只能删除草稿状态的调拨。"
@@ -1503,12 +1519,12 @@ msgstr "您只能删除草稿状态的调拨。"
 #: code:addons/stock/stock.py:1665
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
-msgstr ""
+msgstr "您不能移动产品%s到视图类型的库位%s。"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Split in serial numbers"
-msgstr ""
+msgstr "拆分系列号"
 
 #. module: stock
 #: view:stock.move:0
@@ -1537,10 +1553,10 @@ msgid "Additional Info"
 msgstr "附加信息"
 
 #. module: stock
-#: code:addons/stock/stock.py:2648
+#: code:addons/stock/stock.py:2653
 #, python-format
 msgid "Missing partial picking data for move #%s."
-msgstr ""
+msgstr "移库单  #%s 丢失了部分分拣的数据。"
 
 #. module: stock
 #: field:stock.location.product,from_date:0
@@ -1631,6 +1647,9 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,date:0
 #: field:stock.move,create_date:0
+#: field:stock.picking,date:0
+#: field:stock.picking.in,date:0
+#: field:stock.picking.out,date:0
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
@@ -1731,7 +1750,7 @@ msgstr "上级库位"
 #: code:addons/stock/product.py:168
 #, python-format
 msgid "Please define stock output account for this product: \"%s\" (id: %d)."
-msgstr ""
+msgstr "请为产品 \"%s\" (id: %d) 定义出库科目"
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1754,15 +1773,15 @@ msgid "Stock Invoice Onshipping"
 msgstr "发票未到"
 
 #. module: stock
-#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2473
 #, python-format
 msgid "Please provide a positive quantity to scrap."
-msgstr ""
+msgstr "请提供一个正数给报废库位。"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Your Company, Birmingham shop"
-msgstr ""
+msgstr "你的公司，伯明翰商店"
 
 #. module: stock
 #: view:product.product:0
@@ -1781,7 +1800,7 @@ msgstr "单位成本的币别"
 #: selection:stock.picking.in,move_type:0
 #: selection:stock.picking.out,move_type:0
 msgid "Partial"
-msgstr ""
+msgstr "部分"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1792,7 +1811,7 @@ msgstr "9月"
 #. module: stock
 #: view:product.product:0
 msgid "days"
-msgstr ""
+msgstr "天"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1809,13 +1828,13 @@ msgstr "月计划"
 #: help:stock.picking.in,origin:0
 #: help:stock.picking.out,origin:0
 msgid "Reference of the document"
-msgstr ""
+msgstr "文档的参照"
 
 #. module: stock
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "Is a Back Order"
-msgstr "是子单"
+msgstr "是一个延期交货清单"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1830,7 +1849,7 @@ msgstr "库存核算科目（出仓）"
 #. module: stock
 #: view:stock.return.picking.memory:0
 msgid "Return Picking Memory"
-msgstr ""
+msgstr "退回分拣存储区"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -1847,7 +1866,7 @@ msgstr "库存调拨"
 msgid ""
 "Check this option to select existing serial numbers in the list below, "
 "otherwise you should enter new ones line by line."
-msgstr ""
+msgstr "点击此项从下面列表中选择一个已有的系列号，否则你要逐行输入新的"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1873,14 +1892,14 @@ msgstr "取消可用"
 #: code:addons/stock/wizard/stock_location_product.py:49
 #, python-format
 msgid "Current Inventory"
-msgstr ""
+msgstr "当前库存清单"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by manufacturing orders."
-msgstr ""
+msgstr "该库位将被使用以替换默认的，同样的，库存移位的源库位将根据制造单生成。"
 
 #. module: stock
 #: help:stock.move,date_expected:0
@@ -1903,10 +1922,10 @@ msgid "Shelf 2"
 msgstr "货架 2"
 
 #. module: stock
-#: code:addons/stock/stock.py:529
+#: code:addons/stock/stock.py:528
 #, python-format
 msgid "You cannot remove a lot line."
-msgstr ""
+msgstr "您不能移除一个批号"
 
 #. module: stock
 #: help:stock.location,posx:0
@@ -1927,7 +1946,7 @@ msgid "Localization"
 msgstr "本地化"
 
 #. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:461
 #, python-format
 msgid "Delivered Qty"
 msgstr "已配送数量"
@@ -1935,14 +1954,14 @@ msgstr "已配送数量"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Transfer Products"
-msgstr ""
+msgstr "转让产品"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated when you do an inventory."
-msgstr ""
+msgstr "该库位将被使用以替换默认的，同样当你做盘点时，库存移位的源库位将被生成。"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -1998,7 +2017,7 @@ msgstr "日期"
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2009,13 +2028,13 @@ msgstr "增加筛选条件"
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "库位库存"
+msgstr "库存库位"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:97
 #, python-format
 msgid "_Deliver"
-msgstr ""
+msgstr "_Deliver"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -2058,7 +2077,7 @@ msgstr "批号"
 #: model:ir.actions.act_window,name:stock.action_deliver_move
 #: view:product.product:0
 msgid "Deliveries"
-msgstr ""
+msgstr "已交付"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2109,7 +2128,7 @@ msgstr "退回分拣"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_in
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_out
 msgid "Return Shipment"
-msgstr ""
+msgstr "退回件"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -2161,7 +2180,7 @@ msgstr "默认作为您接收当前业务伙伴产品的源库位"
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of Serial Number and internal reference must be unique !"
-msgstr ""
+msgstr "系列号和内部参考号的组合必须是唯一的"
 
 #. module: stock
 #: field:stock.warehouse,partner_id:0
@@ -2179,7 +2198,7 @@ msgstr "调拨分析让您轻松检查和分析您公司的库存调拨.在您
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "你试图分配一个不是该产品的批次"
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -2194,20 +2213,20 @@ msgstr "价格"
 #. module: stock
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
-msgstr ""
+msgstr "当用户完成一个发运单后，创建并打开发票"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
 msgid "stock.return.picking.memory"
-msgstr ""
+msgstr "stock.return.picking.memory"
 
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr ""
+msgstr "对每个移库动作生成账务分录"
 
 #. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:451
 #, python-format
 msgid "Received Qty"
 msgstr "已接收数量"
@@ -2215,7 +2234,7 @@ msgstr "已接收数量"
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr "内部单号"
+msgstr "编号"
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -2229,7 +2248,7 @@ msgstr "显示这序列号时的可选前缀: PREFIX/SERIAL [INT_REF]"
 msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "generated by a Manufacturing Order"
-msgstr ""
+msgstr "强制对包含该产品的所有移库单指定一个系列号，并生成一个制造单"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_fill_inventory
@@ -2246,7 +2265,7 @@ msgstr "名称"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Supplier Address :"
-msgstr ""
+msgstr "供应商地址："
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -2274,28 +2293,28 @@ msgid "Customer Locations"
 msgstr "客户库位"
 
 #. module: stock
-#: code:addons/stock/stock.py:2449
-#: code:addons/stock/stock.py:2858
+#: code:addons/stock/stock.py:2448
+#: code:addons/stock/stock.py:2863
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "用户错误！"
 
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Stock partial Picking"
-msgstr ""
+msgstr "库存部分分拣"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice/Refund"
-msgstr ""
+msgstr "创建发票/退款"
 
 #. module: stock
 #: help:stock.picking,message_ids:0
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信记录"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2320,7 +2339,7 @@ msgstr "供货商库位"
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Products Inventory"
-msgstr ""
+msgstr "查看产品库存"
 
 #. module: stock
 #: view:stock.move:0
@@ -2331,7 +2350,7 @@ msgstr "创建"
 #: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
-msgstr ""
+msgstr "操作被禁止"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2355,12 +2374,12 @@ msgstr "入库科目"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Shipping type specify, goods coming in or going out"
-msgstr ""
+msgstr "指定运输类型，商品进入或者发出"
 
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Accounting"
-msgstr ""
+msgstr "会计"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
@@ -2403,6 +2422,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                创建一个库存移库单。\n"
+"              </p><p>\n"
+"                此菜单给你在一个特定产品上面的库存操作的完整的可追溯性。\n"
+"                你能过滤该产品，查看该产品所有已经发生和未发生的移库。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.location:0
@@ -2429,26 +2455,26 @@ msgstr "计量单位"
 #. module: stock
 #: field:stock.config.settings,group_stock_multiple_locations:0
 msgid "Manage multiple locations and warehouses"
-msgstr ""
+msgstr "管理多库位及仓库"
 
 #. module: stock
 #: field:stock.config.settings,group_stock_production_lot:0
 msgid "Track serial number on products"
-msgstr ""
+msgstr "追溯产品批次"
 
 #. module: stock
 #: field:stock.picking,message_unread:0
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
 msgid ""
 "Current quantity of products with this Serial Number available in company "
 "warehouses"
-msgstr ""
+msgstr "在 公司仓库中，该序列号的产品当前可用的数量。"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2470,7 +2496,7 @@ msgstr "批次"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "_Transfer"
-msgstr ""
+msgstr "_Transfer"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2499,7 +2525,7 @@ msgid "Warehouse board"
 msgstr "仓库控制台"
 
 #. module: stock
-#: code:addons/stock/product.py:469
+#: code:addons/stock/product.py:471
 #, python-format
 msgid "Future Qty"
 msgstr "未来数量"
@@ -2507,7 +2533,7 @@ msgstr "未来数量"
 #. module: stock
 #: model:res.groups,name:stock.group_production_lot
 msgid "Manage Serial Numbers"
-msgstr ""
+msgstr "管理系列号"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2520,7 +2546,7 @@ msgstr "备注"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Transferred"
-msgstr ""
+msgstr "已转运"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2541,7 +2567,7 @@ msgstr "移库单类型"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Partially"
-msgstr ""
+msgstr "处理部分"
 
 #. module: stock
 #: view:stock.move:0
@@ -2566,7 +2592,7 @@ msgstr "产品"
 msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
 "account on category of this product are same."
-msgstr ""
+msgstr "不能创建分类账分录，该产品的出库科目和其分类中的 估值科目是一样的"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2606,7 +2632,7 @@ msgstr "出仓产品"
 msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
 "(id: %d)"
-msgstr ""
+msgstr "请为产品 \"%s\" (id: %d) 或者他的类别 定义一个入库科目"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2621,7 +2647,7 @@ msgid "Move"
 msgstr "调拨"
 
 #. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:467
 #, python-format
 msgid "P&L Qty"
 msgstr "损益数量"
@@ -2629,7 +2655,7 @@ msgstr "损益数量"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_config_settings
 msgid "stock.config.settings"
-msgstr ""
+msgstr "stock.config.settings"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -2652,7 +2678,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Big Suppliers"
-msgstr ""
+msgstr "大供应商"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2678,7 +2704,7 @@ msgstr "创建"
 #. module: stock
 #: field:stock.change.product.qty,new_quantity:0
 msgid "New Quantity on Hand"
-msgstr ""
+msgstr "在手库存调整"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2728,7 +2754,7 @@ msgstr "取消盘点"
 #. module: stock
 #: field:stock.config.settings,group_product_variant:0
 msgid "Support multiple variants per products  "
-msgstr ""
+msgstr "支持每个产品的多个变体  "
 
 #. module: stock
 #: code:addons/stock/stock.py:2246
@@ -2736,7 +2762,7 @@ msgstr ""
 msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
 "account on category of this product are same."
-msgstr ""
+msgstr "不能创建分类账分录，该产品的入库科目和其分类中的 估值科目是一样的"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
@@ -2752,7 +2778,7 @@ msgstr "固定库位"
 #. module: stock
 #: field:report.stock.inventory,scrap_location:0
 msgid "scrap"
-msgstr ""
+msgstr "报废"
 
 #. module: stock
 #: code:addons/stock/stock.py:1891
@@ -2760,22 +2786,22 @@ msgstr ""
 msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
 "OpenERP will not automatically generate a Back Order."
-msgstr ""
+msgstr "通过修改此处的数量，就是您已经收到完成的数量： OpenERP 将自动生成一个延期交货清单。"
 
 #. module: stock
 #: report:stock.inventory.move:0
 msgid "Manual Quantity"
-msgstr ""
+msgstr "手动数量"
 
 #. module: stock
 #: view:product.product:0
 msgid "On hand:"
-msgstr ""
+msgstr "在手："
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by serial number"
-msgstr ""
+msgstr "按批次统计库库"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2801,7 +2827,7 @@ msgstr "显示您产品的最后盘点并用特定的筛选规则去排序。如
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "Please create Invoices."
-msgstr ""
+msgstr "请创建发票"
 
 #. module: stock
 #: help:stock.config.settings,module_product_expiry:0
@@ -2814,12 +2840,20 @@ msgid ""
 "    - alert date.\n"
 "This installs the module product_expiry."
 msgstr ""
+"对产品和序列号跟踪不同的日期。\n"
+"下列日期可被跟踪：\n"
+"       -寿命终止\n"
+"       -最佳使用日期\n"
+"       -搬运日期 \n"
+"       -提醒日期\n"
+"\n"
+"这需要安装模块 product_expiry."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:174
 #, python-format
 msgid "Please provide proper Quantity."
-msgstr ""
+msgstr "请提供适度的数量"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2842,7 +2876,7 @@ msgstr "库存账簿"
 #: code:addons/stock/wizard/stock_return_picking.py:174
 #, python-format
 msgid "%s-%s-return"
-msgstr ""
+msgstr "%s-%s-返回"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:82
@@ -2859,7 +2893,7 @@ msgstr "强制可用"
 #. module: stock
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "货架"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap
@@ -2870,7 +2904,7 @@ msgstr "损耗调拨"
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Serial number is used to put a serial number on the production"
-msgstr ""
+msgstr "用作在产品上放置一个系列号"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:100
@@ -2916,7 +2950,7 @@ msgstr "完成日期"
 #: code:addons/stock/stock.py:1663
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
-msgstr ""
+msgstr "您不能移动产品%s，因为它来自一个视图类型的库位 %s."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -2969,6 +3003,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                添加一个库位。\n"
+"              </p><p>\n"
+"                这是你的公司的仓库和库位的结构。\n"
+"                您能点击一个库位，获得产品的清单，和它们在每个库位及其子库位中的库存情况。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2978,7 +3019,7 @@ msgstr "实际库存"
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Logistic Serial Number"
-msgstr ""
+msgstr "物流系列号"
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -2998,12 +3039,12 @@ msgstr "批次"
 msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)."
-msgstr ""
+msgstr "产品 \"%s\" (id: %d) 分割后的数量总数超过了这个产品的数量"
 
 #. module: stock
 #: view:stock.partial.move.line:0
 msgid "Stock Partial Move Line"
-msgstr ""
+msgstr "仓库局部 移库清单"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -3025,13 +3066,13 @@ msgstr "联系地址："
 msgid ""
 "When you select a serial number on product moves, you can get the upstream "
 "or downstream traceability of that product."
-msgstr ""
+msgstr "当您在产品移库单选择了一个系列号，你就能得到该产品的上游或者下游的可追朔性"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:95
 #, python-format
 msgid "_Receive"
-msgstr ""
+msgstr "_Receive"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -3069,7 +3110,7 @@ msgstr "贸易术语"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
 msgid "stock.partial.picking.line"
-msgstr ""
+msgstr "stock.partial.picking.line"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -3099,6 +3140,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击为该产品登记一个收货单。\n"
+"              </p><p>\n"
+"                这里可以找到该产品相关的所有收货记录，\n"
+"                以及所有你正在等待的来自供应商的\n"
+"                尚未到达的收货单。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -3111,7 +3160,7 @@ msgstr "如果选择将包括该库位子库位的产品。"
 #: help:stock.config.settings,group_stock_inventory_valuation:0
 msgid ""
 "Allows to configure inventory valuations on products and product categories."
-msgstr ""
+msgstr "允许在产品或者产品分类配置存货估值。"
 
 #. module: stock
 #: help:stock.config.settings,module_stock_location:0
@@ -3123,6 +3172,10 @@ msgid ""
 "needs, etc.\n"
 "                This installs the module stock_location."
 msgstr ""
+"提供推送物流。这个特性的典型使用是：\n"
+"                管理产品的生产链，管理每个产品的默认库位，,\n"
+"                根据业务需要定义仓库的内路线等等。\n"
+"这需要安装模块 stock_location 。"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3163,7 +3216,7 @@ msgstr "修订版名称"
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
-msgstr ""
+msgstr "管理物流系列号"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3184,12 +3237,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                添加一个追踪号码。\n"
+"              </p><p>\n"
+"                这是所有包装的一个列表。当你选择了一个包装，你\n"
+"                能获得包含在这个包装中的产品的上下游的可追踪性。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
-#: code:addons/stock/stock.py:2496
+#: code:addons/stock/stock.py:2501
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr ""
+msgstr "%s %s %s 已被 <b>移动到</b> 报废仓."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
@@ -3205,6 +3265,7 @@ msgstr "客户包装"
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: view:stock.picking.in:0
+#: report:stock.picking.list:0
 msgid "Done"
 msgstr "完成"
 
@@ -3242,14 +3303,14 @@ msgstr "如果想生成发票，请在分拣单上填写上业务伙伴."
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Confirm & Receive"
-msgstr ""
+msgstr "确认并接收"
 
 #. module: stock
 #: field:stock.picking,origin:0
 #: field:stock.picking.in,origin:0
 #: field:stock.picking.out,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源单据"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -3259,7 +3320,7 @@ msgstr "不紧急"
 #. module: stock
 #: view:stock.move:0
 msgid "Scheduled"
-msgstr ""
+msgstr "排程"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3275,14 +3336,14 @@ msgstr "负责人"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Entirely"
-msgstr ""
+msgstr "处理分录"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
 msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by procurements."
-msgstr ""
+msgstr "该库位将被使用以替换默认的，同样的，库存移位的源库位将根据需求单生成。"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
@@ -3306,7 +3367,7 @@ msgstr "库存"
 #: code:addons/stock/wizard/stock_return_picking.py:222
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "退回的分拣"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
@@ -3352,6 +3413,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击开始一次盘点。\n"
+"              </p><p>\n"
+"                "
+"定期盘点通常用于清点每个库位的商品数量。你可以每年定期使用本功能一次来做总体盘点，也可以在任何你需要的时候进行以便符合当前某个产品的存量级别。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -3372,12 +3440,12 @@ msgstr "指定的内部调拨"
 #: code:addons/stock/stock.py:790
 #, python-format
 msgid "You cannot process picking without stock moves."
-msgstr ""
+msgstr "没有移库单，您不能处理分拣。"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this serial number"
-msgstr ""
+msgstr "该系列号的移库"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -3414,7 +3482,7 @@ msgstr "通道(X)"
 #. module: stock
 #: field:stock.config.settings,group_stock_packaging:0
 msgid "Allow to define several packaging methods on products"
-msgstr ""
+msgstr "允许产品定义多种包装方式"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -3465,7 +3533,7 @@ msgstr "按库位划分产品"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Logistic"
-msgstr ""
+msgstr "物流"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -3511,7 +3579,7 @@ msgstr "货架 1"
 #: help:stock.picking.in,date:0
 #: help:stock.picking.out,date:0
 msgid "Creation time, usually the time of the order."
-msgstr ""
+msgstr "创建时间，通常是下单的时间。"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3550,7 +3618,7 @@ msgstr "激活相关科目"
 #. module: stock
 #: field:stock.location.product,type:0
 msgid "Analyse Type"
-msgstr ""
+msgstr "分析类型"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3582,10 +3650,10 @@ msgstr "全部一次性"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "Inventory Move"
-msgstr ""
+msgstr "库存调拨"
 
 #. module: stock
-#: code:addons/stock/product.py:475
+#: code:addons/stock/product.py:477
 #, python-format
 msgid "Future Productions"
 msgstr "未来生产"
@@ -3615,7 +3683,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_stock_config_settings
 #: view:stock.config.settings:0
 msgid "Configure Warehouse"
-msgstr ""
+msgstr "配置仓库"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3643,7 +3711,7 @@ msgstr "盘点日期"
 #: model:ir.actions.act_window,name:stock.action_receive_move
 #: view:product.product:0
 msgid "Receptions"
-msgstr ""
+msgstr "接收"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3678,7 +3746,7 @@ msgstr "公司"
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: stock
 #: view:stock.move:0
@@ -3712,7 +3780,7 @@ msgstr "盘点批次"
 #: field:stock.report.prodlots,prodlot_id:0
 #: field:stock.return.picking.memory,prodlot_id:0
 msgid "Serial Number"
-msgstr ""
+msgstr "序列号"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
@@ -3756,7 +3824,7 @@ msgstr ""
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -3772,7 +3840,7 @@ msgstr "非欧洲客户"
 #: code:addons/stock/product.py:167
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
-#: code:addons/stock/stock.py:529
+#: code:addons/stock/stock.py:528
 #: code:addons/stock/stock.py:790
 #: code:addons/stock/stock.py:1190
 #: code:addons/stock/stock.py:1199
@@ -3782,7 +3850,8 @@ msgstr "非欧洲客户"
 #: code:addons/stock/stock.py:2252
 #: code:addons/stock/stock.py:2255
 #: code:addons/stock/stock.py:2258
-#: code:addons/stock/stock.py:2585
+#: code:addons/stock/stock.py:2481
+#: code:addons/stock/stock.py:2590
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3798,6 +3867,10 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 定义一个新的仓库。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3834,12 +3907,12 @@ msgstr "这分拣单不需要开发票。"
 msgid ""
 "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."
-msgstr ""
+msgstr "计量单位取整不允许你的运送 \"%s %s\"，只有\"%s %s\" 取整才被该计量单位接受。"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Your Company, Chicago shop"
-msgstr ""
+msgstr "Your Company, Chicago shop"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3877,12 +3950,12 @@ msgstr ""
 msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
 "OpenERP will not automatically generate a back order."
-msgstr ""
+msgstr "通过修改此处的数量，就是您已经收到完成的数量： OpenERP 将自动生成一个延期交货清单。"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Serial Number Revisions"
-msgstr ""
+msgstr "序列号修订版"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
@@ -3900,7 +3973,7 @@ msgstr "送货单已处理"
 #. module: stock
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "案例"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3941,20 +4014,20 @@ msgstr "这选项允许这库位能不能放置废料"
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: stock
-#: code:addons/stock/stock.py:2585
+#: code:addons/stock/stock.py:2590
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
-msgstr ""
+msgstr "消耗的移库数量不能小于等于0。"
 
 #. module: stock
 #: help:stock.config.settings,decimal_precision:0
 msgid ""
 "As an example, a decimal precision of 2 will allow weights like: 9.99 kg, "
 "whereas a decimal precision of 4 will allow weights like:  0.0231 kg."
-msgstr ""
+msgstr "作为一个例子，十进制精度为2允许重量是这样的：9.99千克，而一个十进制精度为4，将允许重量是这样的，如：0.0231千克。"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3967,7 +4040,7 @@ msgstr "总出库数量"
 #: field:stock.picking.in,backorder_id:0
 #: field:stock.picking.out,backorder_id:0
 msgid "Back Order of"
-msgstr "分单"
+msgstr "之延期交货清单。"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0
@@ -3987,7 +4060,7 @@ msgstr "产品类别"
 #. module: stock
 #: view:stock.move:0
 msgid "Serial  Number"
-msgstr ""
+msgstr "序列号"
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -4007,7 +4080,7 @@ msgstr "设置"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
+msgstr "管理多个库位和仓库"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4022,10 +4095,10 @@ msgstr ""
 "如果成本价减少，库存核算科目为贷方，入库科目为借方。"
 
 #. module: stock
-#: code:addons/stock/stock.py:2811
+#: code:addons/stock/stock.py:2816
 #, python-format
 msgid "INV:"
-msgstr ""
+msgstr "INV:"
 
 #. module: stock
 #: help:stock.config.settings,module_stock_invoice_directly:0
@@ -4034,6 +4107,8 @@ msgid ""
 "                to be invoiced when you send or deliver goods.\n"
 "                This installs the module stock_invoice_directly."
 msgstr ""
+"当您发送或交付货物，如果交付要开票，将能自动运行开票向导。\n"
+"这需要安装模块 stock_invoice_directly。"
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
@@ -4074,7 +4149,7 @@ msgstr ""
 "用于实时库存核算。当设定在一个虚拟库位（而不是内部类型）时，这科目将用于记录从内部库位调拨产品的估值。一般代替这产品的出库科目。它不影响内部库位。"
 
 #. module: stock
-#: code:addons/stock/product.py:457
+#: code:addons/stock/product.py:459
 #, python-format
 msgid "Future Deliveries"
 msgstr "未来送货"
@@ -4100,7 +4175,7 @@ msgstr "自动审核"
 #: code:addons/stock/stock.py:1821
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
-msgstr ""
+msgstr "该序列号的库存不足！"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -4144,13 +4219,13 @@ msgstr "字段用于记录用户确认在分拣期间所用的币别(用于计
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique Serial Number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "唯一序列号将被显示为： PREFIX/SERIAL [INT_REF]"
 
 #. module: stock
 #: code:addons/stock/product.py:142
 #, python-format
 msgid "Please define stock input account for this product: \"%s\" (id: %d)."
-msgstr ""
+msgstr "请为产品 \"%s\" (id: %d) 定义一个入库科目。"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
@@ -4161,7 +4236,7 @@ msgstr "入库产品"
 #. module: stock
 #: view:product.product:0
 msgid "update"
-msgstr ""
+msgstr "更新"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -4180,7 +4255,7 @@ msgstr ""
 #: view:stock.return.picking:0
 #: view:stock.split.into:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -4232,7 +4307,7 @@ msgstr "自动分拣"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Customer Address :"
-msgstr ""
+msgstr "客户地址："
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -4288,7 +4363,7 @@ msgstr "你真的要合并盘点?"
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Date of Delivery"
-msgstr ""
+msgstr "发运日期"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -4301,18 +4376,18 @@ msgstr "货架(Y)"
 msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
 "(id: %d)"
-msgstr ""
+msgstr "请在产品类别 \"%s\" (id: %d) 中定义一个存货估值 科目"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Serial Number Revision"
-msgstr ""
+msgstr "序列号版本"
 
 #. module: stock
 #: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
-msgstr ""
+msgstr "为产品分类 %s  指定估值科目。"
 
 #. module: stock
 #: help:stock.config.settings,module_claim_from_delivery:0
@@ -4320,12 +4395,14 @@ msgid ""
 "Adds a Claim link to the delivery order.\n"
 "                This installs the module claim_from_delivery."
 msgstr ""
+"为发运单添加一个 索赔链接。\n"
+"这需要安装模块claim_from_delivery."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:208
 #, python-format
 msgid "Please specify at least one non-zero quantity."
-msgstr ""
+msgstr "请指定至少一个非0的数值。"
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -4340,7 +4417,7 @@ msgstr "用户"
 #. module: stock
 #: field:stock.config.settings,module_stock_location:0
 msgid "Create push/pull logistic rules"
-msgstr ""
+msgstr "创建推拉物流规则"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -4355,7 +4432,7 @@ msgid "November"
 msgstr "11月"
 
 #. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:473
 #, python-format
 msgid "Unplanned Qty"
 msgstr "计划外数量"
@@ -4379,7 +4456,7 @@ msgstr "1月"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "不能将视图类型的库位作为移库单的源库位或者目标库位"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_production_lot:0
@@ -4387,14 +4464,14 @@ msgid ""
 "This allows you to manage products by using serial numbers. When you select "
 "a serial number on product moves, you can get the upstream or downstream "
 "traceability of that product."
-msgstr ""
+msgstr "允许你使用序列号管理产品。当你在产品移库时选择了一个序列号，你能获得对产品的上游和下游的可追溯性。"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
 #, python-format
 msgid ""
 "No product in this location. Please select a location in the product form."
-msgstr ""
+msgstr "该库位没有产品。请从产品表单选择一个库位。"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -4407,7 +4484,7 @@ msgid "Move History (parent moves)"
 msgstr "调拨日志(上级调拨)"
 
 #. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:455
 #, python-format
 msgid "Future Stock"
 msgstr "未来库存"
@@ -4446,6 +4523,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击新增一个产品的发货单。\n"
+"              </p><p>\n"
+"                你在此处会发现该产品相关的所有调拨历史，以及所有你需要发货给客户的产品。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -4462,7 +4545,7 @@ msgstr "库位"
 msgid ""
 "If this shipment was split, then this field links to the shipment which "
 "contains the already processed part."
-msgstr ""
+msgstr "如果这个装运单被分割，该字段将连接到包括了已经处理的部分的装运单。"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -4481,7 +4564,7 @@ msgstr "前缀"
 #: view:stock.move:0
 #: view:stock.move.split:0
 msgid "Split in Serial Numbers"
-msgstr ""
+msgstr "分开进系列号"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -4524,12 +4607,12 @@ msgstr "指定包装的属性如数量,类型等"
 #. module: stock
 #: view:product.product:0
 msgid "Delays"
-msgstr ""
+msgstr "延迟"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "预定日期"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -4580,7 +4663,7 @@ msgstr "5月"
 #: code:addons/stock/product.py:110
 #, python-format
 msgid "No difference between standard price and new price!"
-msgstr ""
+msgstr "标准价和新价格之间没有不同！"
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -4595,7 +4678,7 @@ msgstr "送货"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import the current inventory"
-msgstr ""
+msgstr "导入当前库存清单"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
@@ -4609,7 +4692,7 @@ msgid "Location Content"
 msgstr "库位包含"
 
 #. module: stock
-#: code:addons/stock/product.py:477
+#: code:addons/stock/product.py:479
 #, python-format
 msgid "Produced Qty"
 msgstr "产品数量"
@@ -4631,7 +4714,7 @@ msgstr "连锁库位类型"
 #: help:stock.picking.in,min_date:0
 #: help:stock.picking.out,min_date:0
 msgid "Scheduled time for the shipment to be processed"
-msgstr ""
+msgstr "该装运单被处理的计划时间"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -4676,19 +4759,19 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Date of Reception"
-msgstr ""
+msgstr "接收的日期"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
 msgid ""
 "This allows to configure and use multiple stock locations and warehouses,\n"
 "                instead of having a single default one."
-msgstr ""
+msgstr "允许配置和使用多个库位和仓库，替换默认的一个。"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm & Transfer"
-msgstr ""
+msgstr "确认并传递"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
@@ -4734,6 +4817,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击以创建一个送货单. \n"
+"              </p><p>\n"
+"                这里是所有送货单的列表，它们是根据不同的销售订单和物流规则 被准备好的。\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: help:stock.tracking,name:0
@@ -4799,7 +4888,7 @@ msgstr "准备处理"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Warehouse Address :"
-msgstr ""
+msgstr "仓库地址："
 
 #~ msgid "["
 #~ msgstr "["
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index b8bad4faf95..3aaf1c663e5 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -25,19 +25,15 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'property_stock_customer': fields.property(
-          'stock.location',
           type='many2one',
           relation='stock.location',
           string="Customer Location",
-          view_load=True,
           help="This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"),
 
         'property_stock_supplier': fields.property(
-          'stock.location',
           type='many2one',
           relation='stock.location',
           string="Supplier Location",
-          view_load=True,
           help="This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"),
     }
 
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 29445f671ee..20fc660be0f 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -205,7 +205,6 @@ class product_product(osv.osv):
         
         location_obj = self.pool.get('stock.location')
         warehouse_obj = self.pool.get('stock.warehouse')
-        shop_obj = self.pool.get('sale.shop')
         
         states = context.get('states',[])
         what = context.get('what',())
@@ -215,11 +214,6 @@ class product_product(osv.osv):
         if not ids:
             return res
 
-        if context.get('shop', False):
-            warehouse_id = shop_obj.read(cr, uid, int(context['shop']), ['warehouse_id'])['warehouse_id'][0]
-            if warehouse_id:
-                context['warehouse'] = warehouse_id
-
         if context.get('warehouse', False):
             lot_id = warehouse_obj.read(cr, uid, int(context['warehouse']), ['lot_stock_id'])['lot_stock_id'][0]
             if lot_id:
@@ -372,7 +366,6 @@ class product_product(osv.osv):
                  "In a context with a single Warehouse, this includes "
                  "goods stored in the Stock Location of this Warehouse, or any "
                  "of its children.\n"
-                 "In a context with a single Shop, this includes goods "
                  "stored in the Stock Location of the Warehouse of this Shop, "
                  "or any of its children.\n"
                  "Otherwise, this includes goods stored in any Stock Location "
@@ -387,7 +380,6 @@ class product_product(osv.osv):
                  "In a context with a single Warehouse, this includes "
                  "goods stored in the Stock Location of this Warehouse, or any "
                  "of its children.\n"
-                 "In a context with a single Shop, this includes goods "
                  "stored in the Stock Location of the Warehouse of this Shop, "
                  "or any of its children.\n"
                  "Otherwise, this includes goods stored in any Stock Location "
@@ -485,37 +477,33 @@ class product_template(osv.osv):
     _inherit = 'product.template'
     _columns = {
         'property_stock_procurement': fields.property(
-            'stock.location',
             type='many2one',
             relation='stock.location',
             string="Procurement Location",
-            view_load=True,
             domain=[('usage','like','procurement')],
             help="This stock location will be used, instead of the default one, as the source location for stock moves generated by procurements."),
         'property_stock_production': fields.property(
-            'stock.location',
             type='many2one',
             relation='stock.location',
             string="Production Location",
-            view_load=True,
             domain=[('usage','like','production')],
             help="This stock location will be used, instead of the default one, as the source location for stock moves generated by manufacturing orders."),
         'property_stock_inventory': fields.property(
-            'stock.location',
             type='many2one',
             relation='stock.location',
             string="Inventory Location",
-            view_load=True,
             domain=[('usage','like','inventory')],
             help="This stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory."),
-        'property_stock_account_input': fields.property('account.account',
-            type='many2one', relation='account.account',
-            string='Stock Input Account', view_load=True,
+        'property_stock_account_input': fields.property(
+            type='many2one',
+            relation='account.account',
+            string='Stock Input Account',
             help="When doing real-time inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account, unless "
                  "there is a specific valuation account set on the source location. When not set on the product, the one from the product category is used."),
-        'property_stock_account_output': fields.property('account.account',
-            type='many2one', relation='account.account',
-            string='Stock Output Account', view_load=True,
+        'property_stock_account_output': fields.property(
+            type='many2one',
+            relation='account.account',
+            string='Stock Output Account',
             help="When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless "
                  "there is a specific valuation account set on the destination location. When not set on the product, the one from the product category is used."),
         'sale_delay': fields.float('Customer Lead Time', help="The average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
@@ -532,27 +520,29 @@ class product_category(osv.osv):
 
     _inherit = 'product.category'
     _columns = {
-        'property_stock_journal': fields.property('account.journal',
-            relation='account.journal', type='many2one',
-            string='Stock Journal', view_load=True,
+        'property_stock_journal': fields.property(
+            relation='account.journal',
+            type='many2one',
+            string='Stock Journal',
             help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
-        'property_stock_account_input_categ': fields.property('account.account',
-            type='many2one', relation='account.account',
-            string='Stock Input Account', view_load=True,
+        'property_stock_account_input_categ': fields.property(
+            type='many2one',
+            relation='account.account',
+            string='Stock Input Account',
             help="When doing real-time inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account, unless "
                  "there is a specific valuation account set on the source location. This is the default value for all products in this category. It "
                  "can also directly be set on each product"),
-        'property_stock_account_output_categ': fields.property('account.account',
-            type='many2one', relation='account.account',
-            string='Stock Output Account', view_load=True,
+        'property_stock_account_output_categ': fields.property(
+            type='many2one',
+            relation='account.account',
+            string='Stock Output Account',
             help="When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless "
                  "there is a specific valuation account set on the destination location. This is the default value for all products in this category. It "
                  "can also directly be set on each product"),
-        'property_stock_valuation_account_id': fields.property('account.account',
+        'property_stock_valuation_account_id': fields.property(
             type='many2one',
             relation='account.account',
             string="Stock Valuation Account",
-            view_load=True,
             help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
     }
 
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index e0788dcb966..0a17f56fc71 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -258,7 +258,9 @@
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ move_lines.state ]]</para>
+            <para style="terp_default_9">Waiting Availability[[ move_lines.state == 'confirmed' and ' ' or removeParentNode('para') ]]</para>
+            <para style="terp_default_9">Done[[ move_lines.state == 'done' and ' ' or removeParentNode('para') ]]</para>
+            <para style="terp_default_9">Available[[ move_lines.state == 'assigned' and ' ' or removeParentNode('para') ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
diff --git a/addons/stock/html/Didier-Georgieff.jpg b/addons/stock/static/description/Didier-Georgieff.jpg
similarity index 100%
rename from addons/stock/html/Didier-Georgieff.jpg
rename to addons/stock/static/description/Didier-Georgieff.jpg
diff --git a/addons/stock/html/Mario-Riva.png b/addons/stock/static/description/Mario-Riva.png
similarity index 100%
rename from addons/stock/html/Mario-Riva.png
rename to addons/stock/static/description/Mario-Riva.png
diff --git a/addons/stock/static/src/img/icon.png b/addons/stock/static/description/icon.png
similarity index 100%
rename from addons/stock/static/src/img/icon.png
rename to addons/stock/static/description/icon.png
diff --git a/addons/stock/html/index.html b/addons/stock/static/description/index.html
similarity index 98%
rename from addons/stock/html/index.html
rename to addons/stock/static/description/index.html
index aac71e529ae..dd7fbe568f7 100644
--- a/addons/stock/html/index.html
+++ b/addons/stock/static/description/index.html
@@ -17,7 +17,7 @@
 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>
+                <a href="http://www.openerp.com/start?app=stock" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
             </div>
         </div>
     </div>
diff --git a/addons/stock/html/stock_calendar.png b/addons/stock/static/description/stock_calendar.png
similarity index 100%
rename from addons/stock/html/stock_calendar.png
rename to addons/stock/static/description/stock_calendar.png
diff --git a/addons/stock/html/stock_integrate.png b/addons/stock/static/description/stock_integrate.png
similarity index 100%
rename from addons/stock/html/stock_integrate.png
rename to addons/stock/static/description/stock_integrate.png
diff --git a/addons/stock/html/stock_main.png b/addons/stock/static/description/stock_main.png
similarity index 100%
rename from addons/stock/html/stock_main.png
rename to addons/stock/static/description/stock_main.png
diff --git a/addons/stock/html/stock_procurement.png b/addons/stock/static/description/stock_procurement.png
similarity index 100%
rename from addons/stock/html/stock_procurement.png
rename to addons/stock/static/description/stock_procurement.png
diff --git a/addons/stock/html/stock_product.png b/addons/stock/static/description/stock_product.png
similarity index 100%
rename from addons/stock/html/stock_product.png
rename to addons/stock/static/description/stock_product.png
diff --git a/addons/stock/html/stock_product_form.png b/addons/stock/static/description/stock_product_form.png
similarity index 100%
rename from addons/stock/html/stock_product_form.png
rename to addons/stock/static/description/stock_product_form.png
diff --git a/addons/stock/html/stock_reporting.png b/addons/stock/static/description/stock_reporting.png
similarity index 100%
rename from addons/stock/html/stock_reporting.png
rename to addons/stock/static/description/stock_reporting.png
diff --git a/addons/stock/html/warehouse_illu_01.png b/addons/stock/static/description/warehouse_illu_01.png
similarity index 100%
rename from addons/stock/html/warehouse_illu_01.png
rename to addons/stock/static/description/warehouse_illu_01.png
diff --git a/addons/stock/html/warehouse_illu_02.png b/addons/stock/static/description/warehouse_illu_02.png
similarity index 100%
rename from addons/stock/html/warehouse_illu_02.png
rename to addons/stock/static/description/warehouse_illu_02.png
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e0b93af1f4f..dba506d22ee 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -25,7 +25,7 @@ import time
 from operator import itemgetter
 from itertools import groupby
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp import netsvc
 from openerp import tools
@@ -558,12 +558,11 @@ class stock_picking(osv.osv):
             ids = [ids]
         for pick in self.browse(cr, uid, ids, context=context):
             sql_str = """update stock_move set
-                    date='%s'
+                    date_expected='%s'
                 where
                     picking_id=%d """ % (value, pick.id)
-
             if pick.max_date:
-                sql_str += " and (date='" + pick.max_date + "' or date>'" + value + "')"
+                sql_str += " and (date_expected='" + pick.max_date + "')"
             cr.execute(sql_str)
         return True
 
@@ -580,11 +579,11 @@ class stock_picking(osv.osv):
             ids = [ids]
         for pick in self.browse(cr, uid, ids, context=context):
             sql_str = """update stock_move set
-                    date='%s'
+                    date_expected='%s'
                 where
                     picking_id=%s """ % (value, pick.id)
             if pick.min_date:
-                sql_str += " and (date='" + pick.min_date + "' or date<'" + value + "')"
+                sql_str += " and (date_expected='" + pick.min_date + "')"
             cr.execute(sql_str)
         return True
 
@@ -1110,7 +1109,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:
@@ -1637,7 +1636,7 @@ class stock_move(osv.osv):
                        "* Waiting Availability: This state is reached when the procurement resolution is not straight forward. It may need the scheduler to run, a component to me manufactured...\n"\
                        "* Available: When products are reserved, it is set to \'Available\'.\n"\
                        "* Done: When the shipment is processed, the state is \'Done\'."),
-        'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
+        'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Product Price'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order of", select=True),
@@ -1692,7 +1691,12 @@ class stock_move(osv.osv):
             elif picking_type == 'out':
                 location_xml_id = 'stock_location_customers'
             if location_xml_id:
-                location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
+                try:
+                    location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
+                    self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+                except (orm.except_orm, ValueError):
+                    location_id = False
+
         return location_id
 
     def _default_location_source(self, cr, uid, context=None):
@@ -1721,7 +1725,12 @@ class stock_move(osv.osv):
             elif picking_type in ('out', 'internal'):
                 location_xml_id = 'stock_location_stock'
             if location_xml_id:
-                location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
+                try:
+                    location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
+                    self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+                except (orm.except_orm, ValueError):
+                    location_id = False
+
         return location_id
 
     def _default_destination_address(self, cr, uid, context=None):
@@ -1764,7 +1773,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)
 
@@ -1939,8 +1948,16 @@ class stock_move(osv.osv):
         elif type == 'out':
             location_source_id = 'stock_location_stock'
             location_dest_id = 'stock_location_customers'
-        source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
-        dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
+        try:
+            source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
+            self.pool.get('stock.location').check_access_rule(cr, uid, [source_location[1]], 'read', context=context)
+        except (orm.except_orm, ValueError):
+            source_location = False
+        try:
+            dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
+            self.pool.get('stock.location').check_access_rule(cr, uid, [dest_location[1]], 'read', context=context)
+        except (orm.except_orm, ValueError):
+            dest_location = False
         return {'value':{'location_id': source_location and source_location[1] or False, 'location_dest_id': dest_location and dest_location[1] or False}}
 
     def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
@@ -2192,7 +2209,7 @@ class stock_move(osv.osv):
                 if move.picking_id:
                     pickings.add(move.picking_id.id)
             if move.move_dest_id and move.move_dest_id.state == 'waiting':
-                self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'})
+                self.write(cr, uid, [move.move_dest_id.id], {'state': 'confirmed'})
                 if context.get('call_unlink',False) and move.move_dest_id.picking_id:
                     wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
         self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False})
@@ -2412,8 +2429,8 @@ 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.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
+        src_main_currency_id = src_acct.company_id.currency_id.id
+        dest_main_currency_id = 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:
@@ -2870,8 +2887,12 @@ class stock_inventory_line(osv.osv):
     }
 
     def _default_stock_location(self, cr, uid, context=None):
-        stock_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
-        return stock_location.id
+        try:
+            location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+        except (orm.except_orm, ValueError):
+            location_id = False
+        return location_id
 
     _defaults = {
         'location_id': _default_stock_location
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index b1a1fa048be..14b3ba04eb5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -918,7 +918,7 @@
                     <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                 </xpath>
                 <xpath expr="//field[@name='partner_id']" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
+                    <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Customer" domain="[('customer','=',True)]" />
                 </xpath>
                 <xpath expr="//field[@name='move_lines']" position="replace">
                     <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
@@ -1045,7 +1045,7 @@
                     <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
                 </xpath>
                 <xpath expr="//field[@name='partner_id']" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Supplier"/>
+                    <field name="partner_id" on_change="onchange_partner_in(partner_id)" string="Supplier" domain="[('supplier','=',True)]" />
                 </xpath>
                 <xpath expr="//field[@name='move_lines']" position="replace">
                     <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index c6db9a7dfb6..01ed6f2409a 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 from openerp import tools
@@ -62,8 +62,12 @@ class stock_change_product_qty(osv.osv_memory):
         if 'product_id' in fields:
             res.update({'product_id': product_id})
         if 'location_id' in fields:
-            location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
-            res.update({'location_id': location_id and location_id.id or False})
+            try:
+                model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+                self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+            except (orm.except_orm, ValueError):
+                location_id = False
+            res.update({'location_id': location_id})
         return res
 
     def change_product_qty(self, cr, uid, ids, context=None):
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 89744615f22..e1956e202c9 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -22,6 +22,7 @@
 from openerp.osv import fields, osv
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 import time
+from openerp.tools.translate import _
 
 class stock_partial_move_line(osv.osv_memory):
     _inherit = "stock.partial.picking.line"
@@ -67,6 +68,8 @@ class stock_partial_move(osv.osv_memory):
         }
         moves_ids = []
         for move in partial.move_ids:
+            if not move.move_id:
+                raise osv.except_osv(_('Warning !'), _("You have manually created product lines, please delete them to proceed"))
             move_id = move.move_id.id
             partial_data['move%s' % (move_id)] = {
                 'product_id': move.product_id.id,
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 5f9f09e0074..8c2c5839989 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -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 c51e1415249..992c64ea134 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -180,6 +180,8 @@ class stock_return_picking(osv.osv_memory):
         for v in val_id:
             data_get = data_obj.browse(cr, uid, v, context=context)
             mov_id = data_get.move_id.id
+            if not mov_id:
+                raise osv.except_osv(_('Warning !'), _("You have manually created product lines, please delete them to proceed"))
             new_qty = data_get.quantity
             move = move_obj.browse(cr, uid, mov_id, context=context)
             new_location = move.location_dest_id.id
diff --git a/addons/stock_location/i18n/th.po b/addons/stock_location/i18n/th.po
new file mode 100644
index 00000000000..7636c8142c8
--- /dev/null
+++ b/addons/stock_location/i18n/th.po
@@ -0,0 +1,377 @@
+# 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-06-21 04:47+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-06-22 05:36+0000\n"
+"X-Generator: Launchpad (build 16677)\n"
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company the pickings and moves belong."
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_src_id:0
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:98
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+msgid "Location"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,auto:0
+msgid ""
+"This is used to define paths the product has to follow within the location "
+"tree.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Conditions"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pushed flows"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:118
+#, python-format
+msgid "Pulled from another location."
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,delay:0
+msgid "Delay (days)"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:67
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr ""
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:89
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_id:0
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Action Type"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr ""
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr ""
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr ""
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr ""
+
+#. module: stock_location
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr ""
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr ""
diff --git a/addons/stock_location/stock_location_demo_cpu1.xml b/addons/stock_location/stock_location_demo_cpu1.xml
index d9a220daef6..c756dac2566 100644
--- a/addons/stock_location/stock_location_demo_cpu1.xml
+++ b/addons/stock_location/stock_location_demo_cpu1.xml
@@ -75,17 +75,5 @@
             <field name="product_id" ref="product.product_product_9"/>
         </record>
 
-        <record id="sale_shop2" model="sale.shop">
-            <field name="name">Chicago Shop</field>
-            <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
-            <field name="company_id" ref="stock.res_company_1"/>
-            <field model="account.payment.term" name="payment_default_id" search="[]"/>
-        </record>
-        <record id="sale_shop3" model="sale.shop">
-            <field name="name">Birmingham shop</field>
-            <field name="warehouse_id" ref="stock.stock_warehouse_shop1"/>
-            <field name="company_id" ref="stock.res_company_2"/>
-            <field model="account.payment.term" name="payment_default_id" search="[]"/>
-        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index b7ae720c187..98e1d78b3be 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -115,7 +115,7 @@ class subscription_subscription(osv.osv):
                 id = int(id)
                 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')
@@ -142,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):
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index ad96145741b..37a0c6ed773 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -498,7 +498,7 @@ class survey_question(osv.osv):
     def create(self, cr, uid, vals, context=None):
         minimum_ans = 0
         maximum_ans = 0
-        page = self.pool.get('survey.page').browse(cr, uid, vals['page_id'], context=context).title
+        page = self.pool.get('survey.page').browse(cr, uid, int(vals.get('page_id', 0)), context=context).title
         if vals.has_key('answer_choice_ids') and  not len(vals['answer_choice_ids']):
             if vals.has_key('type') and vals['type'] not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 raise osv.except_osv(_('Warning!'),_('You must enter one or more answers for question "%s" of page %s .') % (vals['question'], page))
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index f41d257cf63..2a94dc59e62 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -772,6 +772,7 @@
             <field name="arch" type="xml">
                 <form string="Survey Question">
                     <field name="question" colspan="4"/>
+                    <field name="page_id"/>
                     <field name="sequence"/>
                     <field name="tot_resp"/>
                     <field name="type" on_change="on_change_type(type)"/>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 6d473754988..7e58c8a10eb 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -1038,6 +1038,7 @@ class survey_question_wiz(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'target': 'new',
             'view_id': view_id,
+            'page_id': int(context.get('page_id',0)),
             'context': context
         }
 
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index cb50eb955bb..4f2adb85743 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -11,15 +11,15 @@
             <field name="model">survey.browse.answer</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
-                    <header>
-                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <field name="survey_id"/>
                         <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 40056234fe8..b539b844654 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.print</field>
             <field name="arch" type="xml">
                 <form string="Survey Print" version="7.0">
-                    <header>
-                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Survey" colspan="4"/>
                         <field name="survey_ids" nolabel="1" colspan="4" />
@@ -23,6 +18,11 @@
                         <field name="page_number" colspan="4"/>
                         <field name="without_pagebreak" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index c2363695292..f3c8d01a62c 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.print.answer</field>
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
-                    <header>
-                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>
                         <field name="response_ids" nolabel="1" colspan="4" />
@@ -23,6 +18,11 @@
                         <field name="page_number" colspan="4"/>
                         <field name="without_pagebreak" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 97d976b98f6..6d63cf8b9bf 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -9,12 +9,12 @@
             <field name="model">survey.print.statistics</field>
             <field name="arch" type="xml">
                 <form string="Survey Print Statistics" version="7.0">
-                    <header>
+                    <field name="survey_ids"/>
+                    <footer>
                         <button name="action_next" string="Print" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <field name="survey_ids"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index de1231b53fb..56f5f5cda33 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -10,15 +10,15 @@
             <field name="model">survey.name.wiz</field>
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
-                    <header>
-                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
                     </group>
                     <field name="note" placeholder="Add Description" attrs="{'readonly': [('survey_id','=',False)]}"/>
+                    <footer>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index a611973d772..fb3d7edf856 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -9,11 +9,6 @@
             <field name="model">survey.send.invitation</field>
             <field name="arch" type="xml">
                 <form string="Send Invitation" version="7.0">
-                    <header>
-                        <button name="action_send" string="_Send" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group col="4">
                         <separator string="Select Partner" colspan="4"/>
                         <field name="partner_ids" nolabel="1" colspan="4" widget="many2many_tags"/>
@@ -28,6 +23,11 @@
                         <separator string="Message" colspan="4"/>
                         <field name="mail" nolabel="1" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="action_send" string="_Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/warning/i18n/nl_BE.po b/addons/warning/i18n/nl_BE.po
index 2498851a128..e5983fc966b 100644
--- a/addons/warning/i18n/nl_BE.po
+++ b/addons/warning/i18n/nl_BE.po
@@ -7,51 +7,51 @@ 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:06+0000\n"
-"PO-Revision-Date: 2009-04-24 15:40+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2013-06-28 15:37+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:35+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
 #: field:product.product,purchase_line_warn:0
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Aankooporderlijn"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Binnenkomende leveringen"
 
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
-msgstr ""
+msgstr "Bericht voor aankooporderlijn"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Pickinglijst"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr ""
+msgstr "Waarschuwing bij aankoop van artikel"
 
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: warning
 #: view:product.product:0
 #: view:res.partner:0
 msgid "Warnings"
-msgstr ""
+msgstr "Waarschuwingen"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -61,12 +61,12 @@ msgstr ""
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr ""
+msgstr "Blokkerend bericht"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Invoice"
-msgstr ""
+msgstr "Waarschuwing op de factuur"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -76,34 +76,34 @@ msgstr ""
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "No Message"
-msgstr ""
+msgstr "Geen bericht"
 
 #. module: warning
 #: model:ir.model,name:warning.model_account_invoice
 #: field:res.partner,invoice_warn:0
 msgid "Invoice"
-msgstr ""
+msgstr "Factuur"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr ""
+msgstr "Waarschuwing bij verkoop van artikel"
 
 #. module: warning
 #: field:res.partner,picking_warn:0
 msgid "Stock Picking"
-msgstr ""
+msgstr "Ontvangst"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order
 #: field:res.partner,purchase_warn:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Aankooporder"
 
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
 msgid "Message for Purchase Order"
-msgstr ""
+msgstr "Bericht voor aankooporder"
 
 #. module: warning
 #: code:addons/warning/warning.py:32
@@ -119,6 +119,10 @@ msgid ""
 "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 ""
+"Als u 'Waarschuwing' selecteert, wordt het bericht naar de gebruiker "
+"gestuurd. Als u 'Blokkerend bericht' kiest, wordt een fout gegenereerd met "
+"de boodschap en het proces wordt geblokkeerd. Het bericht moet in het "
+"volgende veld worden ingevoerd."
 
 #. module: warning
 #: code:addons/warning/warning.py:67
@@ -131,32 +135,32 @@ msgstr ""
 #: code:addons/warning/warning.py:299
 #, python-format
 msgid "Alert for %s !"
-msgstr ""
+msgstr "Waarschuwing voor %s!"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Sales Order"
-msgstr ""
+msgstr "Waarschuwing op verkooporder"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
-msgstr ""
+msgstr "Bericht voor factuur"
 
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
 msgid "Message for Sales Order"
-msgstr ""
+msgstr "Bericht voor verkooporder"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr ""
+msgstr "Waarschuwing op ontvangst"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Purchase Order"
-msgstr ""
+msgstr "Waarschuwing op aankooporder"
 
 #. module: warning
 #: code:addons/warning/warning.py:68
@@ -169,12 +173,12 @@ msgstr ""
 #: code:addons/warning/warning.py:300
 #, python-format
 msgid "Warning for %s"
-msgstr ""
+msgstr "Waarschuwing voor %s"
 
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sales Order Line"
-msgstr ""
+msgstr "Bericht voor verkooporderlijn"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -184,31 +188,31 @@ msgstr ""
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
 msgid "Message for Stock Picking"
-msgstr ""
+msgstr "Bericht voor ontvangst"
 
 #. module: warning
 #: model:ir.model,name:warning.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 #: field:res.partner,sale_warn:0
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkooporder"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Uitgaande leveringen"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 #: field:product.product,sale_line_warn:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Verkooporderlijn"
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index e9e9161bacb..8e1168e5d35 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -63,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 = {
@@ -91,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 = {
@@ -124,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
@@ -155,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 = {
@@ -184,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 = {
@@ -210,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 = {
@@ -257,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
@@ -289,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
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 1df38771e9c..04a35530bd2 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -41,7 +41,7 @@
         <record id="product_warning_form_view" model="ir.ui.view">
             <field name="name">product.warning.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">
diff --git a/addons/web_analytics/static/src/img/icon.png b/addons/web_analytics/static/description/icon.png
similarity index 100%
rename from addons/web_analytics/static/src/img/icon.png
rename to addons/web_analytics/static/description/icon.png
diff --git a/addons/web_shortcuts/i18n/th.po b/addons/web_shortcuts/i18n/th.po
new file mode 100644
index 00000000000..e520bfe2f20
--- /dev/null
+++ b/addons/web_shortcuts/i18n/th.po
@@ -0,0 +1,25 @@
+# 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-06-17 05:48+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-06-18 05:46+0000\n"
+"X-Generator: Launchpad (build 16673)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "เพิ่ม / ลบ ทางลัด ..."
diff --git a/addons/web_shortcuts/i18n/vi.po b/addons/web_shortcuts/i18n/vi.po
new file mode 100644
index 00000000000..e32680ab256
--- /dev/null
+++ b/addons/web_shortcuts/i18n/vi.po
@@ -0,0 +1,25 @@
+# Vietnamese 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-06-27 16:15+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Thêm / Xóa đường dẫn ...."
diff --git a/addons/web_shortcuts/static/src/img/icon.png b/addons/web_shortcuts/static/description/icon.png
similarity index 100%
rename from addons/web_shortcuts/static/src/img/icon.png
rename to addons/web_shortcuts/static/description/icon.png